Skip to content

Commit 3de4d22

Browse files
sjp38borkmann
authored andcommitted
bpf, btf: Warn but return no error for NULL btf from __register_btf_kfunc_id_set()
__register_btf_kfunc_id_set() assumes .BTF to be part of the module's .ko file if CONFIG_DEBUG_INFO_BTF is enabled. If that's not the case, the function prints an error message and return an error. As a result, such modules cannot be loaded. However, the section could be stripped out during a build process. It would be better to let the modules loaded, because their basic functionalities have no problem [0], though the BTF functionalities will not be supported. Make the function to lower the level of the message from error to warn, and return no error. [0] https://lore.kernel.org/bpf/20220219082037.ow2kbq5brktf4f2u@apollo.legion Fixes: c446fda ("bpf: fix register_btf_kfunc_id_set for !CONFIG_DEBUG_INFO_BTF") Reported-by: Alexander Egorenkov <Alexander.Egorenkov@ibm.com> Suggested-by: Kumar Kartikeya Dwivedi <memxor@gmail.com> Signed-off-by: SeongJae Park <sj@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Jiri Olsa <jolsa@kernel.org> Link: https://lore.kernel.org/bpf/87y228q66f.fsf@oc8242746057.ibm.com Link: https://lore.kernel.org/bpf/20220219082037.ow2kbq5brktf4f2u@apollo.legion Link: https://lore.kernel.org/bpf/20230701171447.56464-1-sj@kernel.org
1 parent acd9755 commit 3de4d22

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

kernel/bpf/btf.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7891,10 +7891,8 @@ static int __register_btf_kfunc_id_set(enum btf_kfunc_hook hook,
78917891
pr_err("missing vmlinux BTF, cannot register kfuncs\n");
78927892
return -ENOENT;
78937893
}
7894-
if (kset->owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES)) {
7895-
pr_err("missing module BTF, cannot register kfuncs\n");
7896-
return -ENOENT;
7897-
}
7894+
if (kset->owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES))
7895+
pr_warn("missing module BTF, cannot register kfuncs\n");
78987896
return 0;
78997897
}
79007898
if (IS_ERR(btf))

0 commit comments

Comments
 (0)