From: "Emil Tsalapatis" <emil@etsalapatis.com>
To: "Leon Hwang" <leon.hwang@linux.dev>, <bpf@vger.kernel.org>
Cc: "Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Andrii Nakryiko" <andrii@kernel.org>,
"Martin KaFai Lau" <martin.lau@linux.dev>,
"Eduard Zingerman" <eddyz87@gmail.com>,
"Kumar Kartikeya Dwivedi" <memxor@gmail.com>,
"Song Liu" <song@kernel.org>,
"Yonghong Song" <yonghong.song@linux.dev>,
"Jiri Olsa" <jolsa@kernel.org>,
"John Fastabend" <john.fastabend@gmail.com>,
"Quentin Monnet" <qmo@kernel.org>,
"Shuah Khan" <shuah@kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-kselftest@vger.kernel.org>, <kernel-patches-bot@fb.com>
Subject: Re: [PATCH bpf-next v10 6/9] selftests/bpf: Add tests to verify global percpu data
Date: Fri, 17 Jul 2026 18:47:30 -0400 [thread overview]
Message-ID: <DK17N9ROVHRL.23B11VSVOOL6E@etsalapatis.com> (raw)
In-Reply-To: <20260715153254.92010-7-leon.hwang@linux.dev>
On Wed Jul 15, 2026 at 11:32 AM EDT, Leon Hwang wrote:
> 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 <leon.hwang@linux.dev>
> ---
> tools/testing/selftests/bpf/Makefile | 2 +-
> .../bpf/prog_tests/global_data_init.c | 151 ++++++++++++++++++
> .../bpf/prog_tests/global_percpu_subskel.c | 37 +++++
> .../bpf/progs/test_global_percpu_data.c | 33 ++++
> 4 files changed, 222 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..f7a56e3fdbce 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,151 @@ void test_global_data_init(void)
> free(newval);
> bpf_object__close(obj);
> }
> +
> +static void test_percpu_data_on_cpus(int map_fd, int prog_fd)
> +{
> + __u64 args[2] = {0x1234ULL, 0x5678ULL};
> + LIBBPF_OPTS(bpf_test_run_opts, topts,
> + .ctx_in = args,
> + .ctx_size_in = sizeof(args),
> + .flags = BPF_F_TEST_RUN_ON_CPU,
> + );
> + int i, err, key = 0, num_online;
> + bool *online;
> +
> + err = parse_cpu_mask_file("/sys/devices/system/cpu/online", &online, &num_online);
> + if (!ASSERT_OK(err, "parse_cpu_mask_file"))
> + return;
> +
> + /* run on every online-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"))
> + break;
> +
> + 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]");
Can we add a pre-run assert to ensure that the per-cpu data has not
already been modified by another run? Can we also add some cpuid
specific assignment to ensure the runs are done on the proper CPU?
> + }
> +
> + free(online);
> +}
> +
> +static void test_global_percpu_data_init(void)
> +{
> + struct test_global_percpu_data__percpu init_value = {};
> + struct test_global_percpu_data__percpu *init_data;
> + struct test_global_percpu_data *skel = NULL;
> + size_t init_data_sz;
> + struct bpf_map *map;
> + int prog_fd, err;
> +
> + 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;
> + if (!ASSERT_OK_PTR(skel->percpu_data, "skel->percpu_data"))
> + goto out;
> + if (!ASSERT_OK_PTR(skel->percpu_looooooooong, "skel->percpu_looooooooong"))
> + goto out;
> +
> + ASSERT_STREQ(bpf_map__name(skel->maps.percpu_data), ".percpu.data", "data map name");
> + ASSERT_STREQ(bpf_map__name(skel->maps.percpu_looooooooong), ".percpu.looooooooong",
> + "long map name");
> + ASSERT_STREQ(bpf_map__name(skel->maps.percpu), ".percpu", "map name");
> + 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");
> +
> + prog_fd = bpf_program__fd(skel->progs.update_percpu_data);
> + test_percpu_data_on_cpus(bpf_map__fd(map), prog_fd);
> +
> +out:
> + test_global_percpu_data__destroy(skel);
> +}
> +
> +static void test_global_percpu_data_lskel(void)
> +{
> + struct test_global_percpu_data_lskel *lskel = NULL;
> + int prog_fd, map_fd;
> +
> + lskel = test_global_percpu_data_lskel__open_and_load();
> + if (!ASSERT_OK_PTR(lskel, "test_global_percpu_data_lskel__open_and_load"))
> + goto out;
> +
> + map_fd = lskel->maps.percpu.map_fd;
> + prog_fd = lskel->progs.update_percpu_data.prog_fd;
> + test_percpu_data_on_cpus(map_fd, prog_fd);
> +
> +out:
> + test_global_percpu_data_lskel__destroy(lskel);
> +}
> +
> +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");
Not sure why these assertions would be necessary, wouldn't the test crash or
quickly fail if they didn't hold?
> + 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");
> + }
If we turn the substest to SYSCALL instead of TRACEPOINT we can read
and report the return value as the test happens and keep them
self-contained.
> +
> +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..54380dfb11a5
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/test_global_percpu_data.c
> @@ -0,0 +1,33 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <vmlinux.h>
> +#include <bpf/bpf_helpers.h>
> +#include "bpf_misc.h"
> +
> +int unused SEC(".percpu.looooooooong");
> +int data2 SEC(".percpu.data");
> +int data SEC(".percpu") = -1;
> +int nums[7] SEC(".percpu");
> +char run SEC(".percpu") = 0;
Can we add a comment that those are used to test the names in the
userspace portion of the test? As they stand they seem unused.
> +struct {
> + char set;
> + int i;
> + int nums[7];
> +} struct_data SEC(".percpu") = {
> + .set = 0,
> + .i = -1,
> +};
> +
> +SEC("raw_tp/task_rename")
Is this actually installed as a tracepoint? I think we run it as a
program. Is putting it in raw_tp doing anything in any way?
> +__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";
next prev parent reply other threads:[~2026-07-17 22:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-15 15:32 [PATCH bpf-next v10 0/9] bpf: Introduce " Leon Hwang
2026-07-15 15:32 ` [PATCH bpf-next v10 1/9] bpf: Drop duplicate blank lines in verifier Leon Hwang
2026-07-17 5:08 ` Emil Tsalapatis
2026-07-17 5:28 ` Leon Hwang
2026-07-15 15:32 ` [PATCH bpf-next v10 2/9] bpf: Introduce global percpu data Leon Hwang
2026-07-17 6:25 ` Emil Tsalapatis
2026-07-15 15:32 ` [PATCH bpf-next v10 3/9] libbpf: Probe percpu data feature Leon Hwang
2026-07-17 21:52 ` Emil Tsalapatis
2026-07-15 15:32 ` [PATCH bpf-next v10 4/9] libbpf: Add support for global percpu data Leon Hwang
2026-07-17 21:39 ` Emil Tsalapatis
2026-07-15 15:32 ` [PATCH bpf-next v10 5/9] bpftool: Generate skeleton " Leon Hwang
2026-07-17 21:52 ` Emil Tsalapatis
2026-07-15 15:32 ` [PATCH bpf-next v10 6/9] selftests/bpf: Add tests to verify " Leon Hwang
2026-07-15 16:11 ` bot+bpf-ci
2026-07-16 5:30 ` Leon Hwang
2026-07-17 22:47 ` Emil Tsalapatis [this message]
2026-07-15 15:32 ` [PATCH bpf-next v10 7/9] selftests/bpf: Test direct reading/writing read-only percpu_array map Leon Hwang
2026-07-17 22:49 ` Emil Tsalapatis
2026-07-15 15:32 ` [PATCH bpf-next v10 8/9] selftests/bpf: Test verifier log for global percpu data Leon Hwang
2026-07-17 22:50 ` Emil Tsalapatis
2026-07-15 15:32 ` [PATCH bpf-next v10 9/9] selftests/bpf: Verify bpf_iter " Leon Hwang
2026-07-17 23:11 ` Emil Tsalapatis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DK17N9ROVHRL.23B11VSVOOL6E@etsalapatis.com \
--to=emil@etsalapatis.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kernel-patches-bot@fb.com \
--cc=leon.hwang@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=qmo@kernel.org \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox