Move the fmod_ret targets of the BPF test functions, MPTCP and bpf_testmod from registered kfunc sets to BTF_FMODRET sets. Attachment flags stay the same: bpf_fentry_test1 is still the sleepable target. These functions are no longer kfuncs, so the bpf_kfunc decl tag, and with it the vmlinux.h declaration, is gone. Only bpf_modify_return_test_tp() stays a kfunc, as it is also in the common_btf_ids kfunc set. Selftests which need bpf_fentry_test1 declare it themselves. No code registers an fmod_ret set anymore, as the kernel builds them from BTF. Remove register_btf_fmodret_id_set(), so a module cannot register a second set next to the one from its BTF. Signed-off-by: Anton Protopopov --- include/linux/btf.h | 1 - kernel/bpf/btf.c | 7 ------- net/bpf/test_run.c | 12 +++--------- net/mptcp/bpf.c | 15 ++------------- .../selftests/bpf/test_kmods/bpf_testmod.c | 11 ++--------- 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/include/linux/btf.h b/include/linux/btf.h index 00495e7833b6..5522c7fe1373 100644 --- a/include/linux/btf.h +++ b/include/linux/btf.h @@ -632,7 +632,6 @@ u32 *btf_kfunc_is_modify_return(const struct btf *btf, u32 kfunc_btf_id, const struct bpf_prog *prog); int register_btf_kfunc_id_set(enum bpf_prog_type prog_type, const struct btf_kfunc_id_set *s); -int register_btf_fmodret_id_set(const struct btf_kfunc_id_set *kset); s32 btf_find_dtor_kfunc(struct btf *btf, u32 btf_id); int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_cnt, struct module *owner); diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 2c45e5fa1d7b..f81a8ae9b92c 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -10294,13 +10294,6 @@ static int __init btf_fmodret_tags_init(void) } fs_initcall(btf_fmodret_tags_init); -/* This function must be invoked only from initcalls/module init functions */ -int register_btf_fmodret_id_set(const struct btf_kfunc_id_set *kset) -{ - return __register_btf_kfunc_id_set(BTF_KFUNC_HOOK_FMODRET, kset); -} -EXPORT_SYMBOL_GPL(register_btf_fmodret_id_set); - s32 btf_find_dtor_kfunc(struct btf *btf, u32 btf_id) { struct btf_id_dtor_kfunc_tab *tab = btf->dtor_kfunc_tab; diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index d6c9dc62182e..d63c3b697552 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -643,17 +643,12 @@ CFI_NOSEAL(bpf_kfunc_call_memb_release_dtor); __bpf_kfunc_end_defs(); -BTF_KFUNCS_START(bpf_test_modify_return_ids) +BTF_FMODRET_START(bpf_test_modify_return_ids) BTF_ID_FLAGS(func, bpf_modify_return_test) BTF_ID_FLAGS(func, bpf_modify_return_test2) BTF_ID_FLAGS(func, bpf_modify_return_test_tp) BTF_ID_FLAGS(func, bpf_fentry_test1, KF_SLEEPABLE) -BTF_KFUNCS_END(bpf_test_modify_return_ids) - -static const struct btf_kfunc_id_set bpf_test_modify_return_set = { - .owner = THIS_MODULE, - .set = &bpf_test_modify_return_ids, -}; +BTF_FMODRET_END(bpf_test_modify_return_ids) BTF_KFUNCS_START(test_sk_check_kfunc_ids) BTF_ID_FLAGS(func, bpf_kfunc_call_test_release, KF_RELEASE) @@ -1905,8 +1900,7 @@ static int __init bpf_prog_test_run_init(void) }; int ret; - ret = register_btf_fmodret_id_set(&bpf_test_modify_return_set); - ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &bpf_prog_test_kfunc_set); + ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &bpf_prog_test_kfunc_set); ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &bpf_prog_test_kfunc_set); ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SYSCALL, &bpf_prog_test_kfunc_set); return ret ?: register_btf_id_dtor_kfuncs(bpf_prog_test_dtor_kfunc, diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 4cc16cbeb328..d0d489624689 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -20,17 +20,6 @@ struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk) return NULL; } -BTF_SET8_START(bpf_mptcp_fmodret_ids) +BTF_FMODRET_START(bpf_mptcp_fmodret_ids) BTF_ID_FLAGS(func, update_socket_protocol) -BTF_SET8_END(bpf_mptcp_fmodret_ids) - -static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = { - .owner = THIS_MODULE, - .set = &bpf_mptcp_fmodret_ids, -}; - -static int __init bpf_mptcp_kfunc_init(void) -{ - return register_btf_fmodret_id_set(&bpf_mptcp_fmodret_set); -} -late_initcall(bpf_mptcp_kfunc_init); +BTF_FMODRET_END(bpf_mptcp_fmodret_ids) diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c index 41ff36f0ca77..91cb311a2dc8 100644 --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c @@ -2607,15 +2607,9 @@ struct bpf_struct_ops testmod_multi_st_ops = { extern int bpf_fentry_test1(int a); -BTF_KFUNCS_START(bpf_testmod_trampoline_count_ids) +BTF_FMODRET_START(bpf_testmod_trampoline_count_ids) BTF_ID_FLAGS(func, bpf_testmod_trampoline_count_test) -BTF_KFUNCS_END(bpf_testmod_trampoline_count_ids) - -static const struct -btf_kfunc_id_set bpf_testmod_trampoline_count_fmodret_set = { - .owner = THIS_MODULE, - .set = &bpf_testmod_trampoline_count_ids, -}; +BTF_FMODRET_END(bpf_testmod_trampoline_count_ids) static int bpf_testmod_init(void) { @@ -2633,7 +2627,6 @@ static int bpf_testmod_init(void) ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING, &bpf_testmod_kfunc_set); ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SYSCALL, &bpf_testmod_kfunc_set); ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS, &bpf_testmod_kfunc_set); - ret = ret ?: register_btf_fmodret_id_set(&bpf_testmod_trampoline_count_fmodret_set); ret = ret ?: register_bpf_struct_ops(&bpf_bpf_testmod_ops, bpf_testmod_ops); ret = ret ?: register_bpf_struct_ops(&bpf_testmod_ops2, bpf_testmod_ops2); ret = ret ?: register_bpf_struct_ops(&bpf_testmod_ops3, bpf_testmod_ops3); -- 2.43.0