From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-187.mta0.migadu.com (out-187.mta0.migadu.com [91.218.175.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F090956473 for ; Fri, 8 Mar 2024 19:09:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.187 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709924950; cv=none; b=a9RBj7nretl5x6oZmWF9X0QeCK6xygKIJMiI5DXUsk3LH+ujPDi066u6VN0BbOn7QsVeJJTkmIpIJk/kHCbo21eNsrW8tCehKiL6elJ4ip9vUD9pZDFEqx5mmiYsYLwdRB+2hi+fDt8AAxgY4V5dYlD1VhPSJItrSaCxHOqGUUo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709924950; c=relaxed/simple; bh=wVL0xaKiOfPbBJ9XmvoUxGP0/WeHdexA+SXjiKQLbdw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=oREou57I28Rbio86j8HV5u+u4HoWE8Oh3vSS+VliXfZYVnLgB1L+lshKcMBJgtphLLXKUeuQXy1UChQQ0gsS8tyQoaQVZhA78crzm33wU13c1bcb1qYUWCkdR5ovGITdlECyqk8UfNsjCaLV7h7oauhdpFN05ywePl111Rnkzms= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=SE/vqlpN; arc=none smtp.client-ip=91.218.175.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="SE/vqlpN" Message-ID: <83a6001f-8ed4-4e31-92bd-282c34e6782f@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1709924945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WorCRuRAvkxl1qNiZerpjEYMh8nViEqgqXDFeEz7Xd8=; b=SE/vqlpNZpW1yNfr3ka3DaP91Hf3VqlLvkJemYpgdPQuJ9JU3iCI54GcW1g91AOEtIaNLp 8rSSyUnVwslOmp6JFmtRcDt2CLu+1HdF0+h0x4tk1wcsX3umK52R56JH0TTLF/Q3IwcWef iSt82Gzy3ZbEur8AMgEXHTGts/S69II= Date: Fri, 8 Mar 2024 11:08:54 -0800 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH bpf-next 4/5] selftests/bpf: Add a cgroup prog bpf_get_ns_current_pid_tgid() test Content-Language: en-US To: Yonghong Song Cc: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , John Fastabend , kernel-team@fb.com, Martin KaFai Lau , Yury Namgung , bpf@vger.kernel.org References: <20240307232659.1115872-1-yonghong.song@linux.dev> <20240307232721.1117597-1-yonghong.song@linux.dev> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Martin KaFai Lau In-Reply-To: <20240307232721.1117597-1-yonghong.song@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT 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 > --- > .../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 > #include > #include > +#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";