Commit 62c69e89 authored by Hou Tao's avatar Hou Tao Committed by Andrii Nakryiko
Browse files

selftests/bpf: Use sys_pidfd_open() helper when possible 



SYS_pidfd_open may be undefined for old glibc, so using sys_pidfd_open()
helper defined in task_local_storage_helpers.h instead to fix potential
build failure.

And according to commit 7615d9e1 ("arch: wire-up pidfd_open()"), the
syscall number of pidfd_open is always 434 except for alpha architure,
so update the definition of __NR_pidfd_open accordingly.

Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221011071249.3471760-1-houtao@huaweicloud.com
parent e94e0a2d

tools/testing/selftests/bpf/prog_tests/bpf_iter.c

+3 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <test_progs.h>

#include <unistd.h>

#include <sys/syscall.h>

#include <task_local_storage_helpers.h>

#include "bpf_iter_ipv6_route.skel.h"

#include "bpf_iter_netlink.skel.h"

#include "bpf_iter_bpf_map.skel.h"
@@ -175,11 +176,6 @@ static void test_bpf_map(void) 
	bpf_iter_bpf_map__destroy(skel);

}



static int pidfd_open(pid_t pid, unsigned int flags)

{

	return syscall(SYS_pidfd_open, pid, flags);

}



static void check_bpf_link_info(const struct bpf_program *prog)

{

	LIBBPF_OPTS(bpf_iter_attach_opts, opts);
@@ -295,8 +291,8 @@ static void test_task_pidfd(void) 
	union bpf_iter_link_info linfo;

	int pidfd;



	pidfd = pidfd_open(getpid(), 0);

	if (!ASSERT_GT(pidfd, 0, "pidfd_open"))

	pidfd = sys_pidfd_open(getpid(), 0);

	if (!ASSERT_GT(pidfd, 0, "sys_pidfd_open"))

		return;



	memset(&linfo, 0, sizeof(linfo));

tools/testing/selftests/bpf/task_local_storage_helpers.h

+4 −0
Original line number Diff line number Diff line
@@ -7,8 +7,12 @@ 
#include <sys/types.h>



#ifndef __NR_pidfd_open

#ifdef __alpha__

#define __NR_pidfd_open 544

#else

#define __NR_pidfd_open 434

#endif

#endif



static inline int sys_pidfd_open(pid_t pid, unsigned int flags)

{