selftests/bpf: Refactor out some functions in ns_current_pid_tgid test

Refactor some functions in both user space code and bpf program
as these functions are used by later cgroup/sk_msg tests.
Another change is to mark tp program optional loading as later
patches will use optional loading as well since they have quite
different attachment and testing logic.

There is no functionality change.

Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240315184904.2976123-1-yonghong.song@linux.dev

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
index 3a0664a86243e24f6fa580eb7072cbf17e875862..847d7b70e290260dfb67d5611e9465788393833a 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
+++ b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
@@ -16,30 +16,46 @@
 #define STACK_SIZE (1024 * 1024)
 static char child_stack[STACK_SIZE];
 
-static int test_current_pid_tgid(void *args)
+static int get_pid_tgid(pid_t *pid, pid_t *tgid,
+                       struct test_ns_current_pid_tgid__bss *bss)
 {
-       struct test_ns_current_pid_tgid__bss  *bss;
-       struct test_ns_current_pid_tgid *skel;
-       int ret = -1, err;
-       pid_t tgid, pid;
        struct stat st;
+       int err;
 
-       skel = test_ns_current_pid_tgid__open_and_load();
-       if (!ASSERT_OK_PTR(skel, "test_ns_current_pid_tgid__open_and_load"))
-               goto out;
-
-       pid = syscall(SYS_gettid);
-       tgid = getpid();
+       *pid = syscall(SYS_gettid);
+       *tgid = getpid();
 
        err = stat("/proc/self/ns/pid", &st);
        if (!ASSERT_OK(err, "stat /proc/self/ns/pid"))
-               goto cleanup;
+               return err;
 
-       bss = skel->bss;
        bss->dev = st.st_dev;
        bss->ino = st.st_ino;
        bss->user_pid = 0;
        bss->user_tgid = 0;
+       return 0;
+}
+
+static int test_current_pid_tgid_tp(void *args)
+{
+       struct test_ns_current_pid_tgid__bss  *bss;
+       struct test_ns_current_pid_tgid *skel;
+       int ret = -1, err;
+       pid_t tgid, pid;
+
+       skel = test_ns_current_pid_tgid__open();
+       if (!ASSERT_OK_PTR(skel, "test_ns_current_pid_tgid__open"))
+               return ret;
+
+       bpf_program__set_autoload(skel->progs.tp_handler, true);
+
+       err = test_ns_current_pid_tgid__load(skel);
+       if (!ASSERT_OK(err, "test_ns_current_pid_tgid__load"))
+               goto cleanup;
+
+       bss = skel->bss;
+       if (get_pid_tgid(&pid, &tgid, bss))
+               goto cleanup;
 
        err = test_ns_current_pid_tgid__attach(skel);
        if (!ASSERT_OK(err, "test_ns_current_pid_tgid__attach"))
@@ -55,11 +71,10 @@ static int test_current_pid_tgid(void *args)
 
 cleanup:
        test_ns_current_pid_tgid__destroy(skel);
-out:
        return ret;
 }
 
-static void test_ns_current_pid_tgid_new_ns(void)
+static void test_ns_current_pid_tgid_new_ns(int (*fn)(void *), void *arg)
 {
        int wstatus;
        pid_t cpid;
@@ -67,8 +82,8 @@ static void test_ns_current_pid_tgid_new_ns(void)
        /* Create a process in a new namespace, this process
         * will be the init process of this new namespace hence will be pid 1.
         */
-       cpid = clone(test_current_pid_tgid, child_stack + STACK_SIZE,
-                    CLONE_NEWPID | SIGCHLD, NULL);
+       cpid = clone(fn, child_stack + STACK_SIZE,
+                    CLONE_NEWPID | SIGCHLD, arg);
 
        if (!ASSERT_NEQ(cpid, -1, "clone"))
                return;
@@ -84,7 +99,7 @@ static void test_ns_current_pid_tgid_new_ns(void)
 void serial_test_ns_current_pid_tgid(void)
 {
        if (test__start_subtest("root_ns_tp"))
-               test_current_pid_tgid(NULL);
+               test_current_pid_tgid_tp(NULL);
        if (test__start_subtest("new_ns_tp"))
-               test_ns_current_pid_tgid_new_ns();
+               test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_tp, NULL);
 }

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
index 0763d49f9c42131adbab6cd3d88a505b5d623881..aa3ec7ca16d9b638a9132855bca1a58852f78bb4 100644 (file)
--- a/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
+++ b/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
@@ -10,17 +10,21 @@ __u64 user_tgid = 0;
 __u64 dev = 0;
 __u64 ino = 0;
 
-SEC("tracepoint/syscalls/sys_enter_nanosleep")
-int handler(const void *ctx)
+static void get_pid_tgid(void)
 {
        struct bpf_pidns_info nsdata;
 
        if (bpf_get_ns_current_pid_tgid(dev, ino, &nsdata, sizeof(struct bpf_pidns_info)))
-               return 0;
+               return;
 
        user_pid = nsdata.pid;
        user_tgid = nsdata.tgid;
+}
 
+SEC("?tracepoint/syscalls/sys_enter_nanosleep")
+int tp_handler(const void *ctx)
+{
+       get_pid_tgid();
        return 0;
 }