Skip to content

Support kCFI + BPF on arm64 #9301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 4 commits into
base: bpf-next_base
Choose a base branch
from
Open

Support kCFI + BPF on arm64 #9301

wants to merge 4 commits into from

Conversation

kernel-patches-daemon-bpf[bot]
Copy link

Pull request for series with
subject: Support kCFI + BPF on arm64
version: 10
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: e860a98
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708
version: 10

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 1f48966
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708
version: 10

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 62ef449
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708
version: 10

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 0768e98
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708
version: 10

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 0768e98
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708
version: 10

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 0768e98
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708
version: 10

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 0768e98
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708
version: 10

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 0ee30d9
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708
version: 10

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 0ee30d9
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=982708
version: 10

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 95993dc
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=984449
version: 12

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 95993dc
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=984880
version: 13

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 9ea0691
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=984880
version: 13

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: b7b3500
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=984880
version: 13

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: b114fce
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=984880
version: 13

mrutland-arm and others added 3 commits July 26, 2025 12:27
@mrutland-arm
cfi: add C CFI type macro
6890f4e 
Currently x86 and riscv open-code 4 instances of the same logic to
define a u32 variable with the KCFI typeid of a given function.

Replace the duplicate logic with a common macro.

Signed-off-by: Mark Rutland <[email protected]>
Co-developed-by: Maxwell Bland <[email protected]>
Signed-off-by: Maxwell Bland <[email protected]>
Co-developed-by: Sami Tolvanen <[email protected]>
Signed-off-by: Sami Tolvanen <[email protected]>
Tested-by: Dao Huang <[email protected]>
Acked-by: Will Deacon <[email protected]>
@samitolvanen
cfi: Move BPF CFI types and helpers to generic code
183e42e 
Instead of duplicating the same code for each architecture, move
the CFI type hash variables for BPF function types and related
helper functions to generic CFI code, and allow architectures to
override the function definitions if needed.

Signed-off-by: Sami Tolvanen <[email protected]>
@puranjaymohan
arm64/cfi,bpf: Support kCFI + BPF on arm64
3f36932 
Currently, bpf_dispatcher_*_func() is marked with `__nocfi` therefore
calling BPF programs from this interface doesn't cause CFI warnings.

When BPF programs are called directly from C: from BPF helpers or
struct_ops, CFI warnings are generated.

Implement proper CFI prologues for the BPF programs and callbacks and
drop __nocfi for arm64. Fix the trampoline generation code to emit kCFI
prologue when a struct_ops trampoline is being prepared.

Signed-off-by: Puranjay Mohan <[email protected]>
Co-developed-by: Maxwell Bland <[email protected]>
Signed-off-by: Maxwell Bland <[email protected]>
Co-developed-by: Sami Tolvanen <[email protected]>
Signed-off-by: Sami Tolvanen <[email protected]>
Tested-by: Dao Huang <[email protected]>
Acked-by: Will Deacon <[email protected]>
@kernel-patches-daemon-bpf kernel-patches-daemon-bpf bot force-pushed the bpf-next_base branch 4 times, most recently from c883dca to c82c120 Compare July 29, 2025 02:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bpf-next new V13-ci-pass V13
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mrutland-arm @samitolvanen @puranjaymohan