From mboxrd@z Thu Jan 1 00:00:00 1970 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 15047C433FE for ; Wed, 26 Oct 2022 04:28:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232659AbiJZE2y (ORCPT ); Wed, 26 Oct 2022 00:28:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231696AbiJZE2x (ORCPT ); Wed, 26 Oct 2022 00:28:53 -0400 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D007FAA3DB for ; Tue, 25 Oct 2022 21:28:51 -0700 (PDT) Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29PMGr3K017395 for ; Tue, 25 Oct 2022 21:28:51 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=facebook; bh=V2qVPEIlEHxtJ82CjKFYVuWcNlWgAAX1OUpSIyALA/0=; b=JBUdfMhqUCGOI8ekNNY3SfDqjPzxJQXiHSNSptZYZtB15OW+IBw+bpERbuo8HILEX3yt RSqLY/JgZosgv1NqVIeSy4tsh+cIVSFBEymKyRcDL9Qny/q1RFjTt6Rfvq2kDV6qcnBy mlWbkMOb9af+yIVCEWUsfXz3ERlrg1Y3TZM= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3kebbq3buk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 25 Oct 2022 21:28:51 -0700 Received: from twshared13927.24.frc3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 25 Oct 2022 21:28:50 -0700 Received: by devbig309.ftw3.facebook.com (Postfix, from userid 128203) id 28FB21131B824; Tue, 25 Oct 2022 21:28:35 -0700 (PDT) From: Yonghong Song To: CC: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , , KP Singh , Martin KaFai Lau , Tejun Heo Subject: [PATCH bpf-next v6 0/9] bpf: Implement cgroup local storage available to non-cgroup-attached bpf progs Date: Tue, 25 Oct 2022 21:28:35 -0700 Message-ID: <20221026042835.672317-1-yhs@fb.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: S9Btb-KFnKLqwbpxih0ZUBhWqDB6zrwv X-Proofpoint-GUID: S9Btb-KFnKLqwbpxih0ZUBhWqDB6zrwv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-26_01,2022-10-25_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org There already exists a local storage implementation for cgroup-attached bpf programs. See map type BPF_MAP_TYPE_CGROUP_STORAGE and helper bpf_get_local_storage(). But there are use cases such that non-cgroup attached bpf progs wants to access cgroup local storage data. For example= , tc egress prog has access to sk and cgroup. It is possible to use sk local storage to emulate cgroup local storage by storing data in socke= t. But this is a waste as it could be lots of sockets belonging to a particu= lar cgroup. Alternatively, a separate map can be created with cgroup id as th= e key. But this will introduce additional overhead to manipulate the new map. A cgroup local storage, similar to existing sk/inode/task storage, should help for this use case. This patch implemented new cgroup local storage available to non-cgroup-attached bpf programs. In the patch series, Patches 1 and 2 are preparation patches. Patch 3 implemented new cgroup local storage kernel support. Patches 4 and 5 implemented libbpf and bpftool support. Patches 6-8 fixed one existing test and added four new tests to validate kernel/libbpf implementations. Patch 9 added documentation for new BPF_MAP_TYPE_CGRP_STORAGE map type and comparison of the old and new cgroup local storage maps. Changelogs: v5 -> v6: . fix selftest test_libbpf_str/bpf_map_type_str due to marking BPF_MAP_TYPE_CGROUP_STORAGE as deprecated. . add cgrp_local_storage test in s390x denylist since the test has some fentry/fexit programs. v4 -> v5: . additional refactoring in patch 2 . fix the call site for bpf_cgrp_storage_free() in kernel/cgroup/cgro= up.c. . add a test for progs attaching to cgroups . add a negative test (the helper key is a task instead of expected c= group) . some spelling fixes v3 -> v4: . fix a config guarding problem in kernel/cgroup/cgroup.c when cgrp_storage is deleted (CONFIG_CGROUP_BPF =3D> CONFIG_BPF_SYSCALL)= . . rename selftest from cgroup_local_storage.c to cgrp_local_storage.c so the name can better align with map name. . fix a few misspellings. v2 -> v3: . fix a config caused kernel test complaint. . better description/comments in uapi bpf.h and bpf_cgrp_storage.c. . factor code for better resue for map_alloc/map_free. . improved explanation in map documentation. v1 -> v2: . change map name from BPF_MAP_TYPE_CGROUP_LOCAL_STORAGE to BPF_MAP_TYPE_CGRP_STORAGE. . removed support of sleepable programs. . changed the place of freeing cgrp local storage from put_css_set_lo= cked() to css_free_rwork_fn(). . added map documentation. Yonghong Song (9): bpf: Make struct cgroup btf id global bpf: Refactor some inode/task/sk storage functions for reuse bpf: Implement cgroup storage available to non-cgroup-attached bpf progs libbpf: Support new cgroup local storage bpftool: Support new cgroup local storage selftests/bpf: Fix test test_libbpf_str/bpf_map_type_str selftests/bpf: Add selftests for new cgroup local storage selftests/bpf: Add test cgrp_local_storage to DENYLIST.s390x docs/bpf: Add documentation for new cgroup local storage Documentation/bpf/map_cgrp_storage.rst | 109 ++++++++ include/linux/bpf.h | 7 + include/linux/bpf_local_storage.h | 17 +- include/linux/bpf_types.h | 1 + include/linux/btf_ids.h | 1 + include/linux/cgroup-defs.h | 4 + include/uapi/linux/bpf.h | 50 +++- kernel/bpf/Makefile | 2 +- kernel/bpf/bpf_cgrp_storage.c | 247 ++++++++++++++++++ kernel/bpf/bpf_inode_storage.c | 38 +-- kernel/bpf/bpf_local_storage.c | 190 +++++++++----- kernel/bpf/bpf_task_storage.c | 38 +-- kernel/bpf/cgroup_iter.c | 2 +- kernel/bpf/helpers.c | 6 + kernel/bpf/syscall.c | 3 +- kernel/bpf/verifier.c | 13 +- kernel/cgroup/cgroup.c | 1 + kernel/trace/bpf_trace.c | 4 + net/core/bpf_sk_storage.c | 35 +-- scripts/bpf_doc.py | 2 + .../bpf/bpftool/Documentation/bpftool-map.rst | 2 +- tools/bpf/bpftool/map.c | 2 +- tools/include/uapi/linux/bpf.h | 50 +++- tools/lib/bpf/libbpf.c | 1 + tools/lib/bpf/libbpf_probes.c | 1 + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + .../bpf/prog_tests/cgrp_local_storage.c | 171 ++++++++++++ .../selftests/bpf/prog_tests/libbpf_str.c | 8 + .../bpf/progs/cgrp_ls_attach_cgroup.c | 101 +++++++ .../selftests/bpf/progs/cgrp_ls_negative.c | 26 ++ .../selftests/bpf/progs/cgrp_ls_recursion.c | 70 +++++ .../selftests/bpf/progs/cgrp_ls_tp_btf.c | 88 +++++++ 32 files changed, 1102 insertions(+), 189 deletions(-) create mode 100644 Documentation/bpf/map_cgrp_storage.rst create mode 100644 kernel/bpf/bpf_cgrp_storage.c create mode 100644 tools/testing/selftests/bpf/prog_tests/cgrp_local_sto= rage.c create mode 100644 tools/testing/selftests/bpf/progs/cgrp_ls_attach_cgro= up.c create mode 100644 tools/testing/selftests/bpf/progs/cgrp_ls_negative.c create mode 100644 tools/testing/selftests/bpf/progs/cgrp_ls_recursion.c create mode 100644 tools/testing/selftests/bpf/progs/cgrp_ls_tp_btf.c --=20 2.30.2