Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <63138022-e28f-a63c-6f4c-61b61e585641@meta.com>
Date:   Thu, 4 May 2023 07:46:38 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.10.1
Subject: Re: [PATCH bpf-next v5 2/2] selftests/bpf: Add testcase for
 bpf_task_under_cgroup
Content-Language: en-US
To:     Feng zhou <zhoufeng.zf@bytedance.com>, martin.lau@linux.dev,
        ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
        song@kernel.org, yhs@fb.com, john.fastabend@gmail.com,
        kpsingh@kernel.org, sdf@google.com, haoluo@google.com,
        jolsa@kernel.org, davem@davemloft.net, edumazet@google.com,
        kuba@kernel.org, pabeni@redhat.com, mykolal@fb.com,
        shuah@kernel.org
Cc:     bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
        netdev@vger.kernel.org, linux-kselftest@vger.kernel.org,
        yangzhenze@bytedance.com, wangdongdong.6@bytedance.com
References: <20230504031513.13749-1-zhoufeng.zf@bytedance.com>
 <20230504031513.13749-3-zhoufeng.zf@bytedance.com>
From:   Yonghong Song <yhs@meta.com>
In-Reply-To: <20230504031513.13749-3-zhoufeng.zf@bytedance.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eUpvb3FFNkVHeklSMDBFUG04WCtSM2xYaU1Iek5yZmJscmVQOFluYVhEMFBk?=
 =?utf-8?B?ME9oOWkzL0k5NEtEWVhpL2syWDdBWGdScTc2ZFlna2tGenhTOWZ4WGpBbkFP?=
 =?utf-8?B?TlFHOE42N0E0cWxWd0FwcjJPRVprK0drYWkyWllVMGNnTVpPRGRid1MreCtN?=
 =?utf-8?B?ZFdWd2FWdUxKem9XYm9aWmhJbjZnRngvY0o1Uzdld1M3WnEwM0tPWmg1ZTVI?=
 =?utf-8?B?Tmt3UmRvNGtFVlhZVC9GN3cwaHNLMUlOY1pvT1N4cmc3Q3NBMzRqL29oR1U1?=
 =?utf-8?B?QlJMS3FDZmJvbW5lOC9lcjRNRW0ybXhnekZjUWRsVlhCVnA5VXVNK2RaV05s?=
 =?utf-8?B?REhPSXB1cmZPLzkyTmxYSEtpdHAwUVdiTWorMGluNVYxOEszSkt2OGNtbVFr?=
 =?utf-8?B?UmVFZUg1ZEJIY2JhMFlUS1FJdmpqY2NWY1k5WXJRODBsVzM5S3RaQkQ5aHA1?=
 =?utf-8?B?ZWZUNEdQVkhoTWtyTFNJSHhUWE05SklETUxyM2RIb1dCcExyVG9iTVltL05i?=
 =?utf-8?B?azY5OERvTjgya3ZMTGZOeStuV0RUSzYzRWZ1WlZiT2JiblZLOEQwd0dkQkUv?=
 =?utf-8?B?TUxPZVVyQUZjbGYwZVdjYmJuZWR6d3JneW9pZ052ZkFVdGpUbEhmdVRuYWEw?=
 =?utf-8?B?WnNIRlZHcFNCNVQwNERBOCtxL2xsWEd5NGpqdlJYZHoyVWp4ZVBTd1lIeFpo?=
 =?utf-8?B?c2NUSXVDZGszamNuNWo1SzcwSi9xNk9pRWdJTjdvUTVMVkRBbXl0bVZodTcz?=
 =?utf-8?B?K1Q3NGpFa29PTU8vNUxDOTB2NENQVjcwc0tBRmJvcFhrV1h5enY0c3ZLQWkx?=
 =?utf-8?B?dGR4NTIzQ0Fzem80ak4wNEwvOHJHTzFOaUh2Qk9XN0MrenRXZjBIQWM1aGVl?=
 =?utf-8?B?VExPekpKNnJmdFJyYXRvbWwyRkdGaU1XZ1d2Z3RBYjduQnNlS2lKNktsNzc4?=
 =?utf-8?B?VTB5a3lWZjZDTTdmYklmK25Od2JqS1owTk5Yak1NeFl2YytwTlN2T0tGdm5Q?=
 =?utf-8?B?YjFIZzNNWDUvL2JnRmdrczhHeWhzdFZieVFlaGxod0UyT1JyMzVNRkFXek5T?=
 =?utf-8?B?QTFhK04vMUtDQU93TU5nNS9ocXdkajhLYzlobHVKUTBiOGVvUFFwTENrZEhB?=
 =?utf-8?B?cXczazliZGpvTUROSE1vQzNLSFEwalFoL0RKeWdtVHZTcVBwVHFORkZNbTho?=
 =?utf-8?B?SDkxVlBkdERDTVpNb3QzMXJEU1NJZWY5ZFYvODFCeHl2QXEwWXl1V1o1c2Zs?=
 =?utf-8?B?RXMwZVBoSmN0MFVmcXoyTEM5Y3VnNVVMWWk2cllkWWc4N0ZXYWdXUFlrYUts?=
 =?utf-8?B?WXY1NUlhTmdlaG1PV09BVU5tTFdXNUY2UWU1M3NOZWVFMk44b2lJb0YyOE9r?=
 =?utf-8?B?U2RyNHZ6N3QvQlp1MURyRk1ZMnZnWEJmNmVxc3ROMzVVNGljMzl4TnlhbG9N?=
 =?utf-8?B?Zm9UTThpRTh6REFNWFNJTXlBVk9pWFhnb1NTcFRsSU5pTTdSYzN1a05INm5C?=
 =?utf-8?B?SW92K1pZZDZ6UEhycFBsV2hsSXhsajN6TmNXMHNnWVlLcUNidkFtSkZiV3pO?=
 =?utf-8?B?SVg2STVpREpVVDhmejR6Smxxam5PSjJkMVhHY3lNWFIzeGoyUWdrdjhlbHBS?=
 =?utf-8?B?S29ZRlIya2pLZFhIUTcvMWcweWRUNkJFdDNZd0FJdGlsZ3dXS3VuQUJZTUVM?=
 =?utf-8?B?RGJ5bDdaZWpLQXZkQkxFMVBNTEZpU3pjZGVZcllBUmRyQ3lUK3E1K0VscENn?=
 =?utf-8?B?b1oyUnljR1BvbzlPclQrVWRwQ3hrcE1aSUVGMWlDVnowOGNUTEJ2dHRTbC9T?=
 =?utf-8?B?RVh1V3RHakFHVDA1enlGV0ZEZUN0TnFZMS9PZEpUVzJMcGMvdmlib2E3WDF3?=
 =?utf-8?B?MWtXeEFUTzNzWnUzWWlyamsrTHorM1NtYzVHOCs5M3ZuWnFSN2dhV2ljRzZH?=
 =?utf-8?B?ZEtFK28rNHZzT0orNVdRNDEySlEvYzBMMHI4OTFFQU9zaGhZMXBJRlZHZVBk?=
 =?utf-8?B?bkI3MWRrc3N5N0VENlJwdFFaZ3VyR0w5NmpmTzNMdEZWT2lzOENEWm5pMWZ3?=
 =?utf-8?B?Z0dONW54NGdPWEkzY0dYbk1jdVNSbklma0ZKNzB5OUQvbktTY08ydHUrRGph?=
 =?utf-8?B?OVBtaVFmTDJEL01EeGZuZVEya0RDcVRTVlVwYnJET2ZpM3ZPSWdxc3ROczN3?=
 =?utf-8?B?a2c9PQ==?=
