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/[email protected] Fixes: c446fda ("bpf: fix register_btf_kfunc_id_set for !CONFIG_DEBUG_INFO_BTF") Reported-by: Alexander Egorenkov <[email protected]> Suggested-by: Kumar Kartikeya Dwivedi <[email protected]> Signed-off-by: SeongJae Park <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Acked-by: Jiri Olsa <[email protected]> Link: https://lore.kernel.org/bpf/[email protected] Link: https://lore.kernel.org/bpf/[email protected] Link: https://lore.kernel.org/bpf/[email protected]
1 parent acd9755 commit 3de4d22

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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)