bpf: Fix bpf_get_smp_processor_id() on !CONFIG_SMP
PATCH v2 1/1 bpf: Fix bpf_get_smp_processor_id() on !CONFIG_SMP
On x86-64 calling bpf_get_smp_processor_id() in a kernel with CONFIG_SMP disabled can trigger the following bug, as pcpu_hot is unavailable:
[ 8.471774] BUG: unable to handle page fault for address: 00000000936a290c [ 8.471849] #PF: supervisor read access in kernel mode [ 8.471881] #PF: error_code(0x0000) - not-present page
Fix by inlining a return 0 in the !CONFIG_SMP case.
--- kernel/bpf/verifier.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
ChangeLog v1 -> v2:
- generate the proper inline code for the !CONFIG_SMP case (this time tested with the right .config)
kernel/bpf/verifier.c +5 -1
@@ -21281,11 +21281,15 @@ static int do_misc_fixups(struct bpf_verifier_env *env)* changed in some incompatible and hard to support * way, it's fine to back out this inlining logic */ +#ifdef CONFIG_SMP insn_buf[0 ] =BPF_MOV32_IMM (BPF_REG_0 , (u32 )(unsigned long )&pcpu_hot.cpu_number); insn_buf[1 ] =BPF_MOV64_PERCPU_REG (BPF_REG_0 ,BPF_REG_0 ); insn_buf[2 ] =BPF_LDX_MEM (BPF_W ,BPF_REG_0 ,BPF_REG_0 ,0 ); cnt =3 ; - +#else + insn_buf[0 ] =BPF_ALU32_REG (BPF_XOR ,BPF_REG_0 ,BPF_REG_0 ); + cnt =1 ; +#endif new_prog =bpf_patch_insn_data (env, i + delta, insn_buf, cnt);if (!new_prog)return -ENOMEM ;
Signature · 1 line
2.47.1
This patch was applied to bpf/bpf.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Andrii Nakryiko <[email protected]>:
Quoted 8 lines · On Tue, 17 Dec 2024 20:58:13 +0100 you wrote:
On x86-64 calling
bpf_get_smp_processor_id()in a kernel withCONFIG_SMPdisabled can trigger the following bug, aspcpu_hotis unavailable:[ 8.471774] BUG: unable to handle page fault for address: 00000000936a290c [ 8.471849] #PF: supervisor read access in kernel mode [ 8.471881] #PF: error_code(0x0000) - not-present page[...]
Here is the summary with links:
- [v2] bpf: Fix bpf_get_smp_processor_id() on !CONFIG_SMP
https://git.kernel.org/bpf/bpf/c/23579010cf0a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 7 lines · Andrea Righi
On x86-64 calling
bpf_get_smp_processor_id()in a kernel withCONFIG_SMPdisabled can trigger the following bug, aspcpu_hotis unavailable:[ 8.471774] BUG: unable to handle page fault for address: 00000000936a290c [ 8.471849] #PF: supervisor read access in kernel mode [ 8.471881] #PF: error_code(0x0000) - not-present page
Quoted 6 lines
Fix by inlining a return 0 in the !CONFIG_SMP case.
Fixes 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")Cc Daniel Borkmann <[email protected]>Cc Andrii Nakryiko <[email protected]>Signed-off-by Andrea Righi <[email protected]>