bpf: fix warning for crash_kexec
Subsystems (3)
PATCH v2 1/1 bpf: fix warning for crash_kexec
With [1], crash dump specific code is moved out of CONFIG_KEXEC_CORE and placed under CONFIG_CRASH_DUMP, where it is more appropriate. And since CONFIG_KEXEC & !CONFIG_CRASH_DUMP build option is supported with that, it led to the below warning:
"WARN: resolve_btfids: unresolved symbol crash_kexec"
Fix it by using the appropriate #ifdef.
[1] https://lore.kernel.org/all/[email protected]/
---
Changes in v2:
* Updated changelog.
* Added Fixes and Acked-by tags.
kernel/bpf/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/helpers.c +1 -1
@@ -2548,7 +2548,7 @@ __bpf_kfunc void bpf_throw(u64 cookie)__bpf_kfunc_end_defs (); BTF_KFUNCS_START(generic_btf_ids) -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_CRASH_DUMP BTF_ID_FLAGS(func, crash_kexec, KF_DESTRUCTIVE)#endif BTF_ID_FLAGS (func, bpf_obj_new_impl,KF_ACQUIRE |KF_RET_NULL )
Signature · 1 line
2.44.0
Quoted 6 lines · Hari Bathini
With [1], crash dump specific code is moved out of
CONFIG_KEXEC_COREand placed underCONFIG_CRASH_DUMP, where it is more appropriate. And sinceCONFIG_KEXEC& !CONFIG_CRASH_DUMP build option is supported with that, it led to the below warning:
Quoted 8 lines
"WARN:
resolve_btfids: unresolved symbolcrash_kexec"Fix it by using the appropriate #ifdef.
[1] https://lore.kernel.org/all/[email protected]/
Acked-by Baoquan He <[email protected]>Fixes 29fd9ae62910 ("crash: split crash dumping code out from kexec_core.c")
I don't think either bpf or bpf-next have this commit just yet, so landing it in the bpf/bpf-next tree doesn't make much sense. It probably would be best to land it through the tree which does the CONFIG_KEXEC_CORE -> CONFIG_CRASH_DUMP change in kernel/Makefile.
pw-bot: cr
Quoted 29 lines
Acked-by Jiri Olsa <[email protected]>Signed-off-by Hari Bathini <[email protected]>---
Changes in v2:
* Updated changelog.
* Added Fixes and Acked-by tags.kernel/bpf/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/bpf/helpers.c +1
-2@@ -2548,7 +2548,7 @@ __bpf_kfunc void bpf_throw(u64 cookie)__bpf_kfunc_end_defs (); BTF_KFUNCS_START(generic_btf_ids) -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_CRASH_DUMP BTF_ID_FLAGS(func, crash_kexec, KF_DESTRUCTIVE)#endif BTF_ID_FLAGS (func, bpf_obj_new_impl,KF_ACQUIRE |KF_RET_NULL ) --2.44.0
Yonghong Song
reviewerQuoted 10 lines · Andrii Nakryiko
Quoted 9 lines · Hari Bathini
With [1], crash dump specific code is moved out of
CONFIG_KEXEC_COREand placed underCONFIG_CRASH_DUMP, where it is more appropriate. And sinceCONFIG_KEXEC& !CONFIG_CRASH_DUMP build option is supported with that, it led to the below warning:"WARN:
resolve_btfids: unresolved symbolcrash_kexec"Fix it by using the appropriate #ifdef.
Quoted 8 lines
Quoted 4 lines
[1] https://lore.kernel.org/all/[email protected]/
Acked-by Baoquan He <[email protected]>Fixes 29fd9ae62910 ("crash: split crash dumping code out from kexec_core.c")I don't think either bpf or bpf-next have this commit just yet, so landing it in the bpf/bpf-next tree doesn't make much sense. It probably would be best to land it through the tree which does the
CONFIG_KEXEC_CORE->CONFIG_CRASH_DUMPchange in kernel/Makefile.
With bpf-next, I found the config at kernel/Kconfig.kexec:
config CRASH_DUMP
bool "kernel crash dumps"
depends on ARCH_SUPPORTS_CRASH_DUMP
select CRASH_CORE
select KEXEC_CORE
help
...
Quoted 31 lines
pw-bot: cr
Quoted 29 lines
Acked-by Jiri Olsa <[email protected]>Signed-off-by Hari Bathini <[email protected]>---
Changes in v2:
* Updated changelog.
* Added Fixes and Acked-by tags.kernel/bpf/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/bpf/helpers.c +1
-2@@ -2548,7 +2548,7 @@ __bpf_kfunc void bpf_throw(u64 cookie)__bpf_kfunc_end_defs (); BTF_KFUNCS_START(generic_btf_ids) -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_CRASH_DUMP BTF_ID_FLAGS(func, crash_kexec, KF_DESTRUCTIVE)#endif BTF_ID_FLAGS (func, bpf_obj_new_impl,KF_ACQUIRE |KF_RET_NULL ) --2.44.0
Quoted 13 lines · Andrii Nakryiko
Quoted 12 lines · Hari Bathini
With [1], crash dump specific code is moved out of
CONFIG_KEXEC_COREand placed underCONFIG_CRASH_DUMP, where it is more appropriate. And sinceCONFIG_KEXEC& !CONFIG_CRASH_DUMP build option is supported with that, it led to the below warning:"WARN:
resolve_btfids: unresolved symbolcrash_kexec"Fix it by using the appropriate #ifdef.
Quoted 7 lines
Quoted 2 lines
Acked-by Baoquan He <[email protected]>Fixes 29fd9ae62910 ("crash: split crash dumping code out from kexec_core.c")I don't think either bpf or bpf-next have this commit just yet, so landing it in the bpf/bpf-next tree doesn't make much sense. It probably would be best to land it through the tree which does the
CONFIG_KEXEC_CORE->CONFIG_CRASH_DUMPchange in kernel/Makefile.
Yeah, [1] patches were still not in bpf-next when I sent this v2. Andrew, can you please consider pulling this via -mm tree if that sounds more appropriate?
Thanks
Hari
Quoted 31 lines
pw-bot: cr
Quoted 29 lines
Acked-by Jiri Olsa <[email protected]>Signed-off-by Hari Bathini <[email protected]>---
Changes in v2:
* Updated changelog.
* Added Fixes and Acked-by tags.kernel/bpf/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/bpf/helpers.c +1
-2@@ -2548,7 +2548,7 @@ __bpf_kfunc void bpf_throw(u64 cookie)__bpf_kfunc_end_defs (); BTF_KFUNCS_START(generic_btf_ids) -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_CRASH_DUMP BTF_ID_FLAGS(func, crash_kexec, KF_DESTRUCTIVE)#endif BTF_ID_FLAGS (func, bpf_obj_new_impl,KF_ACQUIRE |KF_RET_NULL ) --2.44.0