X-OriginatorOrg: meta.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3b987b0a-7c68-4ff3-b65c-08db4cae6077
X-MS-Exchange-CrossTenant-AuthSource: SN6PR1501MB2064.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2023 14:46:43.1425
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: SbznlvFwJS51eesUAlivwHdDiHA16kmewgEkk5K8zdanv7/mK+mVbk6XzyqnVcTT
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR15MB5957
X-Proofpoint-ORIG-GUID: p2xkc6CMyYyaRM1qRyVsDkxHnt78Qsn8
X-Proofpoint-GUID: p2xkc6CMyYyaRM1qRyVsDkxHnt78Qsn8
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-04_10,2023-05-04_01,2023-02-09_01
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 5/3/23 8:15 PM, Feng zhou wrote:
> From: Feng Zhou <zhoufeng.zf@bytedance.com>
> 
> test_progs:
> Tests new kfunc bpf_task_under_cgroup().
> 
> The bpf program saves the new task's pid within a given cgroup to
> the remote_pid, which is convenient for the user-mode program to
> verify the test correctness.
> 
> The user-mode program creates its own mount namespace, and mounts the
> cgroupsv2 hierarchy in there, call the fork syscall, then check if
> remote_pid and local_pid are unequal.
> 
> Signed-off-by: Feng Zhou <zhoufeng.zf@bytedance.com>

Ack with a few nits below. You can carry my Ack in the
next revision.

Acked-by: Yonghong Song <yhs@fb.com>


