Message ID | 20200805163503.40381-1-cneirabustos@gmail.com |
---|---|
State | Changes Requested |
Delegated to: | BPF Maintainers |
Headers | show |
Series | [v4,bpf-next] bpf/selftests: fold test_current_pid_tgid_new_ns into test_progs. | expand |
On Wed, Aug 5, 2020 at 1:06 PM Carlos Neira <cneirabustos@gmail.com> wrote: > > Currently tests for bpf_get_ns_current_pid_tgid() are outside test_progs. > This change folds a test case into test_progs. > > Changes from V3: > - STAT(2) check changed from CHECK_FAIL to CHECK. > - Changed uses of _open_ to _open_and_load. > - Fixed error codes were not being returned on exit. > - Removed unnecessary dependency on Makefile > > Signed-off-by: Carlos Neira <cneirabustos@gmail.com> > --- bpf-next is closed, you'll have to re-submit once it opens in roughly two weeks. Looks good overall, few minor things below, please incorporate into next revision with my ack: Acked-by: Andrii Nakryiko <andriin@fb.com> > tools/testing/selftests/bpf/.gitignore | 2 +- > tools/testing/selftests/bpf/Makefile | 4 +- > .../bpf/prog_tests/ns_current_pid_tgid.c | 85 ---------- > .../bpf/prog_tests/ns_current_pidtgid.c | 54 ++++++ > .../bpf/progs/test_ns_current_pid_tgid.c | 37 ---- > .../bpf/progs/test_ns_current_pidtgid.c | 25 +++ > .../bpf/test_current_pid_tgid_new_ns.c | 159 ------------------ > .../bpf/test_ns_current_pidtgid_newns.c | 91 ++++++++++ > 8 files changed, 173 insertions(+), 284 deletions(-) > delete mode 100644 tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c > create mode 100644 tools/testing/selftests/bpf/prog_tests/ns_current_pidtgid.c > delete mode 100644 tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c > create mode 100644 tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c > delete mode 100644 tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c > create mode 100644 tools/testing/selftests/bpf/test_ns_current_pidtgid_newns.c > > diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore > index 1bb204cee853..022055f23592 100644 > --- a/tools/testing/selftests/bpf/.gitignore > +++ b/tools/testing/selftests/bpf/.gitignore > @@ -30,8 +30,8 @@ test_tcpnotify_user > test_libbpf > test_tcp_check_syncookie_user > test_sysctl > -test_current_pid_tgid_new_ns > xdping > +test_ns_current_pidtgid_newns > test_cpp > *.skel.h > /no_alu32 > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > index e7a8cf83ba48..92fb616cdd27 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -36,8 +36,8 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test > test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \ > test_cgroup_storage \ > test_netcnt test_tcpnotify_user test_sock_fields test_sysctl \ > - test_progs-no_alu32 \ > - test_current_pid_tgid_new_ns > + test_progs-no_alu32\ accidentally removed space? > + test_ns_current_pidtgid_newns > > # Also test bpf-gcc, if present > ifneq ($(BPF_GCC),) [...] > + > +void test_ns_current_pidtgid(void) > +{ > + struct test_ns_current_pidtgid__bss *bss; > + struct test_ns_current_pidtgid *skel; > + int err, duration = 0; > + struct stat st; > + __u64 id; > + > + skel = test_ns_current_pidtgid__open_and_load(); > + CHECK(!skel, "skel_open_load", "failed to load skeleton\n"); > + goto cleanup; > + > + pid_t tid = syscall(SYS_gettid); > + pid_t pid = getpid(); hm... I probably missed this last time. This is not a valid C89 standard-compliant code, all variables have to be declared up top, please split variable declaration and initialization. > + > + id = (__u64) tid << 32 | pid; > + > + err = stat("/proc/self/ns/pid", &st); > + if (CHECK(err, "stat", "failed /proc/self/ns/pid: %d", err)) > + goto cleanup; > + [...] > diff --git a/tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c b/tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c > new file mode 100644 > index 000000000000..9818a56510d9 > --- /dev/null > +++ b/tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c > @@ -0,0 +1,25 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* Copyright (c) 2019 Carlos Neira cneirabustos@gmail.com */ > + > +#include <linux/bpf.h> > +#include <stdint.h> > +#include <bpf/bpf_helpers.h> > + > +__u64 user_pid_tgid = 0; > +__u64 dev = 0; > +__u64 ino = 0; > + > +SEC("raw_tracepoint/sys_enter") > +int handler(const void *ctx) > +{ > + struct bpf_pidns_info nsdata; > + > + if (bpf_get_ns_current_pid_tgid(dev, ino, &nsdata, > + sizeof(struct bpf_pidns_info))) > + return 0; > + user_pid_tgid = (__u64)nsdata.tgid << 32 | nsdata.pid; nit: good idea to put () around << expression when combined with other bitwise operators. > + > + return 0; > +} > + > +char _license[] SEC("license") = "GPL"; [...] > +static int newns_pidtgid(void *arg) > +{ > + struct test_ns_current_pidtgid__bss *bss; > + struct test_ns_current_pidtgid *skel; > + int pidns_fd = 0, err = 0; > + pid_t pid, tid; > + struct stat st; > + __u64 id; > + > + skel = test_ns_current_pidtgid__open_and_load(); > + if (!skel) { > + perror("Failed to load skeleton"); > + goto cleanup; > + } > + > + tid = syscall(SYS_gettid); > + pid = getpid(); > + id = (__u64) tid << 32 | pid; see, you don't do it here :) > + > + if (stat("/proc/self/ns/pid", &st)) { > + printf("Failed to stat /proc/self/ns/pid: %s\n", > + strerror(errno)); > + goto cleanup; > + } > + > + bss = skel->bss; > + bss->dev = st.st_dev; > + bss->ino = st.st_ino; > + bss->user_pid_tgid = 0; > + [...]
On Wed, Aug 05, 2020 at 01:15:05PM -0700, Andrii Nakryiko wrote: > On Wed, Aug 5, 2020 at 1:06 PM Carlos Neira <cneirabustos@gmail.com> wrote: > > > > Currently tests for bpf_get_ns_current_pid_tgid() are outside test_progs. > > This change folds a test case into test_progs. > > > > Changes from V3: > > - STAT(2) check changed from CHECK_FAIL to CHECK. > > - Changed uses of _open_ to _open_and_load. > > - Fixed error codes were not being returned on exit. > > - Removed unnecessary dependency on Makefile > > > > Signed-off-by: Carlos Neira <cneirabustos@gmail.com> > > --- > > bpf-next is closed, you'll have to re-submit once it opens in roughly > two weeks. Looks good overall, few minor things below, please > incorporate into next revision with my ack: > > Acked-by: Andrii Nakryiko <andriin@fb.com> > > > tools/testing/selftests/bpf/.gitignore | 2 +- > > tools/testing/selftests/bpf/Makefile | 4 +- > > .../bpf/prog_tests/ns_current_pid_tgid.c | 85 ---------- > > .../bpf/prog_tests/ns_current_pidtgid.c | 54 ++++++ > > .../bpf/progs/test_ns_current_pid_tgid.c | 37 ---- > > .../bpf/progs/test_ns_current_pidtgid.c | 25 +++ > > .../bpf/test_current_pid_tgid_new_ns.c | 159 ------------------ > > .../bpf/test_ns_current_pidtgid_newns.c | 91 ++++++++++ > > 8 files changed, 173 insertions(+), 284 deletions(-) > > delete mode 100644 tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c > > create mode 100644 tools/testing/selftests/bpf/prog_tests/ns_current_pidtgid.c > > delete mode 100644 tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c > > create mode 100644 tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c > > delete mode 100644 tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c > > create mode 100644 tools/testing/selftests/bpf/test_ns_current_pidtgid_newns.c > > > > diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore > > index 1bb204cee853..022055f23592 100644 > > --- a/tools/testing/selftests/bpf/.gitignore > > +++ b/tools/testing/selftests/bpf/.gitignore > > @@ -30,8 +30,8 @@ test_tcpnotify_user > > test_libbpf > > test_tcp_check_syncookie_user > > test_sysctl > > -test_current_pid_tgid_new_ns > > xdping > > +test_ns_current_pidtgid_newns > > test_cpp > > *.skel.h > > /no_alu32 > > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > > index e7a8cf83ba48..92fb616cdd27 100644 > > --- a/tools/testing/selftests/bpf/Makefile > > +++ b/tools/testing/selftests/bpf/Makefile > > @@ -36,8 +36,8 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test > > test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \ > > test_cgroup_storage \ > > test_netcnt test_tcpnotify_user test_sock_fields test_sysctl \ > > - test_progs-no_alu32 \ > > - test_current_pid_tgid_new_ns > > + test_progs-no_alu32\ > > accidentally removed space? > > > + test_ns_current_pidtgid_newns > > > > # Also test bpf-gcc, if present > > ifneq ($(BPF_GCC),) > > [...] > > > + > > +void test_ns_current_pidtgid(void) > > +{ > > + struct test_ns_current_pidtgid__bss *bss; > > + struct test_ns_current_pidtgid *skel; > > + int err, duration = 0; > > + struct stat st; > > + __u64 id; > > + > > + skel = test_ns_current_pidtgid__open_and_load(); > > + CHECK(!skel, "skel_open_load", "failed to load skeleton\n"); > > + goto cleanup; > > + > > + pid_t tid = syscall(SYS_gettid); > > + pid_t pid = getpid(); > > hm... I probably missed this last time. This is not a valid C89 > standard-compliant code, all variables have to be declared up top, > please split variable declaration and initialization. > > > + > > + id = (__u64) tid << 32 | pid; > > + > > + err = stat("/proc/self/ns/pid", &st); > > + if (CHECK(err, "stat", "failed /proc/self/ns/pid: %d", err)) > > + goto cleanup; > > + > > [...] > > > diff --git a/tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c b/tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c > > new file mode 100644 > > index 000000000000..9818a56510d9 > > --- /dev/null > > +++ b/tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c > > @@ -0,0 +1,25 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* Copyright (c) 2019 Carlos Neira cneirabustos@gmail.com */ > > + > > +#include <linux/bpf.h> > > +#include <stdint.h> > > +#include <bpf/bpf_helpers.h> > > + > > +__u64 user_pid_tgid = 0; > > +__u64 dev = 0; > > +__u64 ino = 0; > > + > > +SEC("raw_tracepoint/sys_enter") > > +int handler(const void *ctx) > > +{ > > + struct bpf_pidns_info nsdata; > > + > > + if (bpf_get_ns_current_pid_tgid(dev, ino, &nsdata, > > + sizeof(struct bpf_pidns_info))) > > + return 0; > > + user_pid_tgid = (__u64)nsdata.tgid << 32 | nsdata.pid; > > nit: good idea to put () around << expression when combined with other > bitwise operators. > > > + > > + return 0; > > +} > > + > > +char _license[] SEC("license") = "GPL"; > > [...] > > > +static int newns_pidtgid(void *arg) > > +{ > > + struct test_ns_current_pidtgid__bss *bss; > > + struct test_ns_current_pidtgid *skel; > > + int pidns_fd = 0, err = 0; > > + pid_t pid, tid; > > + struct stat st; > > + __u64 id; > > + > > + skel = test_ns_current_pidtgid__open_and_load(); > > + if (!skel) { > > + perror("Failed to load skeleton"); > > + goto cleanup; > > + } > > + > > + tid = syscall(SYS_gettid); > > + pid = getpid(); > > + id = (__u64) tid << 32 | pid; > > see, you don't do it here :) > > > > + > > + if (stat("/proc/self/ns/pid", &st)) { > > + printf("Failed to stat /proc/self/ns/pid: %s\n", > > + strerror(errno)); > > + goto cleanup; > > + } > > + > > + bss = skel->bss; > > + bss->dev = st.st_dev; > > + bss->ino = st.st_ino; > > + bss->user_pid_tgid = 0; > > + > > [...] Andrii, Thank you very much, I'll incorporate these changes on the next revision. Bests.
diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index 1bb204cee853..022055f23592 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -30,8 +30,8 @@ test_tcpnotify_user test_libbpf test_tcp_check_syncookie_user test_sysctl -test_current_pid_tgid_new_ns xdping +test_ns_current_pidtgid_newns test_cpp *.skel.h /no_alu32 diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index e7a8cf83ba48..92fb616cdd27 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -36,8 +36,8 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \ test_cgroup_storage \ test_netcnt test_tcpnotify_user test_sock_fields test_sysctl \ - test_progs-no_alu32 \ - test_current_pid_tgid_new_ns + test_progs-no_alu32\ + test_ns_current_pidtgid_newns # Also test bpf-gcc, if present ifneq ($(BPF_GCC),) diff --git a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c deleted file mode 100644 index e74dc501b27f..000000000000 --- a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c +++ /dev/null @@ -1,85 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2020 Carlos Neira cneirabustos@gmail.com */ -#include <test_progs.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <unistd.h> -#include <sys/syscall.h> - -struct bss { - __u64 dev; - __u64 ino; - __u64 pid_tgid; - __u64 user_pid_tgid; -}; - -void test_ns_current_pid_tgid(void) -{ - const char *probe_name = "raw_tracepoint/sys_enter"; - const char *file = "test_ns_current_pid_tgid.o"; - int err, key = 0, duration = 0; - struct bpf_link *link = NULL; - struct bpf_program *prog; - struct bpf_map *bss_map; - struct bpf_object *obj; - struct bss bss; - struct stat st; - __u64 id; - - obj = bpf_object__open_file(file, NULL); - if (CHECK(IS_ERR(obj), "obj_open", "err %ld\n", PTR_ERR(obj))) - return; - - err = bpf_object__load(obj); - if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno)) - goto cleanup; - - bss_map = bpf_object__find_map_by_name(obj, "test_ns_.bss"); - if (CHECK(!bss_map, "find_bss_map", "failed\n")) - goto cleanup; - - prog = bpf_object__find_program_by_title(obj, probe_name); - if (CHECK(!prog, "find_prog", "prog '%s' not found\n", - probe_name)) - goto cleanup; - - memset(&bss, 0, sizeof(bss)); - pid_t tid = syscall(SYS_gettid); - pid_t pid = getpid(); - - id = (__u64) tid << 32 | pid; - bss.user_pid_tgid = id; - - if (CHECK_FAIL(stat("/proc/self/ns/pid", &st))) { - perror("Failed to stat /proc/self/ns/pid"); - goto cleanup; - } - - bss.dev = st.st_dev; - bss.ino = st.st_ino; - - err = bpf_map_update_elem(bpf_map__fd(bss_map), &key, &bss, 0); - if (CHECK(err, "setting_bss", "failed to set bss : %d\n", err)) - goto cleanup; - - link = bpf_program__attach_raw_tracepoint(prog, "sys_enter"); - if (CHECK(IS_ERR(link), "attach_raw_tp", "err %ld\n", - PTR_ERR(link))) { - link = NULL; - goto cleanup; - } - - /* trigger some syscalls */ - usleep(1); - - err = bpf_map_lookup_elem(bpf_map__fd(bss_map), &key, &bss); - if (CHECK(err, "set_bss", "failed to get bss : %d\n", err)) - goto cleanup; - - if (CHECK(id != bss.pid_tgid, "Compare user pid/tgid vs. bpf pid/tgid", - "User pid/tgid %llu BPF pid/tgid %llu\n", id, bss.pid_tgid)) - goto cleanup; -cleanup: - bpf_link__destroy(link); - bpf_object__close(obj); -} diff --git a/tools/testing/selftests/bpf/prog_tests/ns_current_pidtgid.c b/tools/testing/selftests/bpf/prog_tests/ns_current_pidtgid.c new file mode 100644 index 000000000000..156781fecf9d --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/ns_current_pidtgid.c @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2020 Carlos Neira cneirabustos@gmail.com */ + +#define _GNU_SOURCE +#include <test_progs.h> +#include "test_ns_current_pidtgid.skel.h" +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> +#include <sys/syscall.h> +#include <sched.h> +#include <sys/wait.h> +#include <sys/mount.h> +#include <sys/fcntl.h> + +void test_ns_current_pidtgid(void) +{ + struct test_ns_current_pidtgid__bss *bss; + struct test_ns_current_pidtgid *skel; + int err, duration = 0; + struct stat st; + __u64 id; + + skel = test_ns_current_pidtgid__open_and_load(); + CHECK(!skel, "skel_open_load", "failed to load skeleton\n"); + goto cleanup; + + pid_t tid = syscall(SYS_gettid); + pid_t pid = getpid(); + + id = (__u64) tid << 32 | pid; + + err = stat("/proc/self/ns/pid", &st); + if (CHECK(err, "stat", "failed /proc/self/ns/pid: %d", err)) + goto cleanup; + + bss = skel->bss; + bss->dev = st.st_dev; + bss->ino = st.st_ino; + bss->user_pid_tgid = 0; + + err = test_ns_current_pidtgid__attach(skel); + if (CHECK(err, "skel_attach", "skeleton attach failed: %d\n", err)) + goto cleanup; + + /* trigger tracepoint */ + usleep(1); + + CHECK(bss->user_pid_tgid != id, "pid/tgid", "got %llu != exp %llu\n", + bss->user_pid_tgid, id); +cleanup: + test_ns_current_pidtgid__destroy(skel); + +} diff --git a/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c b/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c deleted file mode 100644 index 1dca70a6de2f..000000000000 --- a/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c +++ /dev/null @@ -1,37 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2019 Carlos Neira cneirabustos@gmail.com */ - -#include <linux/bpf.h> -#include <stdint.h> -#include <bpf/bpf_helpers.h> - -static volatile struct { - __u64 dev; - __u64 ino; - __u64 pid_tgid; - __u64 user_pid_tgid; -} res; - -SEC("raw_tracepoint/sys_enter") -int trace(void *ctx) -{ - __u64 ns_pid_tgid, expected_pid; - struct bpf_pidns_info nsdata; - __u32 key = 0; - - if (bpf_get_ns_current_pid_tgid(res.dev, res.ino, &nsdata, - sizeof(struct bpf_pidns_info))) - return 0; - - ns_pid_tgid = (__u64)nsdata.tgid << 32 | nsdata.pid; - expected_pid = res.user_pid_tgid; - - if (expected_pid != ns_pid_tgid) - return 0; - - res.pid_tgid = ns_pid_tgid; - - return 0; -} - -char _license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c b/tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c new file mode 100644 index 000000000000..9818a56510d9 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2019 Carlos Neira cneirabustos@gmail.com */ + +#include <linux/bpf.h> +#include <stdint.h> +#include <bpf/bpf_helpers.h> + +__u64 user_pid_tgid = 0; +__u64 dev = 0; +__u64 ino = 0; + +SEC("raw_tracepoint/sys_enter") +int handler(const void *ctx) +{ + struct bpf_pidns_info nsdata; + + if (bpf_get_ns_current_pid_tgid(dev, ino, &nsdata, + sizeof(struct bpf_pidns_info))) + return 0; + user_pid_tgid = (__u64)nsdata.tgid << 32 | nsdata.pid; + + return 0; +} + +char _license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c b/tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c deleted file mode 100644 index ed253f252cd0..000000000000 --- a/tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c +++ /dev/null @@ -1,159 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2020 Carlos Neira cneirabustos@gmail.com */ -#define _GNU_SOURCE -#include <sys/stat.h> -#include <sys/types.h> -#include <unistd.h> -#include <sys/syscall.h> -#include <sched.h> -#include <sys/wait.h> -#include <sys/mount.h> -#include "test_progs.h" - -#define CHECK_NEWNS(condition, tag, format...) ({ \ - int __ret = !!(condition); \ - if (__ret) { \ - printf("%s:FAIL:%s ", __func__, tag); \ - printf(format); \ - } else { \ - printf("%s:PASS:%s\n", __func__, tag); \ - } \ - __ret; \ -}) - -struct bss { - __u64 dev; - __u64 ino; - __u64 pid_tgid; - __u64 user_pid_tgid; -}; - -int main(int argc, char **argv) -{ - pid_t pid; - int exit_code = 1; - struct stat st; - - printf("Testing bpf_get_ns_current_pid_tgid helper in new ns\n"); - - if (stat("/proc/self/ns/pid", &st)) { - perror("stat failed on /proc/self/ns/pid ns\n"); - printf("%s:FAILED\n", argv[0]); - return exit_code; - } - - if (CHECK_NEWNS(unshare(CLONE_NEWPID | CLONE_NEWNS), - "unshare CLONE_NEWPID | CLONE_NEWNS", "error errno=%d\n", errno)) - return exit_code; - - pid = fork(); - if (pid == -1) { - perror("Fork() failed\n"); - printf("%s:FAILED\n", argv[0]); - return exit_code; - } - - if (pid > 0) { - int status; - - usleep(5); - waitpid(pid, &status, 0); - return 0; - } else { - - pid = fork(); - if (pid == -1) { - perror("Fork() failed\n"); - printf("%s:FAILED\n", argv[0]); - return exit_code; - } - - if (pid > 0) { - int status; - waitpid(pid, &status, 0); - return 0; - } else { - if (CHECK_NEWNS(mount("none", "/proc", NULL, MS_PRIVATE|MS_REC, NULL), - "Unmounting proc", "Cannot umount proc! errno=%d\n", errno)) - return exit_code; - - if (CHECK_NEWNS(mount("proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL), - "Mounting proc", "Cannot mount proc! errno=%d\n", errno)) - return exit_code; - - const char *probe_name = "raw_tracepoint/sys_enter"; - const char *file = "test_ns_current_pid_tgid.o"; - struct bpf_link *link = NULL; - struct bpf_program *prog; - struct bpf_map *bss_map; - struct bpf_object *obj; - int exit_code = 1; - int err, key = 0; - struct bss bss; - struct stat st; - __u64 id; - - obj = bpf_object__open_file(file, NULL); - if (CHECK_NEWNS(IS_ERR(obj), "obj_open", "err %ld\n", PTR_ERR(obj))) - return exit_code; - - err = bpf_object__load(obj); - if (CHECK_NEWNS(err, "obj_load", "err %d errno %d\n", err, errno)) - goto cleanup; - - bss_map = bpf_object__find_map_by_name(obj, "test_ns_.bss"); - if (CHECK_NEWNS(!bss_map, "find_bss_map", "failed\n")) - goto cleanup; - - prog = bpf_object__find_program_by_title(obj, probe_name); - if (CHECK_NEWNS(!prog, "find_prog", "prog '%s' not found\n", - probe_name)) - goto cleanup; - - memset(&bss, 0, sizeof(bss)); - pid_t tid = syscall(SYS_gettid); - pid_t pid = getpid(); - - id = (__u64) tid << 32 | pid; - bss.user_pid_tgid = id; - - if (CHECK_NEWNS(stat("/proc/self/ns/pid", &st), - "stat new ns", "Failed to stat /proc/self/ns/pid errno=%d\n", errno)) - goto cleanup; - - bss.dev = st.st_dev; - bss.ino = st.st_ino; - - err = bpf_map_update_elem(bpf_map__fd(bss_map), &key, &bss, 0); - if (CHECK_NEWNS(err, "setting_bss", "failed to set bss : %d\n", err)) - goto cleanup; - - link = bpf_program__attach_raw_tracepoint(prog, "sys_enter"); - if (CHECK_NEWNS(IS_ERR(link), "attach_raw_tp", "err %ld\n", - PTR_ERR(link))) { - link = NULL; - goto cleanup; - } - - /* trigger some syscalls */ - usleep(1); - - err = bpf_map_lookup_elem(bpf_map__fd(bss_map), &key, &bss); - if (CHECK_NEWNS(err, "set_bss", "failed to get bss : %d\n", err)) - goto cleanup; - - if (CHECK_NEWNS(id != bss.pid_tgid, "Compare user pid/tgid vs. bpf pid/tgid", - "User pid/tgid %llu BPF pid/tgid %llu\n", id, bss.pid_tgid)) - goto cleanup; - - exit_code = 0; - printf("%s:PASS\n", argv[0]); -cleanup: - if (!link) { - bpf_link__destroy(link); - link = NULL; - } - bpf_object__close(obj); - } - } -} diff --git a/tools/testing/selftests/bpf/test_ns_current_pidtgid_newns.c b/tools/testing/selftests/bpf/test_ns_current_pidtgid_newns.c new file mode 100644 index 000000000000..4ca94e1f13f1 --- /dev/null +++ b/tools/testing/selftests/bpf/test_ns_current_pidtgid_newns.c @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2020 Carlos Neira cneirabustos@gmail.com */ + +#define _GNU_SOURCE +#include <test_progs.h> +#include "test_ns_current_pidtgid.skel.h" +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> +#include <sys/syscall.h> +#include <sched.h> +#include <sys/wait.h> +#include <sys/mount.h> +#include <sys/fcntl.h> + +#define STACK_SIZE (1024 * 1024) +static char child_stack[STACK_SIZE]; + +static int newns_pidtgid(void *arg) +{ + struct test_ns_current_pidtgid__bss *bss; + struct test_ns_current_pidtgid *skel; + int pidns_fd = 0, err = 0; + pid_t pid, tid; + struct stat st; + __u64 id; + + skel = test_ns_current_pidtgid__open_and_load(); + if (!skel) { + perror("Failed to load skeleton"); + goto cleanup; + } + + tid = syscall(SYS_gettid); + pid = getpid(); + id = (__u64) tid << 32 | pid; + + if (stat("/proc/self/ns/pid", &st)) { + printf("Failed to stat /proc/self/ns/pid: %s\n", + strerror(errno)); + goto cleanup; + } + + bss = skel->bss; + bss->dev = st.st_dev; + bss->ino = st.st_ino; + bss->user_pid_tgid = 0; + + err = test_ns_current_pidtgid__attach(skel); + if (err) { + printf("Failed to attach: %s err: %d\n", strerror(errno), err); + goto cleanup; + } + /* trigger tracepoint */ + usleep(1); + + if (bss->user_pid_tgid != id) { + printf("test_ns_current_pidtgid_newns:FAIL\n"); + err = EXIT_FAILURE; + } else { + printf("test_ns_current_pidtgid_newns:PASS\n"); + err = EXIT_SUCCESS; + } + +cleanup: + setns(pidns_fd, CLONE_NEWPID); + test_ns_current_pidtgid__destroy(skel); + + return err; +} + +int main(int argc, char **argv) +{ + pid_t cpid; + int wstatus; + + cpid = clone(newns_pidtgid, + child_stack + STACK_SIZE, + CLONE_NEWPID | SIGCHLD, NULL); + if (cpid == -1) { + printf("test_ns_current_pidtgid_newns:Failed on CLONE: %s\n", + strerror(errno)); + exit(EXIT_FAILURE); + } + if (waitpid(cpid, &wstatus, 0) == -1) { + printf("test_ns_current_pidtgid_newns:Failed on waitpid: %s\n", + strerror(errno)); + exit(EXIT_FAILURE); + } + return WEXITSTATUS(wstatus); +}
Currently tests for bpf_get_ns_current_pid_tgid() are outside test_progs. This change folds a test case into test_progs. Changes from V3: - STAT(2) check changed from CHECK_FAIL to CHECK. - Changed uses of _open_ to _open_and_load. - Fixed error codes were not being returned on exit. - Removed unnecessary dependency on Makefile Signed-off-by: Carlos Neira <cneirabustos@gmail.com> --- tools/testing/selftests/bpf/.gitignore | 2 +- tools/testing/selftests/bpf/Makefile | 4 +- .../bpf/prog_tests/ns_current_pid_tgid.c | 85 ---------- .../bpf/prog_tests/ns_current_pidtgid.c | 54 ++++++ .../bpf/progs/test_ns_current_pid_tgid.c | 37 ---- .../bpf/progs/test_ns_current_pidtgid.c | 25 +++ .../bpf/test_current_pid_tgid_new_ns.c | 159 ------------------ .../bpf/test_ns_current_pidtgid_newns.c | 91 ++++++++++ 8 files changed, 173 insertions(+), 284 deletions(-) delete mode 100644 tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c create mode 100644 tools/testing/selftests/bpf/prog_tests/ns_current_pidtgid.c delete mode 100644 tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c create mode 100644 tools/testing/selftests/bpf/progs/test_ns_current_pidtgid.c delete mode 100644 tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c create mode 100644 tools/testing/selftests/bpf/test_ns_current_pidtgid_newns.c