* [PATCH] powerpc/32s: fix boot failure with DEBUG_PAGEALLOC without KASAN.
@ 2019-08-14 5:28 Christophe Leroy
2019-08-14 5:37 ` Christoph Hellwig
2019-08-14 7:44 ` Jonathan Neuschäfer
0 siblings, 2 replies; 3+ messages in thread
From: Christophe Leroy @ 2019-08-14 5:28 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman, j.neuschaefer
Cc: linuxppc-dev, linux-kernel
When KASAN is selected, the definitive hash table has to be
set up later, but there is already an early temporary one.
When KASAN is not selected, there is no early hash table,
so the setup of the definitive hash table cannot be delayed.
Reported-by: Jonathan Neuschafer <j.neuschaefer@gmx.net>
Fixes: 72f208c6a8f7 ("powerpc/32s: move hash code patching out of MMU_init_hw()")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/kernel/head_32.S | 2 ++
arch/powerpc/mm/book3s32/mmu.c | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index f255e22184b4..c8b4f7ed318c 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -897,9 +897,11 @@ start_here:
bl machine_init
bl __save_cpu_setup
bl MMU_init
+#ifdef CONFIG_KASAN
BEGIN_MMU_FTR_SECTION
bl MMU_init_hw_patch
END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE)
+#endif
/*
* Go back to running unmapped so we can load up new values
diff --git a/arch/powerpc/mm/book3s32/mmu.c b/arch/powerpc/mm/book3s32/mmu.c
index e249fbf6b9c3..6ddcbfad5c9e 100644
--- a/arch/powerpc/mm/book3s32/mmu.c
+++ b/arch/powerpc/mm/book3s32/mmu.c
@@ -358,6 +358,11 @@ void __init MMU_init_hw(void)
hash_mb2 = hash_mb = 32 - LG_HPTEG_SIZE - lg_n_hpteg;
if (lg_n_hpteg > 16)
hash_mb2 = 16 - LG_HPTEG_SIZE;
+
+ if (IS_ENABLED(CONFIG_KASAN))
+ return;
+
+ MMU_init_hw_patch();
}
void __init MMU_init_hw_patch(void)
--
2.13.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] powerpc/32s: fix boot failure with DEBUG_PAGEALLOC without KASAN.
2019-08-14 5:28 [PATCH] powerpc/32s: fix boot failure with DEBUG_PAGEALLOC without KASAN Christophe Leroy
@ 2019-08-14 5:37 ` Christoph Hellwig
2019-08-14 7:44 ` Jonathan Neuschäfer
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2019-08-14 5:37 UTC (permalink / raw)
To: Christophe Leroy
Cc: j.neuschaefer, linux-kernel, Paul Mackerras, linuxppc-dev
On Wed, Aug 14, 2019 at 05:28:35AM +0000, Christophe Leroy wrote:
> When KASAN is selected, the definitive hash table has to be
> set up later, but there is already an early temporary one.
>
> When KASAN is not selected, there is no early hash table,
> so the setup of the definitive hash table cannot be delayed.
I think you also want to add this information to the code itself
as comments..
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] powerpc/32s: fix boot failure with DEBUG_PAGEALLOC without KASAN.
2019-08-14 5:28 [PATCH] powerpc/32s: fix boot failure with DEBUG_PAGEALLOC without KASAN Christophe Leroy
2019-08-14 5:37 ` Christoph Hellwig
@ 2019-08-14 7:44 ` Jonathan Neuschäfer
1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Neuschäfer @ 2019-08-14 7:44 UTC (permalink / raw)
To: Christophe Leroy
Cc: j.neuschaefer, linux-kernel, Paul Mackerras, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 661 bytes --]
On Wed, Aug 14, 2019 at 05:28:35AM +0000, Christophe Leroy wrote:
> When KASAN is selected, the definitive hash table has to be
> set up later, but there is already an early temporary one.
>
> When KASAN is not selected, there is no early hash table,
> so the setup of the definitive hash table cannot be delayed.
>
> Reported-by: Jonathan Neuschafer <j.neuschaefer@gmx.net>
> Fixes: 72f208c6a8f7 ("powerpc/32s: move hash code patching out of MMU_init_hw()")
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
Thanks. This does fix the DEBUG_PAGEALLOC-without-KASAN case.
Tested-by: Jonathan Neuschafer <j.neuschaefer@gmx.net>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-14 7:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-14 5:28 [PATCH] powerpc/32s: fix boot failure with DEBUG_PAGEALLOC without KASAN Christophe Leroy
2019-08-14 5:37 ` Christoph Hellwig
2019-08-14 7:44 ` Jonathan Neuschäfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).