> ---
>   tools/testing/selftests/bpf/DENYLIST.s390x    |  1 +
>   .../bpf/prog_tests/task_under_cgroup.c        | 54 +++++++++++++++++++
>   .../bpf/progs/test_task_under_cgroup.c        | 51 ++++++++++++++++++
>   3 files changed, 106 insertions(+)
>   create mode 100644 tools/testing/selftests/bpf/prog_tests/task_under_cgroup.c
>   create mode 100644 tools/testing/selftests/bpf/progs/test_task_under_cgroup.c
> 
> diff --git a/tools/testing/selftests/bpf/DENYLIST.s390x b/tools/testing/selftests/bpf/DENYLIST.s390x
> index c7463f3ec3c0..5061d9e24c16 100644
> --- a/tools/testing/selftests/bpf/DENYLIST.s390x
> +++ b/tools/testing/selftests/bpf/DENYLIST.s390x
> @@ -26,3 +26,4 @@ user_ringbuf                             # failed to find kernel BTF type ID of
>   verif_stats                              # trace_vprintk__open_and_load unexpected error: -9                           (?)
>   xdp_bonding                              # failed to auto-attach program 'trace_on_entry': -524                        (trampoline)
>   xdp_metadata                             # JIT does not support calling kernel function                                (kfunc)
> +test_task_under_cgroup                   # JIT does not support calling kernel function                                (kfunc)
> diff --git a/tools/testing/selftests/bpf/prog_tests/task_under_cgroup.c b/tools/testing/selftests/bpf/prog_tests/task_under_cgroup.c
> new file mode 100644
> index 000000000000..fa3a98eae5ef
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/task_under_cgroup.c
> @@ -0,0 +1,54 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2023 Bytedance */
> +
> +#include <sys/syscall.h>
> +#include <test_progs.h>
> +#include <cgroup_helpers.h>
> +#include "test_task_under_cgroup.skel.h"
> +
> +#define FOO	"/foo"
> +
> +void test_task_under_cgroup(void)
> +{
> +	struct test_task_under_cgroup *skel;
> +	int ret, foo = -1;

You do not need to initialize 'foo' here.

> +	pid_t pid;
> +
> +	foo = test__join_cgroup(FOO);
> +	if (!ASSERT_OK(foo < 0, "cgroup_join_foo"))
> +		return;
> +
> +	skel = test_task_under_cgroup__open();
> +	if (!ASSERT_OK_PTR(skel, "test_task_under_cgroup__open"))
> +		goto cleanup;
> +
> +	skel->rodata->local_pid = getpid();
> +	skel->bss->remote_pid = getpid();
> +	skel->rodata->cgid = get_cgroup_id(FOO);
> +
> +	ret = test_task_under_cgroup__load(skel);
> +	if (!ASSERT_OK(ret, "test_task_under_cgroup__load"))
> +		goto cleanup;
> +
> +	ret = test_task_under_cgroup__attach(skel);
> +	if (!ASSERT_OK(ret, "test_task_under_cgroup__attach"))
> +		goto cleanup;
> +
> +	pid = fork();
> +	if (pid == 0)
> +		exit(0);
> +
> +	ret = (pid == -1);
> +	if (ASSERT_OK(ret, "fork process"))
> +		wait(NULL);
> +
> +	test_task_under_cgroup__detach(skel);
> +
> +	ASSERT_NEQ(skel->bss->remote_pid, skel->rodata->local_pid,
> +		   "test task_under_cgroup");
> +
> +cleanup:
> +	close(foo);
> +
> +	test_task_under_cgroup__destroy(skel);

Let us just do:
cleanup:
	test_task_under_cgroup__destroy(skel);
	close(foo);

This is the reverse order of test__join_cgroup() and 
test_task_under_cgroup__open().

> +}
> diff --git a/tools/testing/selftests/bpf/progs/test_task_under_cgroup.c b/tools/testing/selftests/bpf/progs/test_task_under_cgroup.c
> new file mode 100644
> index 000000000000..79d98e65c7eb
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/test_task_under_cgroup.c
> @@ -0,0 +1,51 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2023 Bytedance */
> +
> +#include <vmlinux.h>
> +#include <bpf/bpf_tracing.h>
> +#include <bpf/bpf_helpers.h>
> +
> +#include "bpf_misc.h"
> +
> +struct cgroup *bpf_cgroup_from_id(u64 cgid) __ksym;
> +long bpf_task_under_cgroup(struct task_struct *task, struct cgroup *ancestor) __ksym;
> +void bpf_cgroup_release(struct cgroup *p) __ksym;
> +struct task_struct *bpf_task_acquire(struct task_struct *p) __ksym;
> +void bpf_task_release(struct task_struct *p) __ksym;
> +
> +const volatile int local_pid;
> +const volatile __u64 cgid;
> +int remote_pid;
> +
> +SEC("tp_btf/task_newtask")
> +int BPF_PROG(handle__task_newtask, struct task_struct *task, u64 clone_flags)
> +{
> +	struct cgroup *cgrp = NULL;
> +	struct task_struct *acquired;
> +
> +	if (local_pid != (bpf_get_current_pid_tgid() >> 32))
> +		return 0;
> +
> +	acquired = bpf_task_acquire(task);
> +	if (!acquired)
> +		return 0;
> +
> +	if (local_pid == acquired->tgid)
> +		goto out;
> +
> +	cgrp = bpf_cgroup_from_id(cgid);
> +	if (!cgrp)
> +		goto out;
> +
> +	if (bpf_task_under_cgroup(acquired, cgrp))
> +		remote_pid = acquired->tgid;
> +
> +out:
> +	if (acquired)
> +		bpf_task_release(acquired);
> +	if (cgrp)
> +		bpf_cgroup_release(cgrp);

Let us do:
out:
	if (cgrp)
		bpf_cgroup_release(cgrp);
	bpf_task_release(acquired);

> +	return 0;
> +}
> +
> +char _license[] SEC("license") = "GPL";