selftests/bpf: Fix tests to use arch-dependent syscall entry points

rnav · anakryiko · commit 422ee58dc0ef · 2022-02-05T12:40:56.000-08:00
Some of the tests are using x86_64 ABI-specific syscall entry points (such as __x64_sys_nanosleep and __x64_sys_getpgid). Update them to use architecture-dependent syscall entry names. Also update fexit_sleep test to not use BPF_PROG() so that it is clear that the syscall parameters aren't being accessed in the bpf prog. Note that none of the bpf progs in these tests are actually accessing any of the syscall parameters. The only exception is perfbuf_bench, which passes on the bpf prog context into bpf_perf_event_output() as a pointer to pt_regs, but that looks to be mostly ignored. Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/e35f7051f03e269b623a68b139d8ed131325f7b7.1643973917.git.naveen.n.rao@linux.vnet.ibm.com
diff --git a/tools/testing/selftests/bpf/progs/bloom_filter_bench.c b/tools/testing/selftests/bpf/progs/bloom_filter_bench.c
@@ -5,6 +5,7 @@
 #include <linux/bpf.h>
 #include <stdbool.h>
 #include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
@@ -87,7 +88,7 @@ bloom_callback(struct bpf_map *map, __u32 *key, void *val,
 	return 0;
 }
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int bloom_lookup(void *ctx)
 {
 	struct callback_ctx data;
@@ -100,7 +101,7 @@ int bloom_lookup(void *ctx)
 	return 0;
 }
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int bloom_update(void *ctx)
 {
 	struct callback_ctx data;
@@ -113,7 +114,7 @@ int bloom_update(void *ctx)
 	return 0;
 }
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int bloom_hashmap_lookup(void *ctx)
 {
 	__u64 *result;
diff --git a/tools/testing/selftests/bpf/progs/bloom_filter_map.c b/tools/testing/selftests/bpf/progs/bloom_filter_map.c
@@ -3,6 +3,7 @@
 
 #include <linux/bpf.h>
 #include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
@@ -51,7 +52,7 @@ check_elem(struct bpf_map *map, __u32 *key, __u32 *val,
 	return 0;
 }
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int inner_map(void *ctx)
 {
 	struct bpf_map *inner_map;
@@ -70,7 +71,7 @@ int inner_map(void *ctx)
 	return 0;
 }
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int check_bloom(void *ctx)
 {
 	struct callback_ctx data;
diff --git a/tools/testing/selftests/bpf/progs/bpf_loop.c b/tools/testing/selftests/bpf/progs/bpf_loop.c
@@ -3,6 +3,7 @@
 
 #include "vmlinux.h"
 #include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
@@ -53,7 +54,7 @@ static int nested_callback1(__u32 index, void *data)
 	return 0;
 }
 
-SEC("fentry/__x64_sys_nanosleep")
+SEC("fentry/" SYS_PREFIX "sys_nanosleep")
 int test_prog(void *ctx)
 {
 	struct callback_ctx data = {};
@@ -71,7 +72,7 @@ int test_prog(void *ctx)
 	return 0;
 }
 
-SEC("fentry/__x64_sys_nanosleep")
+SEC("fentry/" SYS_PREFIX "sys_nanosleep")
 int prog_null_ctx(void *ctx)
 {
 	if (bpf_get_current_pid_tgid() >> 32 != pid)
@@ -82,7 +83,7 @@ int prog_null_ctx(void *ctx)
 	return 0;
 }
 
-SEC("fentry/__x64_sys_nanosleep")
+SEC("fentry/" SYS_PREFIX "sys_nanosleep")
 int prog_invalid_flags(void *ctx)
 {
 	struct callback_ctx data = {};
@@ -95,7 +96,7 @@ int prog_invalid_flags(void *ctx)
 	return 0;
 }
 
-SEC("fentry/__x64_sys_nanosleep")
+SEC("fentry/" SYS_PREFIX "sys_nanosleep")
 int prog_nested_calls(void *ctx)
 {
 	struct callback_ctx data = {};
diff --git a/tools/testing/selftests/bpf/progs/bpf_loop_bench.c b/tools/testing/selftests/bpf/progs/bpf_loop_bench.c
@@ -3,6 +3,7 @@
 
 #include "vmlinux.h"
 #include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
@@ -14,7 +15,7 @@ static int empty_callback(__u32 index, void *data)
 	return 0;
 }
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int benchmark(void *ctx)
 {
 	for (int i = 0; i < 1000; i++) {
diff --git a/tools/testing/selftests/bpf/progs/fexit_sleep.c b/tools/testing/selftests/bpf/progs/fexit_sleep.c
@@ -3,15 +3,16 @@
 #include "vmlinux.h"
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>
+#include "bpf_misc.h"
 
 char LICENSE[] SEC("license") = "GPL";
 
 int pid = 0;
 int fentry_cnt = 0;
 int fexit_cnt = 0;
 
-SEC("fentry/__x64_sys_nanosleep")
-int BPF_PROG(nanosleep_fentry, const struct pt_regs *regs)
+SEC("fentry/" SYS_PREFIX "sys_nanosleep")
+int nanosleep_fentry(void *ctx)
 {
 	if (bpf_get_current_pid_tgid() >> 32 != pid)
 		return 0;
@@ -20,8 +21,8 @@ int BPF_PROG(nanosleep_fentry, const struct pt_regs *regs)
 	return 0;
 }
 
-SEC("fexit/__x64_sys_nanosleep")
-int BPF_PROG(nanosleep_fexit, const struct pt_regs *regs, int ret)
+SEC("fexit/" SYS_PREFIX "sys_nanosleep")
+int nanosleep_fexit(void *ctx)
 {
 	if (bpf_get_current_pid_tgid() >> 32 != pid)
 		return 0;
diff --git a/tools/testing/selftests/bpf/progs/perfbuf_bench.c b/tools/testing/selftests/bpf/progs/perfbuf_bench.c
@@ -4,6 +4,7 @@
 #include <linux/bpf.h>
 #include <stdint.h>
 #include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
@@ -18,7 +19,7 @@ const volatile int batch_cnt = 0;
 long sample_val = 42;
 long dropped __attribute__((aligned(128))) = 0;
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int bench_perfbuf(void *ctx)
 {
 	__u64 *sample;
diff --git a/tools/testing/selftests/bpf/progs/ringbuf_bench.c b/tools/testing/selftests/bpf/progs/ringbuf_bench.c
@@ -4,6 +4,7 @@
 #include <linux/bpf.h>
 #include <stdint.h>
 #include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
@@ -30,7 +31,7 @@ static __always_inline long get_flags()
 	return sz >= wakeup_data_size ? BPF_RB_FORCE_WAKEUP : BPF_RB_NO_WAKEUP;
 }
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int bench_ringbuf(void *ctx)
 {
 	long *sample, flags;
diff --git a/tools/testing/selftests/bpf/progs/test_ringbuf.c b/tools/testing/selftests/bpf/progs/test_ringbuf.c
@@ -3,6 +3,7 @@
 
 #include <linux/bpf.h>
 #include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
@@ -35,7 +36,7 @@ long prod_pos = 0;
 /* inner state */
 long seq = 0;
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int test_ringbuf(void *ctx)
 {
 	int cur_pid = bpf_get_current_pid_tgid() >> 32;
diff --git a/tools/testing/selftests/bpf/progs/trace_printk.c b/tools/testing/selftests/bpf/progs/trace_printk.c
@@ -4,6 +4,7 @@
 #include "vmlinux.h"
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
@@ -12,7 +13,7 @@ int trace_printk_ran = 0;
 
 const char fmt[] = "Testing,testing %d\n";
 
-SEC("fentry/__x64_sys_nanosleep")
+SEC("fentry/" SYS_PREFIX "sys_nanosleep")
 int sys_enter(void *ctx)
 {
 	trace_printk_ret = bpf_trace_printk(fmt, sizeof(fmt),
diff --git a/tools/testing/selftests/bpf/progs/trace_vprintk.c b/tools/testing/selftests/bpf/progs/trace_vprintk.c
@@ -4,14 +4,15 @@
 #include "vmlinux.h"
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
 int null_data_vprintk_ret = 0;
 int trace_vprintk_ret = 0;
 int trace_vprintk_ran = 0;
 
-SEC("fentry/__x64_sys_nanosleep")
+SEC("fentry/" SYS_PREFIX "sys_nanosleep")
 int sys_enter(void *ctx)
 {
 	static const char one[] = "1";
diff --git a/tools/testing/selftests/bpf/progs/trigger_bench.c b/tools/testing/selftests/bpf/progs/trigger_bench.c
@@ -5,6 +5,7 @@
 #include <asm/unistd.h>
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>
+#include "bpf_misc.h"
 
 char _license[] SEC("license") = "GPL";
 
@@ -25,28 +26,28 @@ int BPF_PROG(bench_trigger_raw_tp, struct pt_regs *regs, long id)
 	return 0;
 }
 
-SEC("kprobe/__x64_sys_getpgid")
+SEC("kprobe/" SYS_PREFIX "sys_getpgid")
 int bench_trigger_kprobe(void *ctx)
 {
 	__sync_add_and_fetch(&hits, 1);
 	return 0;
 }
 
-SEC("fentry/__x64_sys_getpgid")
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
 int bench_trigger_fentry(void *ctx)
 {
 	__sync_add_and_fetch(&hits, 1);
 	return 0;
 }
 
-SEC("fentry.s/__x64_sys_getpgid")
+SEC("fentry.s/" SYS_PREFIX "sys_getpgid")
 int bench_trigger_fentry_sleep(void *ctx)
 {
 	__sync_add_and_fetch(&hits, 1);
 	return 0;
 }
 
-SEC("fmod_ret/__x64_sys_getpgid")
+SEC("fmod_ret/" SYS_PREFIX "sys_getpgid")
 int bench_trigger_fmodret(void *ctx)
 {
 	__sync_add_and_fetch(&hits, 1);

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#include <linux/bpf.h>`
`6`	`6`	`#include <stdbool.h>`
`7`	`7`	`#include <bpf/bpf_helpers.h>`
	`8`	`+#include "bpf_misc.h"`
`8`	`9`
`9`	`10`	`char _license[] SEC("license") = "GPL";`
`10`	`11`
`@@ -87,7 +88,7 @@ bloom_callback(struct bpf_map map, __u32 key, void *val,`
`87`	`88`	`return 0;`
`88`	`89`	`}`
`89`	`90`
`90`		`-SEC("fentry/__x64_sys_getpgid")`
	`91`	`+SEC("fentry/" SYS_PREFIX "sys_getpgid")`
`91`	`92`	`int bloom_lookup(void *ctx)`
`92`	`93`	`{`
`93`	`94`	`struct callback_ctx data;`
`@@ -100,7 +101,7 @@ int bloom_lookup(void *ctx)`
`100`	`101`	`return 0;`
`101`	`102`	`}`
`102`	`103`
`103`		`-SEC("fentry/__x64_sys_getpgid")`
	`104`	`+SEC("fentry/" SYS_PREFIX "sys_getpgid")`
`104`	`105`	`int bloom_update(void *ctx)`
`105`	`106`	`{`
`106`	`107`	`struct callback_ctx data;`
`@@ -113,7 +114,7 @@ int bloom_update(void *ctx)`
`113`	`114`	`return 0;`
`114`	`115`	`}`
`115`	`116`
`116`		`-SEC("fentry/__x64_sys_getpgid")`
	`117`	`+SEC("fentry/" SYS_PREFIX "sys_getpgid")`
`117`	`118`	`int bloom_hashmap_lookup(void *ctx)`
`118`	`119`	`{`
`119`	`120`	`__u64 *result;`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`#include <linux/bpf.h>`
`5`	`5`	`#include <bpf/bpf_helpers.h>`
	`6`	`+#include "bpf_misc.h"`
`6`	`7`
`7`	`8`	`char _license[] SEC("license") = "GPL";`
`8`	`9`
`@@ -51,7 +52,7 @@ check_elem(struct bpf_map map, __u32 key, __u32 *val,`
`51`	`52`	`return 0;`
`52`	`53`	`}`
`53`	`54`
`54`		`-SEC("fentry/__x64_sys_getpgid")`
	`55`	`+SEC("fentry/" SYS_PREFIX "sys_getpgid")`
`55`	`56`	`int inner_map(void *ctx)`
`56`	`57`	`{`
`57`	`58`	`struct bpf_map *inner_map;`
`@@ -70,7 +71,7 @@ int inner_map(void *ctx)`
`70`	`71`	`return 0;`
`71`	`72`	`}`
`72`	`73`
`73`		`-SEC("fentry/__x64_sys_getpgid")`
	`74`	`+SEC("fentry/" SYS_PREFIX "sys_getpgid")`
`74`	`75`	`int check_bloom(void *ctx)`
`75`	`76`	`{`
`76`	`77`	`struct callback_ctx data;`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "vmlinux.h"`
`5`	`5`	`#include <bpf/bpf_helpers.h>`
	`6`	`+#include "bpf_misc.h"`
`6`	`7`
`7`	`8`	`char _license[] SEC("license") = "GPL";`
`8`	`9`
`@@ -53,7 +54,7 @@ static int nested_callback1(__u32 index, void *data)`
`53`	`54`	`return 0;`
`54`	`55`	`}`
`55`	`56`
`56`		`-SEC("fentry/__x64_sys_nanosleep")`
	`57`	`+SEC("fentry/" SYS_PREFIX "sys_nanosleep")`
`57`	`58`	`int test_prog(void *ctx)`
`58`	`59`	`{`
`59`	`60`	`struct callback_ctx data = {};`
`@@ -71,7 +72,7 @@ int test_prog(void *ctx)`
`71`	`72`	`return 0;`
`72`	`73`	`}`
`73`	`74`
`74`		`-SEC("fentry/__x64_sys_nanosleep")`
	`75`	`+SEC("fentry/" SYS_PREFIX "sys_nanosleep")`
`75`	`76`	`int prog_null_ctx(void *ctx)`
`76`	`77`	`{`
`77`	`78`	`if (bpf_get_current_pid_tgid() >> 32 != pid)`
`@@ -82,7 +83,7 @@ int prog_null_ctx(void *ctx)`
`82`	`83`	`return 0;`
`83`	`84`	`}`
`84`	`85`
`85`		`-SEC("fentry/__x64_sys_nanosleep")`
	`86`	`+SEC("fentry/" SYS_PREFIX "sys_nanosleep")`
`86`	`87`	`int prog_invalid_flags(void *ctx)`
`87`	`88`	`{`
`88`	`89`	`struct callback_ctx data = {};`
`@@ -95,7 +96,7 @@ int prog_invalid_flags(void *ctx)`
`95`	`96`	`return 0;`
`96`	`97`	`}`
`97`	`98`
`98`		`-SEC("fentry/__x64_sys_nanosleep")`
	`99`	`+SEC("fentry/" SYS_PREFIX "sys_nanosleep")`
`99`	`100`	`int prog_nested_calls(void *ctx)`
`100`	`101`	`{`
`101`	`102`	`struct callback_ctx data = {};`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#include <linux/bpf.h>`
`5`	`5`	`#include <stdint.h>`
`6`	`6`	`#include <bpf/bpf_helpers.h>`
	`7`	`+#include "bpf_misc.h"`
`7`	`8`
`8`	`9`	`char _license[] SEC("license") = "GPL";`
`9`	`10`
`@@ -30,7 +31,7 @@ static __always_inline long get_flags()`
`30`	`31`	`return sz >= wakeup_data_size ? BPF_RB_FORCE_WAKEUP : BPF_RB_NO_WAKEUP;`
`31`	`32`	`}`
`32`	`33`
`33`		`-SEC("fentry/__x64_sys_getpgid")`
	`34`	`+SEC("fentry/" SYS_PREFIX "sys_getpgid")`
`34`	`35`	`int bench_ringbuf(void *ctx)`
`35`	`36`	`{`
`36`	`37`	`long *sample, flags;`