From: Hou Tao <houtao1@xxxxxxxxxx> sys_pidfd_open() is defined twice in both test_bprm_opts.c and test_local_storage.c, so move it to test_progs.h. And it will be used in task_local_storage.c as well. Signed-off-by: Hou Tao <houtao1@xxxxxxxxxx> --- tools/testing/selftests/bpf/prog_tests/test_bprm_opts.c | 9 --------- .../selftests/bpf/prog_tests/test_local_storage.c | 9 --------- tools/testing/selftests/bpf/test_progs.h | 9 +++++++++ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/test_bprm_opts.c b/tools/testing/selftests/bpf/prog_tests/test_bprm_opts.c index 2559bb775762..17951999642a 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_bprm_opts.c +++ b/tools/testing/selftests/bpf/prog_tests/test_bprm_opts.c @@ -10,17 +10,8 @@ #include "bprm_opts.skel.h" #include "network_helpers.h" -#ifndef __NR_pidfd_open -#define __NR_pidfd_open 434 -#endif - static const char * const bash_envp[] = { "TMPDIR=shouldnotbeset", NULL }; -static inline int sys_pidfd_open(pid_t pid, unsigned int flags) -{ - return syscall(__NR_pidfd_open, pid, flags); -} - static int update_storage(int map_fd, int secureexec) { int task_fd, ret = 0; diff --git a/tools/testing/selftests/bpf/prog_tests/test_local_storage.c b/tools/testing/selftests/bpf/prog_tests/test_local_storage.c index 26ac26a88026..f8830c92c043 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_local_storage.c +++ b/tools/testing/selftests/bpf/prog_tests/test_local_storage.c @@ -12,15 +12,6 @@ #include "local_storage.skel.h" #include "network_helpers.h" -#ifndef __NR_pidfd_open -#define __NR_pidfd_open 434 -#endif - -static inline int sys_pidfd_open(pid_t pid, unsigned int flags) -{ - return syscall(__NR_pidfd_open, pid, flags); -} - static unsigned int duration; #define TEST_STORAGE_VALUE 0xbeefdead diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h index 5fe1365c2bb1..6feb8595bbac 100644 --- a/tools/testing/selftests/bpf/test_progs.h +++ b/tools/testing/selftests/bpf/test_progs.h @@ -396,3 +396,12 @@ int trigger_module_test_write(int write_sz); #endif #define BPF_TESTMOD_TEST_FILE "/sys/kernel/bpf_testmod" + +#ifndef __NR_pidfd_open +#define __NR_pidfd_open 434 +#endif + +static inline int sys_pidfd_open(pid_t pid, unsigned int flags) +{ + return syscall(__NR_pidfd_open, pid, flags); +} -- 2.29.2