[PATCH bpf-next v4 02/10] bpf: Remove DEFINE_KFUNC_BTF_ID_SET
From: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Date: 2021-12-17 01:50:44
Also in:
bpf, netfilter-devel
Subsystem:
bpf [btf], bpf [general] (safe dynamic programs and tools), bpf [selftests] (test runners & infrastructure), kernel selftest framework, networking [general], networking [tcp], the rest · Maintainers:
Martin KaFai Lau, Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Shuah Khan, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Neal Cardwell, Linus Torvalds
The only reason to keep it was to initialize list head, but future commits will introduce more members that need to be set, which is more convenient to do using designated initializer. Hence, remove the macro, convert users, and initialize list head inside register_kfunc_btf_id_set. Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com> --- include/linux/btf.h | 5 ----- kernel/bpf/btf.c | 1 + net/ipv4/tcp_bbr.c | 5 ++++- net/ipv4/tcp_cubic.c | 5 ++++- net/ipv4/tcp_dctcp.c | 5 ++++- tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c | 5 ++++- 6 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/include/linux/btf.h b/include/linux/btf.h
index 916da2efbea8..5fefa6c2e62c 100644
--- a/include/linux/btf.h
+++ b/include/linux/btf.h@@ -370,9 +370,4 @@ static struct kfunc_btf_id_list bpf_tcp_ca_kfunc_list __maybe_unused; static struct kfunc_btf_id_list prog_test_kfunc_list __maybe_unused; #endif -#define DEFINE_KFUNC_BTF_ID_SET(set, name) \ - struct kfunc_btf_id_set name = { LIST_HEAD_INIT(name.list), \ - { { (set) } }, \ - THIS_MODULE } - #endif
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 97f6729cf23c..575c6a344096 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c@@ -6369,6 +6369,7 @@ BTF_TRACING_TYPE_xxx void register_kfunc_btf_id_set(struct kfunc_btf_id_list *l, struct kfunc_btf_id_set *s) { + INIT_LIST_HEAD(&s->list); mutex_lock(&l->mutex); list_add(&s->list, &l->list); mutex_unlock(&l->mutex);
diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c
index ec5550089b4d..280dada5d1ae 100644
--- a/net/ipv4/tcp_bbr.c
+++ b/net/ipv4/tcp_bbr.c@@ -1169,7 +1169,10 @@ BTF_ID(func, bbr_set_state) #endif BTF_SET_END(tcp_bbr_kfunc_ids) -static DEFINE_KFUNC_BTF_ID_SET(&tcp_bbr_kfunc_ids, tcp_bbr_kfunc_btf_set); +static struct kfunc_btf_id_set tcp_bbr_kfunc_btf_set = { + .owner = THIS_MODULE, + .set = &tcp_bbr_kfunc_ids, +}; static int __init bbr_register(void) {
diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
index e07837e23b3f..b7e60f0ed42a 100644
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c@@ -498,7 +498,10 @@ BTF_ID(func, cubictcp_acked) #endif BTF_SET_END(tcp_cubic_kfunc_ids) -static DEFINE_KFUNC_BTF_ID_SET(&tcp_cubic_kfunc_ids, tcp_cubic_kfunc_btf_set); +static struct kfunc_btf_id_set tcp_cubic_kfunc_btf_set = { + .owner = THIS_MODULE, + .set = &tcp_cubic_kfunc_ids, +}; static int __init cubictcp_register(void) {
diff --git a/net/ipv4/tcp_dctcp.c b/net/ipv4/tcp_dctcp.c
index 0d7ab3cc7b61..ac2a47eb89d8 100644
--- a/net/ipv4/tcp_dctcp.c
+++ b/net/ipv4/tcp_dctcp.c@@ -251,7 +251,10 @@ BTF_ID(func, dctcp_state) #endif BTF_SET_END(tcp_dctcp_kfunc_ids) -static DEFINE_KFUNC_BTF_ID_SET(&tcp_dctcp_kfunc_ids, tcp_dctcp_kfunc_btf_set); +static struct kfunc_btf_id_set tcp_dctcp_kfunc_btf_set = { + .owner = THIS_MODULE, + .set = &tcp_dctcp_kfunc_ids, +}; static int __init dctcp_register(void) {
diff --git a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c
index 5d52ea2768df..a437086e1860 100644
--- a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c
+++ b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c@@ -93,7 +93,10 @@ BTF_SET_START(bpf_testmod_kfunc_ids) BTF_ID(func, bpf_testmod_test_mod_kfunc) BTF_SET_END(bpf_testmod_kfunc_ids) -static DEFINE_KFUNC_BTF_ID_SET(&bpf_testmod_kfunc_ids, bpf_testmod_kfunc_btf_set); +static struct kfunc_btf_id_set bpf_testmod_kfunc_btf_set = { + .owner = THIS_MODULE, + .set = &bpf_testmod_kfunc_ids, +}; static int bpf_testmod_init(void) {
--
2.34.1