selftests/bpf: Call bpf_get_numa_node_id() in trigger_count()

The bench test "trig-kernel-count" can be used as a baseline comparison
for fentry and other benchmarks, and the calling to bpf_get_numa_node_id()
should be considered as composition of the baseline. So, let's call it in
trigger_count(). Meanwhile, rename trigger_count() to
trigger_kernel_count() to make it easier understand.

Signed-off-by: Menglong Dong <dongml2@chinatelecom.cn>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20251116014242.151110-1-dongml2@chinatelecom.cn

diff --git a/tools/testing/selftests/bpf/benchs/bench_trigger.c b/tools/testing/selftests/bpf/benchs/bench_trigger.c
index 1e2aff007c2a40721cec02ee6401114b3a3e04c8..34018fc3927f299573735b36d85524038e0f4e46 100644 (file)
--- a/tools/testing/selftests/bpf/benchs/bench_trigger.c
+++ b/tools/testing/selftests/bpf/benchs/bench_trigger.c
@@ -180,10 +180,10 @@ static void trigger_kernel_count_setup(void)
 {
        setup_ctx();
        bpf_program__set_autoload(ctx.skel->progs.trigger_driver, false);
-       bpf_program__set_autoload(ctx.skel->progs.trigger_count, true);
+       bpf_program__set_autoload(ctx.skel->progs.trigger_kernel_count, true);
        load_ctx();
        /* override driver program */
-       ctx.driver_prog_fd = bpf_program__fd(ctx.skel->progs.trigger_count);
+       ctx.driver_prog_fd = bpf_program__fd(ctx.skel->progs.trigger_kernel_count);
 }
 
 static void trigger_kprobe_setup(void)

diff --git a/tools/testing/selftests/bpf/progs/trigger_bench.c b/tools/testing/selftests/bpf/progs/trigger_bench.c
index 3d5f30c29ae33987acfc057434bfa8b25acd3298..2898b3749d076d657f53ff46e575f6287aa18cc9 100644 (file)
--- a/tools/testing/selftests/bpf/progs/trigger_bench.c
+++ b/tools/testing/selftests/bpf/progs/trigger_bench.c
@@ -42,12 +42,14 @@ int bench_trigger_uprobe_multi(void *ctx)
 const volatile int batch_iters = 0;
 
 SEC("?raw_tp")
-int trigger_count(void *ctx)
+int trigger_kernel_count(void *ctx)
 {
        int i;
 
-       for (i = 0; i < batch_iters; i++)
+       for (i = 0; i < batch_iters; i++) {
                inc_counter();
+               bpf_get_numa_node_id();
+       }
 
        return 0;
 }