[PATCH] powerpc/mm/radix: Do slb preload only with hash translation mode

[PATCH] powerpc/mm/radix: Do slb preload only with hash translation mode

[Aneesh Kumar K.V]

Add radix_enabled check to avoid slb preload with radix translation.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
---

Without this we result in kernel crash as we move hash related variables
out of mm_context_t

 arch/powerpc/kernel/process.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index dd9e0d5386ee..f7b2e3b3db28 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1729,7 +1729,8 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
 	unsigned long load_addr = regs->gpr[2];	/* saved by ELF_PLAT_INIT */
 
 #ifdef CONFIG_PPC_BOOK3S_64
-	preload_new_slb_context(start, sp);
+	if (!radix_enabled())
+		preload_new_slb_context(start, sp);
 #endif
 #endif
 
-- 
2.20.1

Re: [PATCH] powerpc/mm/radix: Do slb preload only with hash translation mode

[Nicholas Piggin]

Aneesh Kumar K.V's on April 9, 2019 2:03 pm:
> Add radix_enabled check to avoid slb preload with radix translation.
> 
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>

Acked-by: Nicholas Piggin <npiggin@gmail.com>

> ---
> 
> Without this we result in kernel crash as we move hash related variables
> out of mm_context_t
> 
>  arch/powerpc/kernel/process.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
> index dd9e0d5386ee..f7b2e3b3db28 100644
> --- a/arch/powerpc/kernel/process.c
> +++ b/arch/powerpc/kernel/process.c
> @@ -1729,7 +1729,8 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
>  	unsigned long load_addr = regs->gpr[2];	/* saved by ELF_PLAT_INIT */
>  
>  #ifdef CONFIG_PPC_BOOK3S_64
> -	preload_new_slb_context(start, sp);
> +	if (!radix_enabled())
> +		preload_new_slb_context(start, sp);
>  #endif
>  #endif
>  
> -- 
> 2.20.1
> 
> 

Re: powerpc/mm/radix: Do slb preload only with hash translation mode

[Michael Ellerman]

On Tue, 2019-04-09 at 04:03:28 UTC, "Aneesh Kumar K.V" wrote:
> Add radix_enabled check to avoid slb preload with radix translation.
> 
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> Acked-by: Nicholas Piggin <npiggin@gmail.com>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/f89bd8ba834e392ff614a7be9ee68c56

cheers