From: Kui-Feng Lee <thinker.li@xxxxxxxxx>
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 v15:
- Fix the misleading commit message of part 4.
- Introduce BPF_F_VTYPE_BTF_OBJ_FD flag to struct bpf_attr to tell
if value_type_btf_obj_fd is set or not.
- Introduce links_cnt to struct bpf_struct_ops_map to avoid accessing
struct bpf_struct_ops_desc in bpf_struct_ops_map_put_progs() after
calling module_put() against the owner module of the struct_ops
type. (Part 9)
Changes from v14:
- Rebase. Add cif_stub required by
the commit 2cd3e3772e413 ("x86/cfi,bpf: Fix bpf_struct_ops CFI")
- Remove creating struct_ops map without bpf_testmod.ko from the
test.
- Check the name of btf returned by bpf_map_info by getting the name
with bpf_btf_get_info_by_fd().
- Change value_type_btf_obj_fd to a signed type to allow the 0 fd.
Changes from v13:
- Change the test case to use bpf_map_create() to create a struct_ops
map while testmod.ko is unloaded.
- Move bpf_struct_ops_find*() to btf.c.
- Use btf_is_module() to replace btf != btf_vmlinux.
Changes from v12:
- Rebase to for-next to fix conflictions.
Changes from v11:
- bpf_struct_ops_maps hold only the refcnt to the module, but not
btf. (patch 1)
- Fix warning messages. (patch 1, 9 and 10)
- Remove unnecessary conditional compiling of CONFIG_BPF_JIT.
(patch 4, 9 and 10)
- Fix the commit log of the patch 7 to explain how a btf is pass from
the user space and how the kernel handle it.
- bpf_struct_ops_maps hold the module defining it's type, but not
btf. A map will hold the module through its life-span from
allocating to being free. (patch 8)
- Change selftests and tracing __bpf_struct_ops_map_free() to wait
for the release of the bpf_testmod module.
- Include btf_obj_id in bpf_map_info. (patch 14)
Changes from v10:
- Guard btf.c from CONFIG_BPF_JIT=n. This patchset has introduced
symbols from bpf_struct_ops.c which is only built when
CONFIG_BPF_JIT=y.
- Fix the warning of unused errout_free label by moving code that is
leaked to patch 8 to patch 7.
Changes from v9:
- Remove the call_rcu_tasks_trace() changes from kern_sync_rcu().
- Trace btf_put() in the test case to ensure the release of kmod's
btf, or the consequent tests may fail for using kmod's unloaded old
btf instead the new one created after loading again. The kmod's btf
may live for awhile after unloading the kmod, for a map being freed
asynchronized is still holding the btf.
- Split "add struct_ops_tab to btf" into tow patches by adding
"make struct_ops_map support btfs other than btf_vmlinux".
- Flip the order of "pass attached BTF to the bpf_struct_ops
subsystem" and "hold module for bpf_struct_ops_map" to make it more
reasonable.
- Fix the compile errors of a missing header file.
Changes from v8:
- Rename bpf_struct_ops_init_one() to bpf_struct_ops_desc_init().
- Move code that using BTF_ID_LIST to the newly added patch 2.
- Move code that lookup struct_ops types from a given module to the
newly added patch 5.
- Store the pointers of btf at st_maps.
- Add test cases for the cases of modules being unload.
- Call bpf_struct_ops_init() in btf_add_struct_ops() to fix an
inconsistent issue.
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.
---
v15: https://lore.kernel.org/all/20231220222654.1435895-1-thinker.li@xxxxxxxxx/
v14: https://lore.kernel.org/all/20231217081132.1025020-1-thinker.li@xxxxxxxxx/
v13: https://lore.kernel.org/all/20231209002709.535966-1-thinker.li@xxxxxxxxx/
v12: https://lore.kernel.org/all/20231207013950.1689269-1-thinker.li@xxxxxxxxx/
v11: https://lore.kernel.org/all/20231106201252.1568931-1-thinker.li@xxxxxxxxx/
v10: https://lore.kernel.org/all/20231103232202.3664407-1-thinker.li@xxxxxxxxx/
v9: https://lore.kernel.org/all/20231101204519.677870-1-thinker.li@xxxxxxxxx/
v8: https://lore.kernel.org/all/20231030192810.382942-1-thinker.li@xxxxxxxxx/
v7: https://lore.kernel.org/all/20231027211702.1374597-1-thinker.li@xxxxxxxxx/
v6: https://lore.kernel.org/all/20231022050335.2579051-11-thinker.li@xxxxxxxxx/
v5: https://lore.kernel.org/all/20231017162306.176586-1-thinker.li@xxxxxxxxx/
v4: https://lore.kernel.org/all/20231013224304.187218-1-thinker.li@xxxxxxxxx/
v3: https://lore.kernel.org/all/20230920155923.151136-1-thinker.li@xxxxxxxxx/
v2: https://lore.kernel.org/all/20230913061449.1918219-1-thinker.li@xxxxxxxxx/
Kui-Feng Lee (14):
bpf: refactory struct_ops type initialization to a function.
bpf: get type information with BTF_ID_LIST
bpf, net: introduce bpf_struct_ops_desc.
bpf: add struct_ops_tab to btf.
bpf: make struct_ops_map support btfs other than btf_vmlinux.
bpf: pass btf object id in bpf_map_info.
bpf: lookup struct_ops types from a given module BTF.
bpf: pass attached BTF to the bpf_struct_ops subsystem
bpf: hold module refcnt in bpf_struct_ops map creation and prog
verification.
bpf: validate value_type
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 | 59 ++-
include/linux/bpf_verifier.h | 1 +
include/linux/btf.h | 15 +
include/uapi/linux/bpf.h | 10 +-
kernel/bpf/bpf_struct_ops.c | 433 +++++++++---------
kernel/bpf/bpf_struct_ops_types.h | 12 -
kernel/bpf/btf.c | 148 +++++-
kernel/bpf/syscall.c | 4 +-
kernel/bpf/verifier.c | 25 +-
net/bpf/bpf_dummy_struct_ops.c | 22 +-
net/ipv4/bpf_tcp_ca.c | 20 +-
tools/include/uapi/linux/bpf.h | 10 +-
tools/lib/bpf/bpf.c | 4 +-
tools/lib/bpf/bpf.h | 4 +-
tools/lib/bpf/libbpf.c | 41 +-
tools/lib/bpf/libbpf_probes.c | 1 +
.../selftests/bpf/bpf_testmod/bpf_testmod.c | 66 +++
.../selftests/bpf/bpf_testmod/bpf_testmod.h | 5 +
.../bpf/prog_tests/test_struct_ops_module.c | 75 +++
.../selftests/bpf/progs/struct_ops_module.c | 30 ++
20 files changed, 726 insertions(+), 259 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
--
2.34.1
