From patchwork Thu Apr 27 02:30:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Zhou X-Patchwork-Id: 13225118 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63208C7618E for ; Thu, 27 Apr 2023 02:31:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242714AbjD0CbK (ORCPT ); Wed, 26 Apr 2023 22:31:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242937AbjD0CbF (ORCPT ); Wed, 26 Apr 2023 22:31:05 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD3283C2F for ; Wed, 26 Apr 2023 19:30:40 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2478485fd76so5447329a91.2 for ; Wed, 26 Apr 2023 19:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682562640; x=1685154640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4couG4BvY3JielUUZmpwOAXPZt7eiYYa/cnyqJtYMcY=; b=iCeciy53FkncyTEa61u93EdyroUtj3yVBYxIfPJjrHwdMOMMw928rZGTxVJJVLkFkb 7gIkVnBdyLdGoC1HiuFoGM7b2Mz3Af/SaGO/4XTlV6M2v3en8jkTUOyCHSrVYl+iXT3N dP6XRnOOEiEsm9WlR2pnQVrXK/3kETr8DtOYnQUw5B3B0UXNX4lTEUpbkx7Whln0c0YI O1x5gaZCKrdTt1OuwU8v8JrjmuUVJ967cKAUiagh3jIUjM4FtE/kQ85hHpC+6VSVxZMw hseVfj2scuw1HMzVb4LciHRbGZ3kNJkF2jo9N9F7InMZMQD93A/NOfvfS6IZ0eaJZESx 8YoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682562640; x=1685154640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4couG4BvY3JielUUZmpwOAXPZt7eiYYa/cnyqJtYMcY=; b=ErdQDiihUuoEQh+7gXLeRhM5/r74CqLHeNbwrWTJP84HDRIR4GIWscqp51JaAl45My XqVu8lFcWunMeQZkMLz79I+2AeM2l/AzPsRDersOTjcy6hKPaO2cMwueM7RRPf2wWRl4 XAHY92v4O7tUrm/YgUZYKcb9sE/uaP8Gqv/krWB/RgLr9tP9CUoFioV4J5rWHCfhN5S/ /na5rsjQ5RZS2ASE8IBS+y3qCNmBXZkQoaYNcDVvPGOPWYOpzvA0ROS8K0tjJMVjR18a nJLGSvuqwxKSrRLyNCj0Uej0KsQG4HeFshdjOVFcEM1MU38g8NbrvJcTpkkC5QN1HqUm MWEw== X-Gm-Message-State: AC+VfDyMI63gt2E35hzHzQA6MRvJJzr2aXZrLv5xm+Re0kTi0HVP19wE yrSBFAZayZtQpwrtdSgAxcJ+bQ== X-Google-Smtp-Source: ACHHUZ6gccL1ZEpUmUDmifDB0DiS0469jZ/45YB8rECEfdb4SnsnHxXi1VpTC1ouLoKHsNE1+kTTjg== X-Received: by 2002:a17:90b:4acf:b0:22c:59c3:8694 with SMTP id mh15-20020a17090b4acf00b0022c59c38694mr181241pjb.44.1682562640127; Wed, 26 Apr 2023 19:30:40 -0700 (PDT) Received: from C02F52LSML85.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id m8-20020a654388000000b0051303d3e3c5sm10291852pgp.42.2023.04.26.19.30.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 19:30:39 -0700 (PDT) From: Feng zhou To: 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, zhoufeng.zf@bytedance.com Subject: [PATCH bpf-next v3 1/2] bpf: Add bpf_task_under_cgroup() kfunc Date: Thu, 27 Apr 2023 10:30:18 +0800 Message-Id: <20230427023019.73576-2-zhoufeng.zf@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230427023019.73576-1-zhoufeng.zf@bytedance.com> References: <20230427023019.73576-1-zhoufeng.zf@bytedance.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net From: Feng Zhou Add a kfunc that's similar to the bpf_current_task_under_cgroup. The difference is that it is a designated task. When hook sched related functions, sometimes it is necessary to specify a task instead of the current task. Signed-off-by: Feng Zhou --- kernel/bpf/helpers.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index bb6b4637ebf2..453cbd312366 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -2149,6 +2149,25 @@ __bpf_kfunc struct cgroup *bpf_cgroup_from_id(u64 cgid) return NULL; return cgrp; } + +/** + * bpf_task_under_cgroup - wrap task_under_cgroup_hierarchy() as a kfunc, test + * task's membership of cgroup ancestry. + * @task: the task to be tested + * @ancestor: possible ancestor of @task's cgroup + * + * Tests whether @task's default cgroup hierarchy is a descendant of @ancestor. + * It follows all the same rules as cgroup_is_descendant, and only applies + * to the default hierarchy. + */ +__bpf_kfunc long bpf_task_under_cgroup(struct task_struct *task, + struct cgroup *ancestor) +{ + if (unlikely(!ancestor || !task)) + return -EINVAL; + + return task_under_cgroup_hierarchy(task, ancestor); +} #endif /* CONFIG_CGROUPS */ /** @@ -2400,6 +2419,7 @@ BTF_ID_FLAGS(func, bpf_cgroup_acquire, KF_ACQUIRE | KF_RCU | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_cgroup_release, KF_RELEASE) BTF_ID_FLAGS(func, bpf_cgroup_ancestor, KF_ACQUIRE | KF_RCU | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_cgroup_from_id, KF_ACQUIRE | KF_RET_NULL) +BTF_ID_FLAGS(func, bpf_task_under_cgroup, KF_RCU) #endif BTF_ID_FLAGS(func, bpf_task_from_pid, KF_ACQUIRE | KF_RET_NULL) BTF_SET8_END(generic_btf_ids) From patchwork Thu Apr 27 02:30:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Zhou X-Patchwork-Id: 13225119 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89122C77B7F for ; Thu, 27 Apr 2023 02:31:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242962AbjD0CbS (ORCPT ); Wed, 26 Apr 2023 22:31:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229605AbjD0CbO (ORCPT ); Wed, 26 Apr 2023 22:31:14 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F36A420E for ; Wed, 26 Apr 2023 19:30:48 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-63f273b219eso4010925b3a.1 for ; Wed, 26 Apr 2023 19:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682562648; x=1685154648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ogtFxEiScrp6cRdGGCqsrApRdhckxLBPnpR1IoKzkew=; b=bA5p0z775AmOrdR5ZLb7QB8Jocp+rEvoXZ3vgtDvsV6J7sepKpQynzsvLir06js/Z4 Lh4771+ctSLfT7o0ruXzUgyf1d+NpJAmSidEbbyk2DU8JAsEFxMd5h2H5dej55aj+IR8 K05zV0vLWWaKuQT2IO5/nDHmIiAPs4aKz2twYdImIZXvi9na1Vz2eO/r6n++Ljv30SQj r5B6bpbWDGyeJM1MY26Rzmx5vzrfsTkYmr0dvQ94cxYgHw/f6ReviMo8UxCzsqgGjOUN B6VAm3rx/CWa26Q4Y9yVifr3IiBJ8/l71Ls8Iiyv0RWHK/IjqNkUMpz6NXXVjFhQJYp+ Hjxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682562648; x=1685154648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ogtFxEiScrp6cRdGGCqsrApRdhckxLBPnpR1IoKzkew=; b=hBWsiFawyRtMBYt/wky5wwjRqxSQuf8wIKDUTv0vzjKVwcpl4dKdkJwEWxj9ndMvJs zCb5rZoYc+MAddAuF95fpBSo/V5rHlDons/yTe/kZsOlpdJASHYDnIpVJIRu2HIURfYh /c5kw5OlGvdFuZjT/KmJB+rqUkoH8m8KTpPgfv+4wInlC1y88XLNgu2s3GDRLri4cBnX Y+5HlpCtX/T6ibfkX4EsQX7af3CdgxHrqGbN2t77JIUDZvJR9/+Cdbs0waLYwk02dGmG nxMJWk/QFIu1+beQH4o8RwUB/8gFl9/nHp2J0pIfQm4LMocSxtaULnKfV35ZpjLjrE0c ko9Q== X-Gm-Message-State: AAQBX9eOzoyBRWsP/XZib82IVVZpotMJQzFn18nW9U9Tc2d7px4J19EJ ZQCKNkp1WwpjdncQbe7lsbKU7w== X-Google-Smtp-Source: AKy350bV9f47UAvF0xLg01FVlmb66jGMB6i4YP2z1RRhhPuCDgFPCnP7laevSdmx/RYbDJHCWlaQMw== X-Received: by 2002:a05:6a20:3c9e:b0:f2:abda:412a with SMTP id b30-20020a056a203c9e00b000f2abda412amr24422440pzj.25.1682562647814; Wed, 26 Apr 2023 19:30:47 -0700 (PDT) Received: from C02F52LSML85.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id m8-20020a654388000000b0051303d3e3c5sm10291852pgp.42.2023.04.26.19.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 19:30:47 -0700 (PDT) From: Feng zhou To: 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, zhoufeng.zf@bytedance.com Subject: [PATCH bpf-next v3 2/2] selftests/bpf: Add testcase for bpf_task_under_cgroup Date: Thu, 27 Apr 2023 10:30:19 +0800 Message-Id: <20230427023019.73576-3-zhoufeng.zf@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230427023019.73576-1-zhoufeng.zf@bytedance.com> References: <20230427023019.73576-1-zhoufeng.zf@bytedance.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net From: Feng Zhou test_progs: Tests new kfunc bpf_task_under_cgroup(). The bpf program saves the pid which call the getpgid syscall 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 getpgid syscall, then check if remote_pid and local_pid are equal. Signed-off-by: Feng Zhou --- tools/testing/selftests/bpf/DENYLIST.s390x | 1 + .../bpf/prog_tests/task_under_cgroup.c | 47 +++++++++++++++++++ .../selftests/bpf/progs/cgrp_kfunc_common.h | 1 + .../bpf/progs/test_task_under_cgroup.c | 37 +++++++++++++++ 4 files changed, 86 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..6d5709a8203d --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/task_under_cgroup.c @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2023 Bytedance */ + +#include +#include +#include +#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; + + 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->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; + + syscall(SYS_getpgid); + + test_task_under_cgroup__detach(skel); + + ASSERT_EQ(skel->bss->remote_pid, skel->rodata->local_pid, + "test task_under_cgroup"); + +cleanup: + if (foo >= 0) + close(foo); + + test_task_under_cgroup__destroy(skel); +} diff --git a/tools/testing/selftests/bpf/progs/cgrp_kfunc_common.h b/tools/testing/selftests/bpf/progs/cgrp_kfunc_common.h index 22914a70db54..001c416b42bc 100644 --- a/tools/testing/selftests/bpf/progs/cgrp_kfunc_common.h +++ b/tools/testing/selftests/bpf/progs/cgrp_kfunc_common.h @@ -26,6 +26,7 @@ struct cgroup *bpf_cgroup_ancestor(struct cgroup *cgrp, int level) __ksym; struct cgroup *bpf_cgroup_from_id(u64 cgid) __ksym; void bpf_rcu_read_lock(void) __ksym; void bpf_rcu_read_unlock(void) __ksym; +int bpf_task_under_cgroup(struct task_struct *task, struct cgroup *ancestor) __ksym; static inline struct __cgrps_kfunc_map_value *cgrps_kfunc_map_value_lookup(struct cgroup *cgrp) { 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..8f23a2933fde --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_task_under_cgroup.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2023 Bytedance */ + +#include +#include +#include + +#include "bpf_misc.h" +#include "cgrp_kfunc_common.h" + +const volatile int local_pid; +const volatile long cgid; +int remote_pid; + +SEC("fentry/" SYS_PREFIX "sys_getpgid") +int sys_getpgid(void *ctx) +{ + struct cgroup *cgrp; + + if (local_pid != (bpf_get_current_pid_tgid() >> 32)) + return 0; + + cgrp = bpf_cgroup_from_id(cgid); + if (!cgrp) + return 0; + + if (!bpf_task_under_cgroup(bpf_get_current_task_btf(), cgrp)) + goto out; + + remote_pid = local_pid; + +out: + bpf_cgroup_release(cgrp); + return 0; +} + +char _license[] SEC("license") = "GPL";