bpf: teach verifier actual bounds of bpf_get_smp_processor_id() result
Subsystems (4)
Andrii Nakryiko
maintainerPATCH 1/2 bpf: teach verifier actual bounds of bpf_get_smp_processor_id() result
bpf_get_smp_processor_id() helper returns current CPU on which BPF program runs. It can't return value that is bigger than maximum allowed number of CPUs (minus one, due to zero indexing). Teach BPF verifier to recognize that. This makes it possible to use bpf_get_smp_processor_id() result to index into arrays without extra checks, as demonstrated in subsequent selftests/bpf patch.
--- kernel/bpf/verifier.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-)
kernel/bpf/verifier.c +26 -11
@@ -25,6 +25,7 @@#include <linux/btf_ids.h> #include <linux/poison.h> #include <linux/module.h> +#include <linux/cpumask.h> #include "disasm.h"
@@ -9116,19 +9117,33 @@ static void do_refine_retval_range(struct bpf_reg_state *regs, int ret_type, {struct bpf_reg_state *ret_reg = ®s[BPF_REG_0 ]; -if (ret_type !=RET_INTEGER || - (func_id != BPF_FUNC_get_stack && - func_id != BPF_FUNC_get_task_stack && - func_id != BPF_FUNC_probe_read_str && - func_id != BPF_FUNC_probe_read_kernel_str && - func_id != BPF_FUNC_probe_read_user_str)) +if (ret_type !=RET_INTEGER )return ; - ret_reg->smax_value = meta->msize_max_value; - ret_reg->s32_max_value = meta->msize_max_value; - ret_reg->smin_value = -MAX_ERRNO ; - ret_reg->s32_min_value = -MAX_ERRNO ; -reg_bounds_sync (ret_reg); +switch (func_id) { +case BPF_FUNC_get_stack: +case BPF_FUNC_get_task_stack: +case BPF_FUNC_probe_read_str: +case BPF_FUNC_probe_read_kernel_str: +case BPF_FUNC_probe_read_user_str: + ret_reg->smax_value = meta->msize_max_value; + ret_reg->s32_max_value = meta->msize_max_value; + ret_reg->smin_value = -MAX_ERRNO ; + ret_reg->s32_min_value = -MAX_ERRNO ; +reg_bounds_sync (ret_reg); +break ; +case BPF_FUNC_get_smp_processor_id: + ret_reg->umax_value = nr_cpu_ids -1 ; + ret_reg->u32_max_value = nr_cpu_ids -1 ; + ret_reg->smax_value = nr_cpu_ids -1 ; + ret_reg->s32_max_value = nr_cpu_ids -1 ; + ret_reg->umin_value =0 ; + ret_reg->u32_min_value =0 ; + ret_reg->smin_value =0 ; + ret_reg->s32_min_value =0 ; +reg_bounds_sync (ret_reg); +break ; + } } static int
Signature · 1 line
2.34.1
Andrii Nakryiko
maintainerPATCH 2/2 selftests/bpf: extend existing map resize tests for per-cpu use case
Add a per-cpu array resizing use case and demonstrate how bpf_get_smp_processor_id() can be used to directly access proper data with no extra checks.
--- .../selftests/bpf/prog_tests/global_map_resize.c | 14 +++++++++++--- .../selftests/bpf/progs/test_global_map_resize.c | 8 ++++++-- 2 files changed, 17 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/prog_tests/global_map_resize.c +11 -3
@@ -22,7 +22,7 @@ static void global_map_resize_bss_subtest(void)struct test_global_map_resize *skel;struct bpf_map *map;const __u32 desired_sz =sizeof (skel->bss->sum) +sysconf (_SC_PAGE_SIZE) *2 ; -size_t array_len, actual_sz; +size_t array_len, actual_sz, new_sz; skel =test_global_map_resize__open ();if (!ASSERT_OK_PTR (skel,"test_global_map_resize__open" ))
@@ -42,6 +42,10 @@ static void global_map_resize_bss_subtest(void)if (!ASSERT_EQ (bpf_map__value_size (map), desired_sz,"resize" )) goto teardown; + new_sz =sizeof (skel->data_percpu_arr->percpu_arr[0 ]) *libbpf_num_possible_cpus (); + err =bpf_map__set_value_size (skel->maps.data_percpu_arr, new_sz); +ASSERT_OK (err,"percpu_arr_resize" ); +/* set the expected number of elements based on the resized array */ array_len = (desired_sz -sizeof (skel->bss->sum)) /sizeof (skel->bss->array[0 ]);if (!ASSERT_GT (array_len,1 ,"array_len" ))
@@ -84,11 +88,11 @@ static void global_map_resize_bss_subtest(void)static void global_map_resize_data_subtest (void ) { -int err;struct test_global_map_resize *skel;struct bpf_map *map;const __u32 desired_sz =sysconf (_SC_PAGE_SIZE) *2 ; -size_t array_len, actual_sz; +size_t array_len, actual_sz, new_sz; +int err; skel =test_global_map_resize__open ();if (!ASSERT_OK_PTR (skel,"test_global_map_resize__open" ))
@@ -108,6 +112,10 @@ static void global_map_resize_data_subtest(void)if (!ASSERT_EQ (bpf_map__value_size (map), desired_sz,"resize" )) goto teardown; + new_sz =sizeof (skel->data_percpu_arr->percpu_arr[0 ]) *libbpf_num_possible_cpus (); + err =bpf_map__set_value_size (skel->maps.data_percpu_arr, new_sz); +ASSERT_OK (err,"percpu_arr_resize" ); +/* set the expected number of elements based on the resized array */ array_len = (desired_sz -sizeof (skel->bss->sum)) /sizeof (skel->data_custom->my_array[0 ]);if (!ASSERT_GT (array_len,1 ,"array_len" ))
tools/testing/selftests/bpf/progs/test_global_map_resize.c +6 -2
@@ -29,13 +29,16 @@ int my_int SEC(".data.non_array"); int my_array_first[1] SEC(".data.array_not_last"); int my_int_last SEC(".data.array_not_last"); +int percpu_arr[1] SEC(".data.percpu_arr"); + SEC("tp/syscalls/sys_enter_getpid")int bss_array_sum (void *ctx) {if (pid != (bpf_get_current_pid_tgid () >>32 ))return 0 ; - sum =0 ; +/* this will be zero, we just rely on verifier not rejecting this */ + sum = percpu_arr[bpf_get_smp_processor_id ()];for (size_t i =0 ; i < bss_array_len; ++i) sum += array[i];
@@ -49,7 +52,8 @@ int data_array_sum(void *ctx)if (pid != (bpf_get_current_pid_tgid () >>32 ))return 0 ; - sum =0 ; +/* this will be zero, we just rely on verifier not rejecting this */ + sum = percpu_arr[bpf_get_smp_processor_id ()];for (size_t i =0 ; i < data_array_len; ++i) sum += my_array[i];
Signature · 1 line
2.34.1
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Tue, 11 Jul 2023 16:23:59 -0700 you wrote:
bpf_get_smp_processor_id()helper returns current CPU on which BPF program runs. It can't return value that is bigger than maximum allowed number of CPUs (minus one, due to zero indexing). Teach BPF verifier to recognize that. This makes it possible to usebpf_get_smp_processor_id()result to index into arrays without extra checks, as demonstrated in subsequent selftests/bpf patch.[...]
Here is the summary with links:
- [bpf-next,1/2] bpf: teach verifier actual bounds of bpf_get_smp_processor_id() result
https://git.kernel.org/bpf/bpf-next/c/f42bcd168d03 - [bpf-next,2/2] selftests/bpf: extend existing map resize tests for per-cpu use case https://git.kernel.org/bpf/bpf-next/c/c21de5fc5ffd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html