diff mbox series

[bpf-next,4/5] selftests/bpf: Add a cgroup prog bpf_get_ns_current_pid_tgid() test

Message ID 20240307232721.1117597-1-yonghong.song@linux.dev (mailing list archive)
State Changes Requested
Delegated to: BPF
Headers show
Series bpf: Allow helper bpf_get_ns_current_pid_tgid() in cgroup/sk_msg programs | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for bpf-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/build_tools success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 10 maintainers not CCed: song@kernel.org haoluo@google.com eddyz87@gmail.com linux-kselftest@vger.kernel.org sdf@google.com martin.lau@linux.dev kpsingh@kernel.org shuah@kernel.org mykolal@fb.com jolsa@kernel.org
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch warning CHECK: Lines should not end with a '(' WARNING: line length of 83 exceeds 80 columns WARNING: line length of 96 exceeds 80 columns
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-18 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / test (test_maps, false, 360) / test_maps on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18 and -O2 optimization
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17 and -O2 optimization
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-PR success PR summary
bpf/vmtest-bpf-next-VM_Test-14 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc

Commit Message

Yonghong Song March 7, 2024, 11:27 p.m. UTC 
Add a cgroup bpf program test where the bpf program is running
in a pid namespace. The test is successfully:
  #165/3   ns_current_pid_tgid/new_ns_cgrp:OK

Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
---
 .../bpf/prog_tests/ns_current_pid_tgid.c      | 54 +++++++++++++++++++
 .../bpf/progs/test_ns_current_pid_tgid.c      |  7 +++
 2 files changed, 61 insertions(+)

Comments

Martin KaFai Lau March 8, 2024, 7:08 p.m. UTC | #1 
On 3/7/24 3:27 PM, Yonghong Song wrote:
> Add a cgroup bpf program test where the bpf program is running
> in a pid namespace. The test is successfully:
>    #165/3   ns_current_pid_tgid/new_ns_cgrp:OK
> 
> Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
> ---
>   .../bpf/prog_tests/ns_current_pid_tgid.c      | 54 +++++++++++++++++++
>   .../bpf/progs/test_ns_current_pid_tgid.c      |  7 +++
>   2 files changed, 61 insertions(+)
> 
> 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 847d7b70e290..a307303e01ee 100644
> --- a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
> +++ b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
> @@ -12,6 +12,7 @@
>   #include <sys/wait.h>
>   #include <sys/mount.h>
>   #include <sys/fcntl.h>
> +#include "network_helpers.h"
>   
>   #define STACK_SIZE (1024 * 1024)
>   static char child_stack[STACK_SIZE];
> @@ -74,6 +75,50 @@ static int test_current_pid_tgid_tp(void *args)
>   	return ret;
>   }
>   
> +static int test_current_pid_tgid_cgrp(void *args)
> +{
> +	struct test_ns_current_pid_tgid__bss *bss;
> +	struct test_ns_current_pid_tgid *skel;
> +	int server_fd = -1, ret = -1, err;
> +	int cgroup_fd = *(int *)args;
> +	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.cgroup_bind4, 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;
> +
> +	skel->links.cgroup_bind4 = bpf_program__attach_cgroup(
> +		skel->progs.cgroup_bind4, cgroup_fd);
> +	if (!ASSERT_OK_PTR(skel->links.cgroup_bind4, "bpf_program__attach_cgroup"))
> +		goto cleanup;
> +
> +	server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);

nit. This binds to ADDR_ANY. Regardless, it is a good idea to create a netns for 
this subtest. It will be one less thing to worry about when removing "serial_" 
from this test eventually. The same for the subtest in patch 5 also.

