powerpc64/kasan: Call kasan_early_init() after PACA initialised
PATCH 1/1 powerpc64/kasan: Call kasan_early_init() after PACA initialised
The KCOV handler __sanitizer_cov_trace_pc() uses the PACA, so initialise the PACA first. This fixes a hang during boot when KASAN and KCOV are both enabled, where the coverage tracer in kasan_early_init() tries to access a field of the (currently null) PACA.
---
I tried annotating kasan_early_init() with 'notrace', but it still seemed to hang. It would also be less robust, because kasan_early_init() may in future call generic code that should keep coverage.
--- arch/powerpc/kernel/head_64.S | 3 --- arch/powerpc/kernel/setup_64.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-)
arch/powerpc/kernel/head_64.S +0 -3
@@ -1004,9 +1004,6 @@ start_here_multiplatform: * and SLB setup before we turn on relocation. */ -#ifdef CONFIG_KASAN - bl CFUNC(kasan_early_init) -#endif /* Restore parameters passed from prom_init/kexec */ mr r3,r31 LOAD_REG_ADDR(r12, DOTSYM(early_setup))
arch/powerpc/kernel/setup_64.c +4 -0
@@ -369,6 +369,10 @@ void __init early_setup(unsigned long dt_ptr)/* -------- printk is now safe to use ------- */ +#ifdef CONFIG_KASAN +kasan_early_init (); +#endif +if (IS_ENABLED (CONFIG_PPC_BOOK3S_64 ) && (mfmsr () &MSR_HV ))enable_machine_check ();
Signature · 1 line
2.41.0
The inclusion of kasan_early_init() is conditional on CONFIG_KASAN, so
if(IS_ENABLED(CONFIG_KASAN))
kasan_early_init();wouldn't work.
Le 07/07/2023 à 03:31, Benjamin Gray a écrit :
Quoted 4 lines
The KCOV handler
__sanitizer_cov_trace_pc()uses the PACA, so initialise the PACA first. This fixes a hang during boot when KASAN and KCOV are both enabled, where the coverage tracer inkasan_early_init()tries to access a field of the (currently null) PACA.
mm/kasan/Makefile has KCOV_INSTRUMENT := n
Should we add the same in arch/powerpc/mm/kasan/Makefile to be consistent ?
Quoted 32 lines
Signed-off-by Benjamin Gray <[email protected]>---
I tried annotating
kasan_early_init()with 'notrace', but it still seemed to hang. It would also be less robust, becausekasan_early_init()may in future call generic code that should keep coverage.--- arch/powerpc/kernel/head_64.S | 3 --- arch/powerpc/kernel/setup_64.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-)arch/powerpc/kernel/head_64.S +0
-3@@ -1004,9 +1004,6 @@ start_here_multiplatform: * and SLB setup before we turn on relocation. */ -#ifdef CONFIG_KASAN - bl CFUNC(kasan_early_init) -#endif /* Restore parameters passed from prom_init/kexec */ mr r3,r31 LOAD_REG_ADDR(r12, DOTSYM(early_setup))arch/powerpc/kernel/setup_64.c +0
-0
arch/powerpc/kernel/setup_64.c void __init early_setup(unsigned long dt_ptr) · line 374
Quoted 6 lines
arch/powerpc/kernel/setup_64.c +3
-0@@ -369,6 +369,10 @@ void __init early_setup(unsigned long dt_ptr)/* -------- printk is now safe to use ------- */ +#ifdef CONFIG_KASAN +kasan_early_init (); +#endif
Don't #ifdef
In arch/powerpc/include/asm/kasan.h add a stub for kasan_early_init() just like already done for kasan_init(), kasan_mmu_init() and kasan_late_init().
Quoted 4 lines
arch/powerpc/kernel/setup_64.c +1
-0+if (IS_ENABLED (CONFIG_PPC_BOOK3S_64 ) && (mfmsr () &MSR_HV ))enable_machine_check ();
Le 07/07/2023 à 04:20, Benjamin Gray a écrit :
Quoted 6 lines
The inclusion of
kasan_early_init()is conditional onCONFIG_KASAN, soif(IS_ENABLED(CONFIG_KASAN)) kasan_early_init();wouldn't work.
See my comment on the main patch, just do like kasan_init() and others in arch/powerpc/include/asm/kasan.h : Define a stub for when CONFIG_KASAN is not selected.