diff mbox series

bpf: do not inline bpf_get_smp_processor_id() with CONFIG_SMP disabled

Message ID 20241216104615.503706-1-arighi@nvidia.com (mailing list archive)
State Changes Requested
Delegated to: BPF
Headers show
Series bpf: do not inline bpf_get_smp_processor_id() with CONFIG_SMP disabled | expand

Checks

Context Check Description
netdev/series_format warning Single patches do not need cover letters; Target tree name not specified in the subject
netdev/tree_selection success Guessed tree name to be net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers warning 1 maintainers not CCed: yonghong.song@linux.dev
netdev/build_clang success Errors and warnings before: 114 this patch: 114
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 10 this patch: 10
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-PR success PR summary
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-11 success Logs for aarch64-gcc / veristat-kernel
bpf/vmtest-bpf-next-VM_Test-12 success Logs for aarch64-gcc / veristat-meta
bpf/vmtest-bpf-next-VM_Test-14 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (sched_ext, false, 360) / sched_ext on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-18 success Logs for s390x-gcc / veristat-kernel
bpf/vmtest-bpf-next-VM_Test-19 success Logs for s390x-gcc / veristat-meta
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-20 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-17 / veristat-kernel
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-17 / veristat-meta
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-50 success Logs for x86_64-llvm-18 / veristat-meta
bpf/vmtest-bpf-next-VM_Test-49 success Logs for x86_64-llvm-18 / veristat-kernel
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (sched_ext, false, 360) / sched_ext on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-gcc / veristat-kernel / x86_64-gcc veristat_kernel
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-17 / test (sched_ext, false, 360) / sched_ext on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-gcc / veristat-meta / x86_64-gcc veristat_meta
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-43 success Logs for x86_64-llvm-18 / test (sched_ext, false, 360) / sched_ext on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-44 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-48 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-45 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-46 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-47 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18

Commit Message

Andrea Righi Dec. 16, 2024, 10:46 a.m. UTC 
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 preventing the inlining of bpf_get_smp_processor_id() when
CONFIG_SMP disabled.

Fixes: 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")
Signed-off-by: Andrea Righi <arighi@nvidia.com>
---
 kernel/bpf/verifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Borkmann Dec. 16, 2024, 4:16 p.m. UTC | #1 
On 12/16/24 11:46 AM, Andrea Righi wrote:
> 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 preventing the inlining of bpf_get_smp_processor_id() when
> CONFIG_SMP disabled.
> 
> Fixes: 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")
> Signed-off-by: Andrea Righi <arighi@nvidia.com>

lgtm, but can't we instead do sth like this :

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index f7f892a52a37..761c70899754 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -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
+			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;

Thanks,
Daniel
Andrea Righi Dec. 16, 2024, 5:24 p.m. UTC | #2 
On Mon, Dec 16, 2024 at 05:16:33PM +0100, Daniel Borkmann wrote:
> On 12/16/24 11:46 AM, Andrea Righi wrote:
> > 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 preventing the inlining of bpf_get_smp_processor_id() when
> > CONFIG_SMP disabled.
> > 
> > Fixes: 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")
> > Signed-off-by: Andrea Righi <arighi@nvidia.com>
> 
> lgtm, but can't we instead do sth like this :
> 
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index f7f892a52a37..761c70899754 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -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
> +			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;

That works as well (just tested) and it's probably better since we're
basically inlining the return 0. Do you want me to send a v2 with this?

Thanks,
-Andrea
Eduard Zingerman Dec. 16, 2024, 6:26 p.m. UTC | #3 
On Mon, 2024-12-16 at 18:24 +0100, Andrea Righi wrote:
> On Mon, Dec 16, 2024 at 05:16:33PM +0100, Daniel Borkmann wrote:
> > On 12/16/24 11:46 AM, Andrea Righi wrote:
> > > 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 preventing the inlining of bpf_get_smp_processor_id() when
> > > CONFIG_SMP disabled.
> > > 
> > > Fixes: 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")
> > > Signed-off-by: Andrea Righi <arighi@nvidia.com>
> > 
> > lgtm, but can't we instead do sth like this :
> > 
> > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> > index f7f892a52a37..761c70899754 100644
> > --- a/kernel/bpf/verifier.c
> > +++ b/kernel/bpf/verifier.c
> > @@ -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
> > +			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;
> 
> That works as well (just tested) and it's probably better since we're
> basically inlining the return 0. Do you want me to send a v2 with this?