> +	if (!ASSERT_GE(server_fd, 0, "start_server"))
> +		goto cleanup;
> +
> +	if (!ASSERT_EQ(bss->user_pid, pid, "pid"))
> +		goto cleanup;
> +	if (!ASSERT_EQ(bss->user_tgid, tgid, "tgid"))
> +		goto cleanup;
> +	ret = 0;
> +
> +cleanup:
> +	if (server_fd >= 0)
> +		close(server_fd);
> +	test_ns_current_pid_tgid__destroy(skel);
> +	return ret;
> +}
> +
>   static void test_ns_current_pid_tgid_new_ns(int (*fn)(void *), void *arg)
>   {
>   	int wstatus;
> @@ -102,4 +147,13 @@ void serial_test_ns_current_pid_tgid(void)
>   		test_current_pid_tgid_tp(NULL);
>   	if (test__start_subtest("new_ns_tp"))
>   		test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_tp, NULL);
> +	if (test__start_subtest("new_ns_cgrp")) {
> +		int cgroup_fd = -1;

nit. no need to "= -1;"

Other patches lgtm.

> +
> +		cgroup_fd = test__join_cgroup("/sock_addr");
> +		if (ASSERT_GE(cgroup_fd, 0, "join_cgroup")) {
> +			test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_cgrp, &cgroup_fd);
> +			close(cgroup_fd);
> +		}
> +	}
>   }
> 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 aa3ec7ca16d9..d0010e698f66 100644
> --- a/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
> +++ b/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
> @@ -28,4 +28,11 @@ int tp_handler(const void *ctx)
>   	return 0;
>   }
>   
> +SEC("?cgroup/bind4")
> +int cgroup_bind4(struct bpf_sock_addr *ctx)
> +{
> +	get_pid_tgid();
> +	return 1;
> +}
> +
>   char _license[] SEC("license") = "GPL";
Yonghong Song March 9, 2024, 12:04 a.m. UTC | #2 
On 3/8/24 11:08 AM, Martin KaFai Lau wrote:
> On 3/7/24 3:27 PM, Yonghong Song wrote:
>> Add a cgroup bpf program test where the bpf program is running
>> in a pid namespace. The test is successfully:
>>    #165/3   ns_current_pid_tgid/new_ns_cgrp:OK
>>
>> Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
>> ---
>>   .../bpf/prog_tests/ns_current_pid_tgid.c      | 54 +++++++++++++++++++
>>   .../bpf/progs/test_ns_current_pid_tgid.c      |  7 +++
>>   2 files changed, 61 insertions(+)
>>
>> 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 847d7b70e290..a307303e01ee 100644
>> --- a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
>> +++ b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
>> @@ -12,6 +12,7 @@
>>   #include <sys/wait.h>
>>   #include <sys/mount.h>
>>   #include <sys/fcntl.h>
>> +#include "network_helpers.h"
>>     #define STACK_SIZE (1024 * 1024)
>>   static char child_stack[STACK_SIZE];
>> @@ -74,6 +75,50 @@ static int test_current_pid_tgid_tp(void *args)
>>       return ret;
>>   }
>>   +static int test_current_pid_tgid_cgrp(void *args)
>> +{
>> +    struct test_ns_current_pid_tgid__bss *bss;
>> +    struct test_ns_current_pid_tgid *skel;
>> +    int server_fd = -1, ret = -1, err;
>> +    int cgroup_fd = *(int *)args;
>> +    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.cgroup_bind4, 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;
>> +
>> +    skel->links.cgroup_bind4 = bpf_program__attach_cgroup(
>> +        skel->progs.cgroup_bind4, cgroup_fd);
>> +    if (!ASSERT_OK_PTR(skel->links.cgroup_bind4, 
>> "bpf_program__attach_cgroup"))
>> +        goto cleanup;
>> +
>> +    server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
>
> nit. This binds to ADDR_ANY. Regardless, it is a good idea to create a 
> netns for this subtest. It will be one less thing to worry about when 
> removing "serial_" from this test eventually. The same for the subtest 
> in patch 5 also.

Good point. Will do.


>
>> +    if (!ASSERT_GE(server_fd, 0, "start_server"))
>> +        goto cleanup;
>> +
>> +    if (!ASSERT_EQ(bss->user_pid, pid, "pid"))
>> +        goto cleanup;
>> +    if (!ASSERT_EQ(bss->user_tgid, tgid, "tgid"))
>> +        goto cleanup;
>> +    ret = 0;
>> +
>> +cleanup:
>> +    if (server_fd >= 0)
>> +        close(server_fd);
>> +    test_ns_current_pid_tgid__destroy(skel);
>> +    return ret;
>> +}
>> +
>>   static void test_ns_current_pid_tgid_new_ns(int (*fn)(void *), void 
>> *arg)
>>   {
>>       int wstatus;
>> @@ -102,4 +147,13 @@ void serial_test_ns_current_pid_tgid(void)
>>           test_current_pid_tgid_tp(NULL);
>>       if (test__start_subtest("new_ns_tp"))
>> test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_tp, NULL);
>> +    if (test__start_subtest("new_ns_cgrp")) {
>> +        int cgroup_fd = -1;
>
> nit. no need to "= -1;"
Ack. My mistake. Will change.
>
> Other patches lgtm.
>
>> +
>> +        cgroup_fd = test__join_cgroup("/sock_addr");
>> +        if (ASSERT_GE(cgroup_fd, 0, "join_cgroup")) {
>> + test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_cgrp, 
>> &cgroup_fd);
>> +            close(cgroup_fd);
>> +        }
>> +    }
>>   }
>> 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 aa3ec7ca16d9..d0010e698f66 100644
>> --- a/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
>> +++ b/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
>> @@ -28,4 +28,11 @@ int tp_handler(const void *ctx)
>>       return 0;
>>   }
>>   +SEC("?cgroup/bind4")
>> +int cgroup_bind4(struct bpf_sock_addr *ctx)
>> +{
>> +    get_pid_tgid();
>> +    return 1;
>> +}
>> +
>>   char _license[] SEC("license") = "GPL";
>
diff mbox series

