bpf, btf: Add DEBUG_INFO_BTF checks for __register_bpf_struct_ops
Subsystems (2)
Geliang Tang
reviewerv5 cover bpf, btf: Add DEBUG_INFO_BTF checks for __register_bpf_struct_ops
From: Geliang Tang <[email protected]>
v5:
- drop CONFIG_MODULE_ALLOW_BTF_MISMATCH check as Martin suggested.
v4:
- add a new patch to fix error checks for btf_get_module_btf.
- rename the helper to check_btf_kconfigs.
v3:
- fix this build error:kernel/bpf/btf.c:7750:11: error: incomplete definition of type 'struct module'
v2:
- add register_check_missing_btf helper as Jiri suggested.
Geliang Tang (3):
bpf, btf: Fix return value of register_btf_id_dtor_kfuncs bpf, btf: Add check_btf_kconfigs helper
bpf, btf: Check btf for register_bpf_struct_ops
kernel/bpf/btf.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-)
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v5 1/3 bpf, btf: Fix return value of register_btf_id_dtor_kfuncs
From: Geliang Tang <[email protected]>
The same as __register_btf_kfunc_id_set(), to let the modules with stripped btf section loaded, this patch changes the return value of register_btf_id_dtor_kfuncs() too from -ENOENT to 0 when btf is NULL.
--- kernel/bpf/btf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/bpf/btf.c +2 -4
@@ -8219,10 +8219,8 @@ int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_cpr_err ("missing vmlinux BTF, cannot register dtor kfuncs\n" );return -ENOENT ; } -if (owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) { -pr_err ("missing module BTF, cannot register dtor kfuncs\n" ); -return -ENOENT ; - } +if (owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) +pr_warn ("missing module BTF, cannot register dtor kfuncs\n" );return 0 ; }if (IS_ERR (btf))
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v5 2/3 bpf, btf: Add check_btf_kconfigs helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch extracts duplicate code on error path when btf_get_module_btf() returns NULL from the functions __register_btf_kfunc_id_set() and register_btf_id_dtor_kfuncs() into a new helper named check_btf_kconfigs() to check CONFIG_DEBUG_INFO_BTF and CONFIG_DEBUG_INFO_BTF_MODULES in it.
--- kernel/bpf/btf.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
kernel/bpf/btf.c +15 -18
@@ -7738,6 +7738,17 @@ static struct btf *btf_get_module_btf(const struct module *module)return btf; } +static int check_btf_kconfigs (const struct module *module) +{ +if (!module &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) { +pr_err ("missing vmlinux BTF, cannot register kfuncs\n" ); +return -ENOENT ; + } +if (module &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) +pr_warn ("missing module BTF, cannot register kfuncs\n" ); +return 0 ; +} + BPF_CALL_4(bpf_btf_find_by_name_kind, char *, name, int, name_sz, u32, kind, int, flags) {struct btf *btf =NULL ;
@@ -8098,15 +8109,8 @@ static int __register_btf_kfunc_id_set(enum btf_kfunc_hook hook,int ret, i; btf =btf_get_module_btf (kset->owner); -if (!btf) { -if (!kset->owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) { -pr_err ("missing vmlinux BTF, cannot register kfuncs\n" ); -return -ENOENT ; - } -if (kset->owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) -pr_warn ("missing module BTF, cannot register kfuncs\n" ); -return 0 ; - } +if (!btf) +return check_btf_kconfigs (kset->owner);if (IS_ERR (btf))return PTR_ERR (btf);
@@ -8214,15 +8218,8 @@ int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_cint ret; btf =btf_get_module_btf (owner); -if (!btf) { -if (!owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) { -pr_err ("missing vmlinux BTF, cannot register dtor kfuncs\n" ); -return -ENOENT ; - } -if (owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) -pr_warn ("missing module BTF, cannot register dtor kfuncs\n" ); -return 0 ; - } +if (!btf) +return check_btf_kconfigs (owner);if (IS_ERR (btf))return PTR_ERR (btf);
Signature · 1 line
2.40.1
Re: [PATCH bpf-next v5 2/3] bpf, btf: Add check_btf_kconfigs helper
Quoted 53 lines · Geliang Tang
From: Geliang Tang <[email protected]>
This patch extracts duplicate code on error path when
btf_get_module_btf()returns NULL from the functions__register_btf_kfunc_id_set()andregister_btf_id_dtor_kfuncs()into a new helper namedcheck_btf_kconfigs()to checkCONFIG_DEBUG_INFO_BTFandCONFIG_DEBUG_INFO_BTF_MODULESin it.Signed-off-by Geliang Tang <[email protected]>--- kernel/bpf/btf.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)kernel/bpf/btf.c +13
-9@@ -7738,6 +7738,17 @@ static struct btf *btf_get_module_btf(const struct module *module)return btf; } +static int check_btf_kconfigs (const struct module *module) +{ +if (!module &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) { +pr_err ("missing vmlinux BTF, cannot register kfuncs\n" ); +return -ENOENT ; + } +if (module &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) +pr_warn ("missing module BTF, cannot register kfuncs\n" ); +return 0 ; +} + BPF_CALL_4(bpf_btf_find_by_name_kind, char *, name, int, name_sz, u32, kind, int, flags) {struct btf *btf =NULL ;@@ -8098,15 +8109,8 @@ static int __register_btf_kfunc_id_set(enum btf_kfunc_hook hook,int ret, i; btf =btf_get_module_btf (kset->owner); -if (!btf) { -if (!kset->owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) { -pr_err ("missing vmlinux BTF, cannot register kfuncs\n" ); -return -ENOENT ; - } -if (kset->owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) -pr_warn ("missing module BTF, cannot register kfuncs\n" ); -return 0 ; - } +if (!btf) +return check_btf_kconfigs (kset->owner);if (IS_ERR (btf))return PTR_ERR (btf);
kernel/bpf/btf.c int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_c · line 8223
Quoted 10 lines
kernel/bpf/btf.c +0
-7@@ -8214,15 +8218,8 @@ int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_cint ret; btf =btf_get_module_btf (owner); -if (!btf) { -if (!owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) { -pr_err ("missing vmlinux BTF, cannot register dtor kfuncs\n" ); -return -ENOENT ; - } -if (owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) -pr_warn ("missing module BTF, cannot register dtor kfuncs\n" );
nit, we do lose the 'dtor' from the message but I think it's ok, for the patchset:
jirka
Quoted 10 lines
kernel/bpf/btf.c +2
-2-return 0 ; - } +if (!btf) +return check_btf_kconfigs (owner);if (IS_ERR (btf))return PTR_ERR (btf);Signature · 1 line
2.40.1
Martin KaFai Lau
reviewerRe: [PATCH bpf-next v5 2/3] bpf, btf: Add check_btf_kconfigs helper
Quoted 35 lines · Jiri Olsa
Quoted 35 lines
kernel/bpf/btf.c +13
-9+static int check_btf_kconfigs (const struct module *module) +{ +if (!module &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) { +pr_err ("missing vmlinux BTF, cannot register kfuncs\n" ); +return -ENOENT ; + } +if (module &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) +pr_warn ("missing module BTF, cannot register kfuncs\n" ); +return 0 ; +} + BPF_CALL_4(bpf_btf_find_by_name_kind, char *, name, int, name_sz, u32, kind, int, flags) {struct btf *btf =NULL ;@@ -8098,15 +8109,8 @@ static int __register_btf_kfunc_id_set(enum btf_kfunc_hook hook,int ret, i; btf =btf_get_module_btf (kset->owner); -if (!btf) { -if (!kset->owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) { -pr_err ("missing vmlinux BTF, cannot register kfuncs\n" ); -return -ENOENT ; - } -if (kset->owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) -pr_warn ("missing module BTF, cannot register kfuncs\n" ); -return 0 ; - } +if (!btf) +return check_btf_kconfigs (kset->owner);if (IS_ERR (btf))return PTR_ERR (btf);@@ -8214,15 +8218,8 @@ int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_cint ret;
Quoted 10 lines
kernel/bpf/btf.c int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_c · line 8223
Quoted 8 lines
kernel/bpf/btf.c +0
-7btf =btf_get_module_btf (owner); -if (!btf) { -if (!owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF )) { -pr_err ("missing vmlinux BTF, cannot register dtor kfuncs\n" ); -return -ENOENT ; - } -if (owner &&IS_ENABLED (CONFIG_DEBUG_INFO_BTF_MODULES )) -pr_warn ("missing module BTF, cannot register dtor kfuncs\n" );nit, we do lose the 'dtor' from the message but I think it's ok, for the patchset:
I added "const char *feature" argument to check_btf_kconfigs(), so it is like check_btf_kconfigs(, "kfunc"), check_btf_kconfigs(, "dtor kfunc"), and check_btf_kconfigs(, "struct_ops"). Applied. Thanks.
Geliang Tang
reviewerPATCH v5 3/3 bpf, btf: Check btf for register_bpf_struct_ops
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Similar to the handling in the functions __register_btf_kfunc_id_set() and register_btf_id_dtor_kfuncs(), this patch uses the newly added helper check_btf_kconfigs() and IS_ERR() to check the return value of btf_get_module_btf().
--- kernel/bpf/btf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/bpf/btf.c +3 -1
@@ -8882,7 +8882,9 @@ int __register_bpf_struct_ops(struct bpf_struct_ops *st_ops) btf =btf_get_module_btf (st_ops->owner);if (!btf) -return -EINVAL ; +return check_btf_kconfigs (st_ops->owner); +if (IS_ERR (btf)) +return PTR_ERR (btf); log =kzalloc (sizeof (*log),GFP_KERNEL | __GFP_NOWARN);if (!log) {
Signature · 1 line
2.40.1
Re: bpf, btf: Check btf for register_bpf_struct_ops: Tests Results
Hi Geliang,
Thank you for your modifications, that's great!
Our CI (GitHub Action) did some validations and here is its report:
- KVM Validation: normal:
- Unstable: 2 failed test(s): packetdrill_regressions selftest_mptcp_join 🔴:
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/7825836847
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/0a74337f9112
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normalFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
Re: bpf, btf: Check btf for register_bpf_struct_ops: Tests Results
In reply to Geliang TangHi Geliang,
Thank you for your modifications, that's great!
Our CI (Cirrus) did some validations with a debug kernel and here is its report:
- KVM Validation: debug (except selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/4767446159065088
- Summary: https://api.cirrus-ci.com/v1/artifact/task/4767446159065088/summary/summary.txt
- KVM Validation: debug (only selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/5893346065907712
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5893346065907712/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/0a74337f9112
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debugFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
Re: bpf, btf: Check btf for register_bpf_struct_ops: Tests Results
In reply to Geliang TangHi Geliang,
Thank you for your modifications, that's great!
Our CI (GitHub Action) did some validations and here is its report:
- KVM Validation: normal:
- Success! ✅:
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/7828113236
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/95e0e3a258c6
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normalFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
Re: bpf, btf: Check btf for register_bpf_struct_ops: Tests Results
In reply to Geliang TangHi Geliang,
Thank you for your modifications, that's great!
Our CI (Cirrus) did some validations with a debug kernel and here is its report:
- KVM Validation: debug (except selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/6339634976784384
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6339634976784384/summary/summary.txt
- KVM Validation: debug (only selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/4932260093231104
- Summary: https://api.cirrus-ci.com/v1/artifact/task/4932260093231104/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/95e0e3a258c6
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debugFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Quoted 10 lines · On Thu, 8 Feb 2024 14:24:20 +0800 you wrote:
From: Geliang Tang <[email protected]>
v5:
- dropCONFIG_MODULE_ALLOW_BTF_MISMATCHcheck as Martin suggested.v4:
- add a new patch to fix error checks forbtf_get_module_btf.
- rename the helper tocheck_btf_kconfigs.[...]
Here is the summary with links:
- [bpf-next,v5,1/3] bpf, btf: Fix return value of register_btf_id_dtor_kfuncs
https://git.kernel.org/bpf/bpf-next/c/b9a395f0f7af - [bpf-next,v5,2/3] bpf, btf: Add check_btf_kconfigs helper https://git.kernel.org/bpf/bpf-next/c/9e60b0e02550 - [bpf-next,v5,3/3] bpf, btf: Check btf for register_bpf_struct_ops https://git.kernel.org/bpf/bpf-next/c/947e56f82fd7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html