From patchwork Sun Aug 27 15:27:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonghong Song X-Patchwork-Id: 13367293 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 392F97EE for ; Sun, 27 Aug 2023 15:27:45 +0000 (UTC) Received: from 69-171-232-180.mail-mxout.facebook.com (69-171-232-180.mail-mxout.facebook.com [69.171.232.180]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0ECAEEC for ; Sun, 27 Aug 2023 08:27:43 -0700 (PDT) Received: by devbig309.ftw3.facebook.com (Postfix, from userid 128203) id 4355F257ECDFD; Sun, 27 Aug 2023 08:27:29 -0700 (PDT) From: Yonghong Song To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , kernel-team@fb.com, Martin KaFai Lau Subject: [PATCH bpf-next v3 00/13] bpf: Add support for local percpu kptr Date: Sun, 27 Aug 2023 08:27:29 -0700 Message-Id: <20230827152729.1995219-1-yonghong.song@linux.dev> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-0.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RDNS_DYNAMIC,SPF_HELO_PASS,SPF_SOFTFAIL, TVD_RCVD_IP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: bpf@iogearbox.net Patch set [1] implemented cgroup local storage BPF_MAP_TYPE_CGRP_STORAGE similar to sk/task/inode local storage and old BPF_MAP_TYPE_CGROUP_STORAGE map is marked as deprecated since old BPF_MAP_TYPE_CGROUP_STORAGE map can only work with current cgroup. Similarly, the existing BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE map is a percpu version of BPF_MAP_TYPE_CGROUP_STORAGE and only works with current cgroup. But there is no replacement which can work with arbitrary cgroup. This patch set solved this problem but adding support for local percpu kptr. The map value can have a percpu kptr field which holds a bpf prog allocated percpu data. The below is an example, struct percpu_val_t { ... fields ... } struct map_value_t { struct percpu_val_t __percpu_kptr *percpu_data_ptr; } In the above, 'map_value_t' is the map value type for a BPF_MAP_TYPE_CGRP_STORAGE map. User can access 'percpu_data_ptr' and then read/write percpu data. This covers BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE and more. So BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE map type is marked as deprecated. In additional, local percpu kptr supports the same map type as other kptrs including hash, lru_hash, array, sk/inode/task/cgrp local storage. Currently, percpu data structure does not support non-scalars or special fields (e.g., bpf_spin_lock, bpf_rb_root, etc.). They can be supported in the future if there exist use cases. Please for individual patches for details. [1] https://lore.kernel.org/all/20221026042835.672317-1-yhs@fb.com/ Changelog: v2 -> v3: - fix libbpf_str test failure. v1 -> v2: - does not support special fields in percpu data structure. - rename __percpu attr to __percpu_kptr attr. - rename BPF_KPTR_PERCPU_REF to BPF_KPTR_PERCPU. - better code to handle bpf_{this,per}_cpu_ptr() helpers. - add more negative tests. - fix a bpftool related test failure. Yonghong Song (13): bpf: Add support for non-fix-size percpu mem allocation bpf: Add BPF_KPTR_PERCPU as a field type bpf: Add alloc/xchg/direct_access support for local percpu kptr bpf: Add bpf_this_cpu_ptr/bpf_per_cpu_ptr support for allocated percpu obj selftests/bpf: Update error message in negative linked_list test libbpf: Add __percpu_kptr macro definition selftests/bpf: Add bpf_percpu_obj_{new,drop}() macro in bpf_experimental.h selftests/bpf: Add tests for array map with local percpu kptr bpf: Mark OBJ_RELEASE argument as MEM_RCU when possible selftests/bpf: Remove unnecessary direct read of local percpu kptr selftests/bpf: Add tests for cgrp_local_storage with local percpu kptr selftests/bpf: Add some negative tests bpf: Mark BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE deprecated include/linux/bpf.h | 22 +- include/linux/bpf_verifier.h | 1 + include/uapi/linux/bpf.h | 9 +- kernel/bpf/btf.c | 5 + kernel/bpf/core.c | 8 +- kernel/bpf/helpers.c | 16 ++ kernel/bpf/memalloc.c | 14 +- kernel/bpf/syscall.c | 4 + kernel/bpf/verifier.c | 191 +++++++++++++++--- tools/include/uapi/linux/bpf.h | 9 +- tools/lib/bpf/bpf_helpers.h | 1 + .../testing/selftests/bpf/bpf_experimental.h | 31 +++ .../selftests/bpf/prog_tests/libbpf_str.c | 6 +- .../selftests/bpf/prog_tests/linked_list.c | 4 +- .../selftests/bpf/prog_tests/percpu_alloc.c | 125 ++++++++++++ .../selftests/bpf/progs/percpu_alloc_array.c | 183 +++++++++++++++++ .../progs/percpu_alloc_cgrp_local_storage.c | 105 ++++++++++ .../selftests/bpf/progs/percpu_alloc_fail.c | 164 +++++++++++++++ .../selftests/bpf/test_bpftool_synctypes.py | 9 + 19 files changed, 853 insertions(+), 54 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/percpu_alloc.c create mode 100644 tools/testing/selftests/bpf/progs/percpu_alloc_array.c create mode 100644 tools/testing/selftests/bpf/progs/percpu_alloc_cgrp_local_storage.c create mode 100644 tools/testing/selftests/bpf/progs/percpu_alloc_fail.c