From patchwork Thu Nov 17 16:24:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Kartikeya Dwivedi X-Patchwork-Id: 13047009 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 6E9D9C433FE for ; Thu, 17 Nov 2022 16:26:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240534AbiKQQ03 (ORCPT ); Thu, 17 Nov 2022 11:26:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240330AbiKQQ0N (ORCPT ); Thu, 17 Nov 2022 11:26:13 -0500 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C041B7C02C for ; Thu, 17 Nov 2022 08:24:40 -0800 (PST) Received: by mail-pf1-x442.google.com with SMTP id y13so2244036pfp.7 for ; Thu, 17 Nov 2022 08:24:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ESnNqlKy0RvyKmr0rpGKcxQ1D3DAJBPMksVdzVoH6rM=; b=gdTUFenxVzUdzGf6AKorwupXdYqd7F90XjM3E4ulOnFNDBgkgHRuFWjlnJN3UpftYy yxz/3Gx76h//XBQT13uPOWiUfLgdzUlr20vPygCYf0OOcwvmQlgWfma52c9P1ek1LvIX PfGNqvvuZu5bk62lmlyBTiXsSzjPB9eQu08ON3LVjyjtZKyzqevDhYcbh4fYCwscoY0G 1Q/khGxXJvl2GJwP6eVMulGBYEcSGQbkN5quINYG/VsjV3i7BCJGRtDSM8MV8FghBSdB OlrwwN9NWRBfJsmJZHc4tfv2z+xlibmyQK6qy8D/f3+Yu48F4yF5jzPw8rljCiafnehK xb8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ESnNqlKy0RvyKmr0rpGKcxQ1D3DAJBPMksVdzVoH6rM=; b=rfz8y3/zmjBk073JbH5LxpWCR1nhskMVvbBrTRwihk0VOI5o3fx1EofEzTHh7Iz0CB oOTm48iyPIkkE+n7Tqj5fYNmALmp/W1ZGV6pK75AnBSDZiV/Js8Wc/k79sofy0/cnGtI XNe+L+4rjgCQWFTRknqT514tp2eW06SsBW7C7mniDA5ELoukVMUavUvIMfd0TMeBx8AE hd9iQjAsaovdppTOEv78q76rX9u4FzrpE1jL+wHBkDI5+VKk2OBfuqeMDGL/O0PiI6l/ ++FtRJR5JwBQn/YwrUK2iY3xjPTrVe7v3ru69DZDYq6qew4ksPvuqw2YJAH/8VXxHDy2 3KKw== X-Gm-Message-State: ANoB5pn3Esx+BxEqvDlIuqVaPCN1fFljhqD4RfUNKHJVovEWld54DyPU T2YMZhITKDSCKCmbNwQB6tWJe3wP47w= X-Google-Smtp-Source: AA0mqf4si4slTHD1n34rzVrYmFW7AVzZbcefyPhsorRmT0ZDuCKl8iu0RbaY7wfPaw4fl0nJscjLaw== X-Received: by 2002:a62:b402:0:b0:56e:8f96:6b2e with SMTP id h2-20020a62b402000000b0056e8f966b2emr3695662pfn.18.1668702279887; Thu, 17 Nov 2022 08:24:39 -0800 (PST) Received: from localhost ([103.4.221.252]) by smtp.gmail.com with ESMTPSA id k9-20020a170902ba8900b0018725c2fc46sm1460730pls.303.2022.11.17.08.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 08:24:39 -0800 (PST) From: Kumar Kartikeya Dwivedi To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Martin KaFai Lau , Dave Marchevsky Subject: [PATCH bpf-next v8 00/22] Allocated objects, BPF linked lists Date: Thu, 17 Nov 2022 21:54:08 +0530 Message-Id: <20221117162430.1213770-1-memxor@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=11587; i=memxor@gmail.com; h=from:subject; bh=3rqhGEPVD8+2ET+rmPNY9VrAQleoZHaRDgg8klqxVK4=; b=owEBbQKS/ZANAwAIAUzgyIZIvxHKAcsmYgBjdl79TKdYnaaOKuX5bmdVJk3oxpcVd760f6U3xyCf aE249paJAjMEAAEIAB0WIQRLvip+Buz51YI8YRFM4MiGSL8RygUCY3Ze/QAKCRBM4MiGSL8Ryt+pD/ 4yGdV7WCEFzzclUApAlHYoSQNiyz6ZGxJ5+fUfhVwYJhgMMOI1qEy4i6CfxwbvJUhSusqHEjkgDkSY cF86AiooHH9wg4A8JGEhHtvdVEFy/aLzBzSg3dMnZXxpNdaiXltOsltvCcuSwgLSXZM7THkgdDZjbG b90lVZWE15vr2Ki47gMD8nJC5ktn/Wfz24kB7wuLNkCBgpiY2e9L7eEK084h07M2W8UpIn/e66xcgM IZp7QCKdVgGVVSJCo/6VQjrW6gcgECNNfQg/O2Slk9Zheb0hegPnprxp9CWixTxG7hBloouYRYMVXd QV8f98su139ZkBUhIo5AeliDt+aQVEHmb5riW7kyjGPOk+EN2r4StA8OmcxgjX7fDY6BDX77U+7Zj8 4oxYnUTukLxhydaM+V9PFgj6W1zXK5psi0jEqbvTPwi06lVv3klVxW14y9EVd8vaUk824HNvOxaNoI rgMci8Ato5iNc+Okh4aR9MWMp9UJt1qjYUq5qn0GBwdWQ8xO50O7fZTXVdyhCUuvijZMDk3cngkn5W meytP79cnPNg79kwkdTNKqO1BvKIUZix/DFPYK5XANpgESiGDwamhWeNURTAzGAiowSinHaSDrsja3 HVRiCtBgTnklE4I+4vbBrpI2uEkyCnB0E5ZCws5qPZW/CCEz30EEPbMMmvpg== X-Developer-Key: i=memxor@gmail.com; a=openpgp; fpr=4BBE2A7E06ECF9D5823C61114CE0C88648BF11CA Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net This series introduces user defined BPF objects of a type in program BTF. This allows BPF programs to allocate their own objects, build their own object hierarchies, and use the basic building blocks provided by BPF runtime to build their own data structures flexibly. Then, we introduce the support for single ownership BPF linked lists, which can be put inside BPF maps, or allocated objects, and hold such allocated objects as elements. It works as an instrusive collection, which is done to allow making allocated objects part of multiple data structures at the same time in the future. The eventual goal of this and future patches is to allow one to do some limited form of kernel style programming in BPF C, and allow programmers to build their own complex data structures flexibly out of basic building blocks. The key difference will be that such programs are verified to be safe, preserve runtime integrity of the system, and are proven to be bug free as far as the invariants of BPF specific APIs are concerned. One immediate use case that will be using the entire infrastructure this series is introducing will be managing percpu NMI safe linked lists inside BPF programs. The other use case this will serve in the near future will be linking kernel structures like XDP frame and sk_buff directly into user data structures (rbtree, pifomap, etc.) for packet queueing. This will follow single ownership concept included in this series. The user has complete control of the internal locking, and hence also the batching of operations for each critical section. The features are: - Allocated objects. - bpf_obj_new, bpf_obj_drop to allocate and free them. - Single ownership BPF linked lists. - Support for them in BPF maps. - Support for them in allocated objects. - Global spin locks. - Spin locks inside allocated objects. Some other notable things: - Completely static verification of locking. - Kfunc argument handling has been completely reworked. - Argument rewriting support for kfuncs. - A new bpf_experimental.h header as a dumping ground for these APIs. Any functionality exposed in this series is NOT part of UAPI. It is only available through use of kfuncs, and structs that can be added to map value may also change their size or name in the future. Hence, every feature in this series must be considered experimental. Follow-ups: ----------- * Support for kptrs (local and kernel) in local storage and percpu maps + kptr tests * Fixes for helper access checks rebasing on top of this series Next steps: ----------- * NMI safe percpu single ownership linked lists (using local_t protection). * Lockless linked lists. * Allow RCU protected BPF allocated objects. This then allows RCU protected list lookups, since spinlock protection for readers does not scale. * Introduce bpf_refcount for local kptrs, shared ownership. * Introduce shared ownership linked lists. * Documentation. Changelog: ---------- v7 -> v8 v7: https://lore.kernel.org/bpf/20221114191547.1694267-1-memxor@gmail.com * Fix early return in map_check_btf (Dan Carpenter) * Fix two memory leak bugs in local storage maps, outer maps * Address comments from Alexei and Dave * More local kptr -> allocated object renaming * Use krealloc with NULL instead kmalloc + krealloc * Drop WARN_ON_ONCE for field_offs parsing * Combine kfunc add + remove patches into one * Drop STRONG suffix from KF_ARG_PTR_TO_KPTR * Rename is_kfunc_arg_ret_buf_size to is_kfunc_arg_scalar_with_name * Remove redundant check for reg->type and arg type in it * Drop void * ret type check * Remove code duplication in checks for NULL pointer with offset != 0 * Fix two bpf_list_node typos * Improve log message for bpf_list_head operations * Improve comments for active_lock struct * Improve comments for Implementation details of process_spin_lock * Add Dave's acks v6 -> v7 v6: https://lore.kernel.org/bpf/20221111193224.876706-1-memxor@gmail.com * Fix uninitialized variable warning (Dan Carpenter, Kernel Test Robot) * One more local_kptr renaming v5 -> v6 v5: https://lore.kernel.org/bpf/20221107230950.7117-1-memxor@gmail.com * Replace (i && !off) check with next_off, include test (Andrii) * Drop local kptrs naming (Andrii, Alexei) * Drop reg->precise == EXACT patch (Andrii) * Add comment about ptr member of struct active_lock (Andrii) * Use btf__new_empty + btf__add_xxx APIs (Andrii) * Address other misc nits from Andrii v4 -> v5 v4: https://lore.kernel.org/bpf/20221103191013.1236066-1-memxor@gmail.com * Add a lot more selftests (failure, success, runtime, BTF) * Make sure series is bisect friendly * Move list draining out of spin lock * This exposed an issue where bpf_mem_free can now be called in map_free path without migrate_disable, also fixed that. * Rename MEM_ALLOC -> MEM_RINGBUF, MEM_TYPE_LOCAL -> MEM_ALLOC (Alexei) * Group lock identity into a struct active_lock { ptr, id } (Dave) * Split set_release_on_unlock logic into separate patch (Alexei) v3 -> v4 v3: https://lore.kernel.org/bpf/20221102202658.963008-1-memxor@gmail.com * Fix compiler error for !CONFIG_BPF_SYSCALL (Kernel Test Robot) * Fix error due to BUILD_BUG_ON on 32-bit platforms (Kernel Test Robot) v2 -> v3 v2: https://lore.kernel.org/bpf/20221013062303.896469-1-memxor@gmail.com * Add ack from Dave for patch 5 * Rename btf_type_fields -> btf_record, btf_type_fields_off -> btf_field_offs, rename functions similarly (Alexei) * Remove 'kind' component from contains declaration tag (Alexei) * Move bpf_list_head, bpf_list_node definitions to UAPI bpf.h (Alexei) * Add note in commit log about modifying btf_struct_access API (Dave) * Downgrade WARN_ON_ONCE to verbose(env, "...") and return -EFAULT (Dave) * Add type_is_local_kptr wrapper to avoid noisy checks (Dave) * Remove unused flags parameter from bpf_kptr_new (Alexei) * Rename bpf_kptr_new -> bpf_obj_new, bpf_kptr_drop -> bpf_obj_drop (Alexei) * Reword comment in ref_obj_id_set_release_on_unlock (Dave) * Fix return type of ref_obj_id_set_release_on_unlock (Dave) * Introduce is_bpf_list_api_kfunc to dedup checks (Dave) * Disallow BPF_WRITE to untrusted local kptrs * Add details about soundness of check_reg_allocation_locked logic * List untrusted local kptrs for PROBE_MEM handling v1 -> v2 v1: https://lore.kernel.org/bpf/20221011012240.3149-1-memxor@gmail.com * Rebase on bpf-next to resolve merge conflict in DENYLIST.s390x * Fix a couple of mental lapses in bpf_list_head_free RFC v1 -> v1 RFC v1: https://lore.kernel.org/bpf/20220904204145.3089-1-memxor@gmail.com * Mostly a complete rewrite of BTF parsing, refactor existing code (Kartikeya) * Rebase kfunc rewrite for bpf-next, add support for more changes * Cache type metadata in BTF to avoid recomputation inside verifier (Kartikeya) * Remove __kernel tag, make things similar to map values, reserve bpf_ prefix * bpf_kptr_new, bpf_kptr_drop * Rename precision state enum values (Alexei) * Drop explicit constructor/destructor support (Alexei) * Rewrite code for constructing/destructing objects and offload to runtime * Minimize duplication in bpf_map_value_off_desc handling (Alexei) * Expose global memory allocator (Alexei) * Address other nits from Alexei * Split out local kptrs in maps, more kptrs in maps support into a follow up Links: ------ * Dave's BPF RB-Tree RFC series v1 (Discussion thread) https://lore.kernel.org/bpf/20220722183438.3319790-1-davemarchevsky@fb.com v2 (With support for static locks) https://lore.kernel.org/bpf/20220830172759.4069786-1-davemarchevsky@fb.com * BPF Linked Lists Discussion https://lore.kernel.org/bpf/CAP01T74U30+yeBHEgmgzTJ-XYxZ0zj71kqCDJtTH9YQNfTK+Xw@mail.gmail.com * BPF Memory Allocator from Alexei https://lore.kernel.org/bpf/20220902211058.60789-1-alexei.starovoitov@gmail.com * BPF Memory Allocator UAPI Discussion https://lore.kernel.org/bpf/d3f76b27f4e55ec9e400ae8dcaecbb702a4932e8.camel@fb.com Kumar Kartikeya Dwivedi (22): bpf: Fix early return in map_check_btf bpf: Do btf_record_free outside map_free callback bpf: Do btf_record_free for outer maps bpf: Populate field_offs for inner_map_meta bpf: Introduce allocated objects support bpf: Recognize lock and list fields in allocated objects bpf: Verify ownership relationships for user BTF types bpf: Allow locking bpf_spin_lock in allocated objects bpf: Allow locking bpf_spin_lock global variables bpf: Allow locking bpf_spin_lock in inner map values bpf: Rewrite kfunc argument handling bpf: Support constant scalar arguments for kfuncs bpf: Introduce bpf_obj_new bpf: Introduce bpf_obj_drop bpf: Permit NULL checking pointer with non-zero fixed offset bpf: Introduce single ownership BPF linked list API bpf: Add 'release on unlock' logic for bpf_list_push_{front,back} selftests/bpf: Add __contains macro to bpf_experimental.h selftests/bpf: Update spinlock selftest selftests/bpf: Add failure test cases for spin lock pairing selftests/bpf: Add BPF linked list API tests selftests/bpf: Add BTF sanity tests Documentation/bpf/kfuncs.rst | 24 + include/linux/bpf.h | 51 +- include/linux/bpf_verifier.h | 25 +- include/linux/btf.h | 67 +- kernel/bpf/arraymap.c | 1 - kernel/bpf/btf.c | 653 ++++----- kernel/bpf/core.c | 16 + kernel/bpf/hashtab.c | 1 - kernel/bpf/helpers.c | 115 +- kernel/bpf/map_in_map.c | 52 +- kernel/bpf/syscall.c | 19 +- kernel/bpf/verifier.c | 1238 +++++++++++++++-- tools/testing/selftests/bpf/DENYLIST.s390x | 1 + .../testing/selftests/bpf/bpf_experimental.h | 68 + .../bpf/prog_tests/kfunc_dynptr_param.c | 2 +- .../selftests/bpf/prog_tests/linked_list.c | 740 ++++++++++ .../selftests/bpf/prog_tests/spin_lock.c | 136 ++ .../selftests/bpf/prog_tests/spinlock.c | 45 - .../testing/selftests/bpf/progs/linked_list.c | 370 +++++ .../testing/selftests/bpf/progs/linked_list.h | 56 + .../selftests/bpf/progs/linked_list_fail.c | 581 ++++++++ .../selftests/bpf/progs/test_spin_lock.c | 4 +- .../selftests/bpf/progs/test_spin_lock_fail.c | 204 +++ tools/testing/selftests/bpf/verifier/calls.c | 2 +- .../selftests/bpf/verifier/ref_tracking.c | 4 +- 25 files changed, 3907 insertions(+), 568 deletions(-) create mode 100644 tools/testing/selftests/bpf/bpf_experimental.h create mode 100644 tools/testing/selftests/bpf/prog_tests/linked_list.c create mode 100644 tools/testing/selftests/bpf/prog_tests/spin_lock.c delete mode 100644 tools/testing/selftests/bpf/prog_tests/spinlock.c create mode 100644 tools/testing/selftests/bpf/progs/linked_list.c create mode 100644 tools/testing/selftests/bpf/progs/linked_list.h create mode 100644 tools/testing/selftests/bpf/progs/linked_list_fail.c create mode 100644 tools/testing/selftests/bpf/progs/test_spin_lock_fail.c base-commit: 383f1a8df8faba88a3bafaddc02f59421bad6829