bpf/selftests: fold test_current_pid_tgid_new_ns into test_progs.

Currently tests for bpf_get_ns_current_pid_tgid() are outside test_progs. This change folds test cases into test_progs.

Changes from v8:

- Fixed code style
- Fixed CHECK macro usage
- Removed root namespace sub-test
- Split pid_tgid variable

Signed-off-by Carlos Neira <[email protected]>

---
 tools/testing/selftests/bpf/.gitignore        |   1 -
 tools/testing/selftests/bpf/Makefile          |   3 +-
 .../bpf/prog_tests/ns_current_pid_tgid.c      | 115 ++++++-------
 .../bpf/progs/test_ns_current_pid_tgid.c      |  27 +--
 .../bpf/test_current_pid_tgid_new_ns.c        | 160 ------------------
 5 files changed, 68 insertions(+), 238 deletions(-)
 delete mode 100644 tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c

tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c +11 -16

-       prog = bpf_object__find_program_by_title(obj, probe_name);
-       if (CHECK(!prog, "find_prog", "prog '%s' not found\n",
-                 probe_name))
+       err = stat("/proc/self/ns/pid", &st);
+       if (CHECK(err, "stat", "failed /proc/self/ns/pid: %d", err))
                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;
+       bss = skel->bss;
+       bss->dev = st.st_dev;
+       bss->ino = st.st_ino;
+       bss->user_pid = 0;
+       bss->user_tgid = 0;
 
-       if (CHECK_FAIL(stat("/proc/self/ns/pid", &st))) {
-               perror("Failed to stat /proc/self/ns/pid");
+       err = test_ns_current_pid_tgid__attach(skel);
+       if (CHECK(err, "skel_attach", "skeleton attach failed: %d\n", err))
                goto cleanup;
-       }
 
-       bss.dev = st.st_dev;
-       bss.ino = st.st_ino;
+       /* trigger tracepoint */
+       usleep(1);
 
-       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))

tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c +3 -7

+               test_ns_current_pid_tgid__destroy(skel);
 
-       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;
+       return err;
+}
 
-       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:

tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c +12 -0

+
+       if (CHECK(cpid == -1, "clone", strerror(errno)))
+               exit(EXIT_FAILURE);
+
+       if (CHECK(waitpid(cpid, &wstatus, 0) == -1, "waitpid",
+        strerror(errno)))
+               exit(EXIT_FAILURE);
+
+
+       if (CHECK(WEXITSTATUS(wstatus) != 0, "newns_pidtgid",
+        "failed"))
+               exit(EXIT_FAILURE);
 }