hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICU4YT -------------------------------- LTS commit 06819489ee4c ("selftests/bpf: fix perf_event link info name_len assertion") was backported with stable depend patches: - commit 3ab8f9fc286c ("selftests/bpf: Add cookies check for perf_event fill_link_info test") - commit d9bb36d54939 ("selftests/bpf: Use bpf_link__destroy in fill_link_info tests") However, we do not need these two depend patches and they will cause compiling error of bpf selftests. So let's revert these patches and re-adapt the target commit. Fixes: 06819489ee4c ("selftests/bpf: fix perf_event link info name_len assertion") Signed-off-by: Pu Lehui <pulehui@huawei.com> --- tools/testing/selftests/bpf/prog_tests/fill_link_info.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c index e0208b0e53f1..e81f4d114c7a 100644 --- a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c +++ b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c @@ -65,9 +65,8 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add ASSERT_EQ(info.perf_event.kprobe.cookie, PERF_EVENT_COOKIE, "kprobe_cookie"); - ASSERT_EQ(info.perf_event.kprobe.name_len, strlen(KPROBE_FUNC) + 1, - "name_len"); if (!info.perf_event.kprobe.func_name) { + ASSERT_EQ(info.perf_event.kprobe.name_len, 0, "name_len"); info.perf_event.kprobe.func_name = ptr_to_u64(&buf); info.perf_event.kprobe.name_len = sizeof(buf); goto again; @@ -78,9 +77,8 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add ASSERT_EQ(err, 0, "cmp_kprobe_func_name"); break; case BPF_PERF_EVENT_TRACEPOINT: - ASSERT_EQ(info.perf_event.tracepoint.name_len, strlen(TP_NAME) + 1, - "name_len"); if (!info.perf_event.tracepoint.tp_name) { + ASSERT_EQ(info.perf_event.tracepoint.name_len, 0, "name_len"); info.perf_event.tracepoint.tp_name = ptr_to_u64(&buf); info.perf_event.tracepoint.name_len = sizeof(buf); goto again; @@ -96,9 +94,8 @@ static int verify_perf_link_info(int fd, enum bpf_perf_event_type type, long add case BPF_PERF_EVENT_URETPROBE: ASSERT_EQ(info.perf_event.uprobe.offset, offset, "uprobe_offset"); - ASSERT_EQ(info.perf_event.uprobe.name_len, strlen(UPROBE_FILE) + 1, - "name_len"); if (!info.perf_event.uprobe.file_name) { + ASSERT_EQ(info.perf_event.uprobe.name_len, 0, "name_len"); info.perf_event.uprobe.file_name = ptr_to_u64(&buf); info.perf_event.uprobe.name_len = sizeof(buf); goto again; -- 2.34.1

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICU4YT -------------------------------- LTS commit 06819489ee4c ("selftests/bpf: fix perf_event link info name_len assertion") was backported with stable depend patches: - commit 3ab8f9fc286c ("selftests/bpf: Add cookies check for perf_event fill_link_info test") - commit d9bb36d54939 ("selftests/bpf: Use bpf_link__destroy in fill_link_info tests") However, we do not need these two depend patches and they will cause compiling error of bpf selftests. So let's revert these patches and re-adapt the target commit. Fixes: d9bb36d54939 ("selftests/bpf: Use bpf_link__destroy in fill_link_info tests") Signed-off-by: Pu Lehui <pulehui@huawei.com> --- .../selftests/bpf/prog_tests/fill_link_info.c | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c index d07ac9f3de78..c5a51138a376 100644 --- a/tools/testing/selftests/bpf/prog_tests/fill_link_info.c +++ b/tools/testing/selftests/bpf/prog_tests/fill_link_info.c @@ -140,14 +140,14 @@ static void test_kprobe_fill_link_info(struct test_fill_link_info *skel, .retprobe = type == BPF_PERF_EVENT_KRETPROBE, ); ssize_t entry_offset = 0; - struct bpf_link *link; int link_fd, err; - link = bpf_program__attach_kprobe_opts(skel->progs.kprobe_run, KPROBE_FUNC, &opts); - if (!ASSERT_OK_PTR(link, "attach_kprobe")) + skel->links.kprobe_run = bpf_program__attach_kprobe_opts(skel->progs.kprobe_run, + KPROBE_FUNC, &opts); + if (!ASSERT_OK_PTR(skel->links.kprobe_run, "attach_kprobe")) return; - link_fd = bpf_link__fd(link); + link_fd = bpf_link__fd(skel->links.kprobe_run); if (!invalid) { /* See also arch_adjust_kprobe_addr(). */ if (skel->kconfig->CONFIG_X86_KERNEL_IBT) @@ -161,41 +161,39 @@ static void test_kprobe_fill_link_info(struct test_fill_link_info *skel, } else { kprobe_fill_invalid_user_buffer(link_fd); } - bpf_link__destroy(link); + bpf_link__detach(skel->links.kprobe_run); } static void test_tp_fill_link_info(struct test_fill_link_info *skel) { - struct bpf_link *link; int link_fd, err; - link = bpf_program__attach_tracepoint(skel->progs.tp_run, TP_CAT, TP_NAME); - if (!ASSERT_OK_PTR(link, "attach_tp")) + skel->links.tp_run = bpf_program__attach_tracepoint(skel->progs.tp_run, TP_CAT, TP_NAME); + if (!ASSERT_OK_PTR(skel->links.tp_run, "attach_tp")) return; - link_fd = bpf_link__fd(link); + link_fd = bpf_link__fd(skel->links.tp_run); err = verify_perf_link_info(link_fd, BPF_PERF_EVENT_TRACEPOINT, 0, 0, 0); ASSERT_OK(err, "verify_perf_link_info"); - bpf_link__destroy(link); + bpf_link__detach(skel->links.tp_run); } static void test_uprobe_fill_link_info(struct test_fill_link_info *skel, enum bpf_perf_event_type type) { - struct bpf_link *link; int link_fd, err; - link = bpf_program__attach_uprobe(skel->progs.uprobe_run, - type == BPF_PERF_EVENT_URETPROBE, - 0, /* self pid */ - UPROBE_FILE, uprobe_offset); - if (!ASSERT_OK_PTR(link, "attach_uprobe")) + skel->links.uprobe_run = bpf_program__attach_uprobe(skel->progs.uprobe_run, + type == BPF_PERF_EVENT_URETPROBE, + 0, /* self pid */ + UPROBE_FILE, uprobe_offset); + if (!ASSERT_OK_PTR(skel->links.uprobe_run, "attach_uprobe")) return; - link_fd = bpf_link__fd(link); + link_fd = bpf_link__fd(skel->links.uprobe_run); err = verify_perf_link_info(link_fd, type, 0, uprobe_offset, 0); ASSERT_OK(err, "verify_perf_link_info"); - bpf_link__destroy(link); + bpf_link__detach(skel->links.uprobe_run); } static int verify_kmulti_link_info(int fd, bool retprobe) @@ -284,24 +282,24 @@ static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel, bool retprobe, bool invalid) { LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); - struct bpf_link *link; int link_fd, err; opts.syms = kmulti_syms; opts.cnt = KMULTI_CNT; opts.retprobe = retprobe; - link = bpf_program__attach_kprobe_multi_opts(skel->progs.kmulti_run, NULL, &opts); - if (!ASSERT_OK_PTR(link, "attach_kprobe_multi")) + skel->links.kmulti_run = bpf_program__attach_kprobe_multi_opts(skel->progs.kmulti_run, + NULL, &opts); + if (!ASSERT_OK_PTR(skel->links.kmulti_run, "attach_kprobe_multi")) return; - link_fd = bpf_link__fd(link); + link_fd = bpf_link__fd(skel->links.kmulti_run); if (!invalid) { err = verify_kmulti_link_info(link_fd, retprobe); ASSERT_OK(err, "verify_kmulti_link_info"); } else { verify_kmulti_invalid_user_buffer(link_fd); } - bpf_link__destroy(link); + bpf_link__detach(skel->links.kmulti_run); } void test_fill_link_info(void) -- 2.34.1

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICU4YT -------------------------------- Makefile will cover bpf prog files in samples/bpf directory. However, bpf_rvi_cpuinfo_x86.bpf.c and bpf_rvi_cpuinfo_arm64.bpf.c need to be built in different arch, or will cause compilation error. Let's move bpf_rvi_* progs to bpf_rvi directory to solve this issue. Fixes: 2e9e31a88708 ("samples/bpf: Add iterator program for cpuinfo_x86") Fixes: 9fc96fabefc7 ("samples/bpf: Add iterator program for cpuinfo_arm64") Signed-off-by: Pu Lehui <pulehui@huawei.com> --- samples/bpf/Makefile | 6 ++++-- samples/bpf/{ => bpf_rvi}/bpf_rvi_cpu_online.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_cpuinfo_arm64.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_cpuinfo_x86.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_diskstats.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_loadavg.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_meminfo.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_partitions.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_stat.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_swaps.bpf.c | 0 samples/bpf/{ => bpf_rvi}/bpf_rvi_uptime.bpf.c | 0 11 files changed, 4 insertions(+), 2 deletions(-) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_cpu_online.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_cpuinfo_arm64.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_cpuinfo_x86.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_diskstats.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_loadavg.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_meminfo.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_partitions.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_stat.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_swaps.bpf.c (100%) rename samples/bpf/{ => bpf_rvi}/bpf_rvi_uptime.bpf.c (100%) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 7627f996b5e5..6d4767f7e250 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -149,10 +149,12 @@ always-y += task_fd_query_kern.o always-y += ibumad_kern.o always-y += hbm_out_kern.o always-y += hbm_edt_kern.o + +# build for bpf_rvi ifeq ($(ARCH), x86) -always-$(CONFIG_BPF_RVI) += bpf_rvi_cpuinfo_x86.bpf.o +always-$(CONFIG_BPF_RVI) += bpf_rvi/bpf_rvi_cpuinfo_x86.bpf.o endif -always-$(CONFIG_BPF_RVI) += bpf_rvi_cpu_online.bpf.o +always-$(CONFIG_BPF_RVI) += bpf_rvi/bpf_rvi_cpu_online.bpf.o ifeq ($(ARCH), arm) # Strip all except -D__LINUX_ARM_ARCH__ option needed to handle linux diff --git a/samples/bpf/bpf_rvi_cpu_online.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_cpu_online.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_cpu_online.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_cpu_online.bpf.c diff --git a/samples/bpf/bpf_rvi_cpuinfo_arm64.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_cpuinfo_arm64.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_cpuinfo_arm64.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_cpuinfo_arm64.bpf.c diff --git a/samples/bpf/bpf_rvi_cpuinfo_x86.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_cpuinfo_x86.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_cpuinfo_x86.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_cpuinfo_x86.bpf.c diff --git a/samples/bpf/bpf_rvi_diskstats.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_diskstats.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_diskstats.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_diskstats.bpf.c diff --git a/samples/bpf/bpf_rvi_loadavg.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_loadavg.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_loadavg.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_loadavg.bpf.c diff --git a/samples/bpf/bpf_rvi_meminfo.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_meminfo.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_meminfo.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_meminfo.bpf.c diff --git a/samples/bpf/bpf_rvi_partitions.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_partitions.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_partitions.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_partitions.bpf.c diff --git a/samples/bpf/bpf_rvi_stat.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_stat.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_stat.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_stat.bpf.c diff --git a/samples/bpf/bpf_rvi_swaps.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_swaps.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_swaps.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_swaps.bpf.c diff --git a/samples/bpf/bpf_rvi_uptime.bpf.c b/samples/bpf/bpf_rvi/bpf_rvi_uptime.bpf.c similarity index 100% rename from samples/bpf/bpf_rvi_uptime.bpf.c rename to samples/bpf/bpf_rvi/bpf_rvi_uptime.bpf.c -- 2.34.1