I think both Andrea's and Daniel's versions of the fix are good.
Note, however, that I missed one more configuration variable when
making bpf_get_smp_processor_id() inlinable: CONFIG_DEBUG_PREEMPT.

Helper body:

    BPF_CALL_0(bpf_get_smp_processor_id)
    {
    	return smp_processor_id();
    }

smp_processor_id definition:

    #ifdef CONFIG_DEBUG_PREEMPT
      extern unsigned int debug_smp_processor_id(void);
    # define smp_processor_id() debug_smp_processor_id()
    #else
    # define smp_processor_id() __smp_processor_id()
    #endif

Thanks,
Eduard.
Alexei Starovoitov Dec. 16, 2024, 6:33 p.m. UTC | #4 
On Mon, Dec 16, 2024 at 10:27 AM Eduard Zingerman <eddyz87@gmail.com> wrote:
>
> On Mon, 2024-12-16 at 18:24 +0100, Andrea Righi wrote:
> > On Mon, Dec 16, 2024 at 05:16:33PM +0100, Daniel Borkmann wrote:
> > > On 12/16/24 11:46 AM, Andrea Righi wrote:
> > > > 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 preventing the inlining of bpf_get_smp_processor_id() when
> > > > CONFIG_SMP disabled.
> > > >
> > > > Fixes: 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")
> > > > Signed-off-by: Andrea Righi <arighi@nvidia.com>
> > >
> > > lgtm, but can't we instead do sth like this :
> > >
> > > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> > > index f7f892a52a37..761c70899754 100644
> > > --- a/kernel/bpf/verifier.c
> > > +++ b/kernel/bpf/verifier.c
> > > @@ -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
> > > +                   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;
> >
> > That works as well (just tested) and it's probably better since we're
> > basically inlining the return 0. Do you want me to send a v2 with this?
>
> I think both Andrea's and Daniel's versions of the fix are good.
> Note, however, that I missed one more configuration variable when
> making bpf_get_smp_processor_id() inlinable: CONFIG_DEBUG_PREEMPT.
>
> Helper body:
>
>     BPF_CALL_0(bpf_get_smp_processor_id)
>     {
>         return smp_processor_id();
>     }
>
> smp_processor_id definition:
>
>     #ifdef CONFIG_DEBUG_PREEMPT
>       extern unsigned int debug_smp_processor_id(void);
>     # define smp_processor_id() debug_smp_processor_id()
>     #else
>     # define smp_processor_id() __smp_processor_id()
>     #endif

No. It's fine as-is.
We inline raw_smp_processor_id().
Daniel Borkmann Dec. 16, 2024, 8:28 p.m. UTC | #5 
On 12/16/24 6:24 PM, Andrea Righi wrote:
> On Mon, Dec 16, 2024 at 05:16:33PM +0100, Daniel Borkmann wrote:
>> On 12/16/24 11:46 AM, Andrea Righi wrote:
>>> 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 preventing the inlining of bpf_get_smp_processor_id() when
>>> CONFIG_SMP disabled.
>>>
>>> Fixes: 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")
>>> Signed-off-by: Andrea Righi <arighi@nvidia.com>
>>
>> lgtm, but can't we instead do sth like this :
>>
>> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
>> index f7f892a52a37..761c70899754 100644
>> --- a/kernel/bpf/verifier.c
>> +++ b/kernel/bpf/verifier.c
>> @@ -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
>> +			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;
> 
> That works as well (just tested) and it's probably better since we're
> basically inlining the return 0. Do you want me to send a v2 with this?

Yes, pls send v2, I think this is better than explicitly calling the
helper under !CONFIG_SMP.

Thanks,
Daniel
diff mbox series

Patch

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index f7f892a52a37..d85413f1a784 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -21272,7 +21272,7 @@  static int do_misc_fixups(struct bpf_verifier_env *env)
 			goto next_insn;
 		}
 
-#if defined(CONFIG_X86_64) && !defined(CONFIG_UML)
+#if defined(CONFIG_SMP) && defined(CONFIG_X86_64) && !defined(CONFIG_UML)
 		/* Implement bpf_get_smp_processor_id() inline. */
 		if (insn->imm == BPF_FUNC_get_smp_processor_id &&
 		    verifier_inlines_helper_call(env, insn->imm)) {