From patchwork Mon Oct 30 19:28:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kui-Feng Lee X-Patchwork-Id: 13440822 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 2D2331A27C for ; Mon, 30 Oct 2023 19:28:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GNlCBVDn" Received: from mail-yw1-x112d.google.com (mail-yw1-x112d.google.com [IPv6:2607:f8b0:4864:20::112d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE3F2C9 for ; Mon, 30 Oct 2023 12:28:15 -0700 (PDT) Received: by mail-yw1-x112d.google.com with SMTP id 00721157ae682-5a7c7262d5eso46197927b3.1 for ; Mon, 30 Oct 2023 12:28:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698694094; x=1699298894; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=yhiJwrzQndFOeuhFHjzJXO+HqfmGIz8fUJ8R0nMTQbU=; b=GNlCBVDn6K+ldjoFIhYkKZoB8ks7AJ8ZJNbztLxf4clJFlSV/NSBFlSTNJfS4EVYzp KGOGl33DoqtmYxdEeejrE7a2BtVe9H/SQyr1Y5JwZisDwZBDRoQYcE2V2nqzRo5Ar6Y3 fcSkJz7nF6WYqoT4hAKqh5WpZVSMZt4hN2xOeRhofSR2g9Jl4wIh3WgdCVJkxxd52bIo +9eJ4zR0nAuIDhOQEaAHHua8ivUurHvqFMQO/kx/cN7TxU/Db5c0EGNj9MK0g1E4xpt9 gCVlhigr6IE2dVaR9AtwLZ9jbf/YJgP4ibnGHNCCecHn298IBnExPWP/Og/qGSb4+kej ghzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698694094; x=1699298894; 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=yhiJwrzQndFOeuhFHjzJXO+HqfmGIz8fUJ8R0nMTQbU=; b=rCCAwQvG8YS3Gl06NmPyveH7nPlzi3kaKcMzgG2We3uyQqnaTh94Vy6Ro5l1nryrxb nmjduUAfiBGDqXpN7JmlSn2l6BiCgu1XAmGmQcabp6em4uSHB7ANvLL3NuOzSkLjV7C7 PVudmBpWhO2IMY7acpaEZ+PCF6Xe1x1RyeONkobZTd8qkkNXPJGp/vafiv/mz/qO6hYp zCi6eNSrAz5YAbHSljp8yU1i45YFk++WuqHuGXnE/wHrAc62V6KMhYPBrPe0996s6p8Y 0pF59HClu1lkpk35eryQRWlXm8GUHColJ8VV63gA8Q/rWnMC1ojVQZnBJr27oUPDWQXS FXtw== X-Gm-Message-State: AOJu0YzL+1pY3b3QqVmpYYqWuJfB3T3ikmSx3XhxVV+/kzLJyzTl2Z6p yYYwHh8P8CXdN0KRYzzFKKgEMFltPto= X-Google-Smtp-Source: AGHT+IHBdfoJ+7fiJhcqfYynnFbyrhsObiiomX1CrytKckrCyST2RoMsUU8BKcrY+yRUSzP1jaE13g== X-Received: by 2002:a81:4c8e:0:b0:5a5:798:4f0b with SMTP id z136-20020a814c8e000000b005a507984f0bmr8736321ywa.52.1698694094333; Mon, 30 Oct 2023 12:28:14 -0700 (PDT) Received: from kickker.attlocal.net ([2600:1700:6cf8:1240:5b04:e8d1:ce5:8164]) by smtp.gmail.com with ESMTPSA id n12-20020a819c4c000000b005b03d703564sm35821ywa.137.2023.10.30.12.28.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 12:28:13 -0700 (PDT) From: thinker.li@gmail.com To: bpf@vger.kernel.org, ast@kernel.org, martin.lau@linux.dev, song@kernel.org, kernel-team@meta.com, andrii@kernel.org, drosen@google.com Cc: sinquersw@gmail.com, kuifeng@meta.com, Kui-Feng Lee Subject: [PATCH bpf-next v8 00/10] Registrating struct_ops types from modules Date: Mon, 30 Oct 2023 12:28:00 -0700 Message-Id: <20231030192810.382942-1-thinker.li@gmail.com> 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-Patchwork-Delegate: bpf@iogearbox.net From: Kui-Feng Lee Given the current constraints of the current implementation, struct_ops cannot be registered dynamically. This presents a significant limitation for modules like coming fuse-bpf, which seeks to implement a new struct_ops type. To address this issue, a new API is introduced that allows the registration of new struct_ops types from modules. Previously, struct_ops types were defined in bpf_struct_ops_types.h and collected as a static array. The new API lets callers add new struct_ops types dynamically. The static array has been removed and replaced by the per-btf struct_ops_tab. The struct_ops subsystem relies on BTF to determine the layout of values in a struct_ops map and identify the subsystem that the struct_ops map registers to. However, the kernel BTF does not include the type information of struct_ops types defined by a module. The struct_ops subsystem requires knowledge of the corresponding module for a given struct_ops map and the utilization of BTF information from that module. We empower libbpf to determine the correct module for accessing the BTF information and pass an identity (FD) of the module btf to the kernel. The kernel looks up type information and registered struct_ops types directly from the given btf. If a module exits while one or more struct_ops maps still refer to a struct_ops type defined by the module, it can lead to unforeseen complications. Therefore, it is crucial to ensure that a module remains intact as long as any struct_ops map is still linked to a struct_ops type defined by the module. To achieve this, every struct_ops map holds a reference to the module while being registered. Changes from v7: - Fix check_struct_ops_btf_id() to use attach btf if there is instead of btf_vmlinux. Changes from v6: - Change returned error code to -EINVAL for the case of bpf_try_get_module(). - Return an error code from bpf_struct_ops_init(). - Fix the dependency issue of testing_helpers.c and rcu_tasks_trace_gp.skel.h. Changes from v5: - As the 2nd patch, we introduce "bpf_struct_ops_desc". This change involves moving certain members of "bpf_struct_ops" to "bpf_struct_ops_desc", which becomes a part of "btf_struct_ops_tab". This ensures that these members remain accessible even when the owner module of a "bpf_struct_ops" is unloaded. - Correct the order of arguments when calling in the 3rd patch. - Remove the owner argument from bpf_struct_ops_init_one(). Instead, callers should fill in st_ops->owner. - Make sure to hold the owner module when calling bpf_struct_ops_find() and bpf_struct_ops_find_value() in the 6th patch. - Merge the functions register_bpf_struct_ops_btf() and register_bpf_struct_ops() into a single function and relocate it to btf.c for better organization and clarity. - Undo the name modifications made to find_kernel_btf_id() and find_ksym_btf_id() in the 8th patch. Changes from v4: - Fix the dependency between testing_helpers.o and rcu_tasks_trace_gp.skel.h. Changes from v3: - Fix according to the feedback for v3. - Change of the order of arguments to make btf as the first argument. - Use btf_try_get_module() instead of try_get_module() since the module pointed by st_ops->owner can gone while some one is still holding its btf. - Move variables defined by BPF_STRUCT_OPS_COMMON_VALUE to struct bpf_struct_ops_common_value to validation easier. - Register the struct_ops type defined by bpf_testmod in its init function. - Rename field name to 'value_type_btf_obj_fd' to make it explicit. - Fix leaking of btf objects on error. - st_maps hold their modules to keep modules alive and prevent they from unloading. - bpf_map of libbpf keeps mod_btf_fd instead of a pointer to module_btf. - Do call_rcu_tasks_trace() in kern_sync_rcu() to ensure the bpf_testmod is unloaded properly. It uses rcu_tasks_trace_gp to trigger call_rcu_tasks_trace() in the kernel. - Merge and reorder patches in a reasonable order. Changes from v2: - Remove struct_ops array, and add a per-btf (module) struct_ops_tab to collect registered struct_ops types. - Validate value_type by checking member names and types. --- v7: https://lore.kernel.org/all/20231027211702.1374597-1-thinker.li@gmail.com/ v6: https://lore.kernel.org/all/20231022050335.2579051-11-thinker.li@gmail.com/ v5: https://lore.kernel.org/all/20231017162306.176586-1-thinker.li@gmail.com/ v4: https://lore.kernel.org/all/20231013224304.187218-1-thinker.li@gmail.com/ v3: https://lore.kernel.org/all/20230920155923.151136-1-thinker.li@gmail.com/ v2: https://lore.kernel.org/all/20230913061449.1918219-1-thinker.li@gmail.com/ Kui-Feng Lee (10): bpf: refactory struct_ops type initialization to a function. bpf, net: introduce bpf_struct_ops_desc. bpf: add struct_ops_tab to btf. bpf: hold module for bpf_struct_ops_map. bpf: validate value_type bpf: pass attached BTF to the bpf_struct_ops subsystem bpf, net: switch to dynamic registration libbpf: Find correct module BTFs for struct_ops maps and progs. bpf: export btf_ctx_access to modules. selftests/bpf: test case for register_bpf_struct_ops(). include/linux/bpf.h | 51 +- include/linux/bpf_verifier.h | 1 + include/linux/btf.h | 9 + include/uapi/linux/bpf.h | 5 + kernel/bpf/bpf_struct_ops.c | 435 ++++++++++-------- kernel/bpf/bpf_struct_ops_types.h | 12 - kernel/bpf/btf.c | 113 ++++- kernel/bpf/syscall.c | 2 +- kernel/bpf/verifier.c | 25 +- net/bpf/bpf_dummy_struct_ops.c | 23 +- net/ipv4/bpf_tcp_ca.c | 24 +- tools/include/uapi/linux/bpf.h | 5 + tools/lib/bpf/bpf.c | 4 +- tools/lib/bpf/bpf.h | 5 +- tools/lib/bpf/libbpf.c | 50 +- tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/bpf_testmod/bpf_testmod.c | 59 +++ .../selftests/bpf/bpf_testmod/bpf_testmod.h | 5 + .../bpf/prog_tests/test_struct_ops_module.c | 39 ++ .../selftests/bpf/progs/struct_ops_module.c | 30 ++ tools/testing/selftests/bpf/testing_helpers.c | 35 ++ 21 files changed, 697 insertions(+), 239 deletions(-) delete mode 100644 kernel/bpf/bpf_struct_ops_types.h create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_module.c