If the arch, like s390x, does not support percpu insn, these cases won't test global percpu data by checking FEAT_PERCPU_DATA support.
The following APIs have been tested for global percpu data: 1. bpf_map__set_initial_value() 2. bpf_map__initial_value() 3. generated percpu struct pointer pointing to internal map's mmaped data 4. bpf_map__lookup_elem() for global percpu data map At the same time, the case is also tested with 'bpftool gen skeleton -L'. Add a test to verify that the live vars of subskel won't include the vars for global percpu data. Assisted-by: Codex:gpt-5.5-xhigh Signed-off-by: Leon Hwang <[email protected]> --- tools/testing/selftests/bpf/Makefile | 2 +- .../bpf/prog_tests/global_data_init.c | 184 ++++++++++++++++++ .../bpf/prog_tests/global_percpu_subskel.c | 37 ++++ .../bpf/progs/test_global_percpu_data.c | 31 +++ 4 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/global_percpu_subskel.c create mode 100644 tools/testing/selftests/bpf/progs/test_global_percpu_data.c diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index b642ee489ea6..c37ed9e7b97c 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -533,7 +533,7 @@ LSKELS_SIGNED := fentry_test.c fexit_test.c atomics.c # Generate both light skeleton and libbpf skeleton for these LSKELS_EXTRA := test_ksyms_module.c test_ksyms_weak.c kfunc_call_test.c \ - kfunc_call_test_subprog.c + kfunc_call_test_subprog.c test_global_percpu_data.c SKEL_BLACKLIST += $$(LSKELS) $$(LSKELS_SIGNED) test_static_linked.skel.h-deps := test_static_linked1.bpf.o test_static_linked2.bpf.o diff --git a/tools/testing/selftests/bpf/prog_tests/global_data_init.c b/tools/testing/selftests/bpf/prog_tests/global_data_init.c index 8466332d7406..ea7e4e3d91cf 100644 --- a/tools/testing/selftests/bpf/prog_tests/global_data_init.c +++ b/tools/testing/selftests/bpf/prog_tests/global_data_init.c @@ -1,5 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include <test_progs.h> +#include "bpf/libbpf_internal.h" +#include "test_global_percpu_data.skel.h" +#include "test_global_percpu_data.lskel.h" void test_global_data_init(void) { @@ -60,3 +63,184 @@ void test_global_data_init(void) free(newval); bpf_object__close(obj); } + +static void test_global_percpu_data_init(void) +{ + struct test_global_percpu_data__percpu init_value = {}; + struct test_global_percpu_data__percpu *init_data; + int key, prog_fd, err, num_cpus, num_online, i; + struct test_global_percpu_data *skel = NULL; + __u64 args[2] = {0x1234ULL, 0x5678ULL}; + size_t init_data_sz; + struct bpf_map *map; + bool *online; + LIBBPF_OPTS(bpf_test_run_opts, topts, + .ctx_in = args, + .ctx_size_in = sizeof(args), + .flags = BPF_F_TEST_RUN_ON_CPU, + ); + + num_cpus = libbpf_num_possible_cpus(); + if (!ASSERT_GT(num_cpus, 0, "libbpf_num_possible_cpus")) + return; + + err = parse_cpu_mask_file("/sys/devices/system/cpu/online", &online, &num_online); + if (!ASSERT_OK(err, "parse_cpu_mask_file")) + return; + + skel = test_global_percpu_data__open(); + if (!ASSERT_OK_PTR(skel, "test_global_percpu_data__open")) + goto out; + if (!ASSERT_OK_PTR(skel->percpu, "skel->percpu")) + goto out; + + ASSERT_EQ(skel->percpu->data, -1, "skel->percpu->data"); + ASSERT_FALSE(skel->percpu->run, "skel->percpu->run"); + ASSERT_EQ(skel->percpu->nums[6], 0, "skel->percpu->nums[6]"); + ASSERT_EQ(skel->percpu->struct_data.i, -1, "struct_data.i"); + ASSERT_FALSE(skel->percpu->struct_data.set, "struct_data.set"); + ASSERT_EQ(skel->percpu->struct_data.nums[6], 0, "struct_data.nums[6]"); + + map = skel->maps.percpu; + if (!ASSERT_EQ(bpf_map__type(map), BPF_MAP_TYPE_PERCPU_ARRAY, "bpf_map__type")) + goto out; + + init_value.data = 2; + init_value.nums[6] = -1; + init_value.struct_data.i = 2; + init_value.struct_data.nums[6] = -1; + err = bpf_map__set_initial_value(map, &init_value, sizeof(init_value)); + if (!ASSERT_OK(err, "bpf_map__set_initial_value")) + goto out; + + init_data = bpf_map__initial_value(map, &init_data_sz); + if (!ASSERT_OK_PTR(init_data, "bpf_map__initial_value")) + goto out; + + ASSERT_EQ(init_data->data, init_value.data, "init_value data"); + ASSERT_EQ(init_data->run, init_value.run, "init_value run"); + ASSERT_EQ(init_data->struct_data.i, init_value.struct_data.i, "init_value struct_data.i"); + ASSERT_EQ(init_data->struct_data.nums[6], init_value.struct_data.nums[6], + "init_value struct_data.nums[6]"); + ASSERT_EQ(init_data_sz, sizeof(init_value), "init_value size"); + ASSERT_EQ((void *) init_data, (void *) skel->percpu, "skel->percpu eq init_data"); + ASSERT_EQ(skel->percpu->data, init_value.data, "skel->percpu->data"); + ASSERT_EQ(skel->percpu->run, init_value.run, "skel->percpu->run"); + ASSERT_EQ(skel->percpu->struct_data.i, init_value.struct_data.i, + "skel->percpu->struct_data.i"); + ASSERT_EQ(skel->percpu->struct_data.nums[6], init_value.struct_data.nums[6], + "skel->percpu->struct_data.nums[6]"); + + err = test_global_percpu_data__load(skel); + if (!ASSERT_OK(err, "test_global_percpu_data__load")) + goto out; + + ASSERT_OK_PTR(skel->percpu, "skel->percpu"); + + key = 0; + prog_fd = bpf_program__fd(skel->progs.update_percpu_data); + + /* run on every CPU */ + for (i = 0; i < num_online; i++) { + struct test_global_percpu_data__percpu data = {}; + __u64 flags; + + if (!online[i]) + continue; + + topts.cpu = i; + topts.retval = -1; + err = bpf_prog_test_run_opts(prog_fd, &topts); + ASSERT_OK(err, "bpf_prog_test_run_opts"); + ASSERT_EQ(topts.retval, 0, "bpf_prog_test_run_opts retval"); + + flags = ((__u64) i << 32) | BPF_F_CPU; + err = bpf_map__lookup_elem(map, &key, sizeof(key), &data, sizeof(data), flags); + if (!ASSERT_OK(err, "bpf_map__lookup_elem")) + goto out; + + ASSERT_EQ(data.data, 1, "data.data"); + ASSERT_TRUE(data.run, "data.run"); + ASSERT_EQ(data.nums[6], 0xc0de, "data.nums[6]"); + ASSERT_EQ(data.struct_data.i, 1, "struct_data.i"); + ASSERT_TRUE(data.struct_data.set, "struct_data.set"); + ASSERT_EQ(data.struct_data.nums[6], 0xc0de, "struct_data.nums[6]"); + } + +out: + test_global_percpu_data__destroy(skel); + free(online); +} + +static void test_global_percpu_data_lskel(void) +{ + int key, prog_fd, map_fd, err, num_cpus, num_online, i; + struct test_global_percpu_data_lskel *lskel = NULL; + __u64 args[2] = {0x1234ULL, 0x5678ULL}; + bool *online; + LIBBPF_OPTS(bpf_test_run_opts, topts, + .ctx_in = args, + .ctx_size_in = sizeof(args), + .flags = BPF_F_TEST_RUN_ON_CPU, + ); + + num_cpus = libbpf_num_possible_cpus(); + if (!ASSERT_GT(num_cpus, 0, "libbpf_num_possible_cpus")) + return; + + err = parse_cpu_mask_file("/sys/devices/system/cpu/online", &online, &num_online); + if (!ASSERT_OK(err, "parse_cpu_mask_file")) + return; + + lskel = test_global_percpu_data_lskel__open_and_load(); + if (!ASSERT_OK_PTR(lskel, "test_global_percpu_data_lskel__open_and_load")) + goto out; + + key = 0; + map_fd = lskel->maps.percpu.map_fd; + prog_fd = lskel->progs.update_percpu_data.prog_fd; + + /* run on every CPU */ + for (i = 0; i < num_online; i++) { + struct test_global_percpu_data__percpu data = {}; + __u64 flags; + + if (!online[i]) + continue; + + topts.cpu = i; + topts.retval = -1; + err = bpf_prog_test_run_opts(prog_fd, &topts); + ASSERT_OK(err, "bpf_prog_test_run_opts"); + ASSERT_EQ(topts.retval, 0, "bpf_prog_test_run_opts retval"); + + flags = ((__u64) i << 32) | BPF_F_CPU; + err = bpf_map_lookup_elem_flags(map_fd, &key, &data, flags); + if (!ASSERT_OK(err, "bpf_map_lookup_elem_flags")) + goto out; + + ASSERT_EQ(data.data, 1, "data.data"); + ASSERT_TRUE(data.run, "data.run"); + ASSERT_EQ(data.nums[6], 0xc0de, "data.nums[6]"); + ASSERT_EQ(data.struct_data.i, 1, "struct_data.i"); + ASSERT_TRUE(data.struct_data.set, "struct_data.set"); + ASSERT_EQ(data.struct_data.nums[6], 0xc0de, "struct_data.nums[6]"); + } + +out: + test_global_percpu_data_lskel__destroy(lskel); + free(online); +} + +void test_global_percpu_data(void) +{ + if (!feat_supported(NULL, FEAT_PERCPU_DATA)) { + test__skip(); + return; + } + + if (test__start_subtest("init")) + test_global_percpu_data_init(); + if (test__start_subtest("lskel")) + test_global_percpu_data_lskel(); +} diff --git a/tools/testing/selftests/bpf/prog_tests/global_percpu_subskel.c b/tools/testing/selftests/bpf/prog_tests/global_percpu_subskel.c new file mode 100644 index 000000000000..8aebd533d86b --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/global_percpu_subskel.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <test_progs.h> +#include "test_global_percpu_data.subskel.h" + +void test_global_percpu_data_subskel(void) +{ + struct test_global_percpu_data *subskel = NULL; + struct bpf_object *obj; + int i; + + obj = bpf_object__open_file("./test_global_percpu_data.bpf.o", NULL); + if (!ASSERT_OK_PTR(obj, "bpf_object__open_file")) + return; + + subskel = test_global_percpu_data__open(obj); + if (!ASSERT_OK_PTR(subskel, "test_global_percpu_data__open")) + goto out; + + if (!ASSERT_OK_PTR(subskel->subskel, "subskel")) + goto out; + if (!ASSERT_OK_PTR(subskel->maps.percpu, "maps.percpu")) + goto out; + ASSERT_EQ(bpf_map__type(subskel->maps.percpu), BPF_MAP_TYPE_PERCPU_ARRAY, + "percpu_map_type"); + ASSERT_GT(subskel->subskel->var_cnt, 0, "var_cnt"); + + for (i = 0; i < subskel->subskel->var_cnt; i++) { + const struct bpf_var_skeleton *var; + + var = (void *) subskel->subskel->vars + i * subskel->subskel->var_skel_sz; + ASSERT_NEQ(var->map, &subskel->maps.percpu, "var"); + } + +out: + test_global_percpu_data__destroy(subskel); + bpf_object__close(obj); +} diff --git a/tools/testing/selftests/bpf/progs/test_global_percpu_data.c b/tools/testing/selftests/bpf/progs/test_global_percpu_data.c new file mode 100644 index 000000000000..ba92ffb0ca49 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_global_percpu_data.c @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <vmlinux.h> +#include <bpf/bpf_helpers.h> +#include "bpf_misc.h" + +int data SEC(".percpu") = -1; +int nums[7] SEC(".percpu"); +char run SEC(".percpu") = 0; +struct { + char set; + int i; + int nums[7]; +} struct_data SEC(".percpu") = { + .set = 0, + .i = -1, +}; + +SEC("raw_tp/task_rename") +__auxiliary +int update_percpu_data(void *ctx) +{ + struct_data.nums[6] = 0xc0de; + struct_data.set = 1; + struct_data.i = 1; + nums[6] = 0xc0de; + data = 1; + run = 1; + return 0; +} + +char _license[] SEC("license") = "GPL"; -- 2.54.0
