Skip to content

Commit

Permalink
selftests/bpf: Move sys_pidfd_open() into task_local_storage_helpers.h
Browse files Browse the repository at this point in the history
sys_pidfd_open() is defined twice in both test_bprm_opts.c and
test_local_storage.c, so move it to a common header file. And it will be
used in map_tests as well.

Signed-off-by: Hou Tao <houtao1@huawei.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/r/20220901061938.3789460-4-houtao@huaweicloud.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
  • Loading branch information
Hou Tao authored and Martin KaFai Lau committed Sep 1, 2022
1 parent c89e843 commit c710136
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
10 changes: 1 addition & 9 deletions tools/testing/selftests/bpf/prog_tests/test_bprm_opts.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,10 @@

#include "bprm_opts.skel.h"
#include "network_helpers.h"

#ifndef __NR_pidfd_open
#define __NR_pidfd_open 434
#endif
#include "task_local_storage_helpers.h"

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;
Expand Down
10 changes: 1 addition & 9 deletions tools/testing/selftests/bpf/prog_tests/test_local_storage.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,7 @@

#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);
}
#include "task_local_storage_helpers.h"

static unsigned int duration;

Expand Down
18 changes: 18 additions & 0 deletions tools/testing/selftests/bpf/task_local_storage_helpers.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __TASK_LOCAL_STORAGE_HELPER_H
#define __TASK_LOCAL_STORAGE_HELPER_H

#include <unistd.h>
#include <sys/syscall.h>
#include <sys/types.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);
}

#endif

0 comments on commit c710136

Please sign in to comment.