Patch

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 847d7b70e290..a307303e01ee 100644
--- a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
+++ b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
@@ -12,6 +12,7 @@ 
 #include <sys/wait.h>
 #include <sys/mount.h>
 #include <sys/fcntl.h>
+#include "network_helpers.h"
 
 #define STACK_SIZE (1024 * 1024)
 static char child_stack[STACK_SIZE];
@@ -74,6 +75,50 @@  static int test_current_pid_tgid_tp(void *args)
 	return ret;
 }
 
+static int test_current_pid_tgid_cgrp(void *args)
+{
+	struct test_ns_current_pid_tgid__bss *bss;
+	struct test_ns_current_pid_tgid *skel;
+	int server_fd = -1, ret = -1, err;
+	int cgroup_fd = *(int *)args;
+	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.cgroup_bind4, 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;
+
+	skel->links.cgroup_bind4 = bpf_program__attach_cgroup(
+		skel->progs.cgroup_bind4, cgroup_fd);
+	if (!ASSERT_OK_PTR(skel->links.cgroup_bind4, "bpf_program__attach_cgroup"))
+		goto cleanup;
+
+	server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
+	if (!ASSERT_GE(server_fd, 0, "start_server"))
+		goto cleanup;
+
+	if (!ASSERT_EQ(bss->user_pid, pid, "pid"))
+		goto cleanup;
+	if (!ASSERT_EQ(bss->user_tgid, tgid, "tgid"))
+		goto cleanup;
+	ret = 0;
+
+cleanup:
+	if (server_fd >= 0)
+		close(server_fd);
+	test_ns_current_pid_tgid__destroy(skel);
+	return ret;
+}
+
 static void test_ns_current_pid_tgid_new_ns(int (*fn)(void *), void *arg)
 {
 	int wstatus;
@@ -102,4 +147,13 @@  void serial_test_ns_current_pid_tgid(void)
 		test_current_pid_tgid_tp(NULL);
 	if (test__start_subtest("new_ns_tp"))
 		test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_tp, NULL);
+	if (test__start_subtest("new_ns_cgrp")) {
+		int cgroup_fd = -1;
+
+		cgroup_fd = test__join_cgroup("/sock_addr");
+		if (ASSERT_GE(cgroup_fd, 0, "join_cgroup")) {
+			test_ns_current_pid_tgid_new_ns(test_current_pid_tgid_cgrp, &cgroup_fd);
+			close(cgroup_fd);
+		}
+	}
 }
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 aa3ec7ca16d9..d0010e698f66 100644
--- a/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
+++ b/tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
@@ -28,4 +28,11 @@  int tp_handler(const void *ctx)
 	return 0;
 }
 
+SEC("?cgroup/bind4")
+int cgroup_bind4(struct bpf_sock_addr *ctx)
+{
+	get_pid_tgid();
+	return 1;
+}
+
 char _license[] SEC("license") = "GPL";