2019-06-11 16:42:55

by Christophe Leroy

[permalink] [raw]
Subject: [PATCH] powerpc/32s: fix initial setup of segment registers on secondary CPU

The patch referenced below moved the loading of segment registers
out of load_up_mmu() in order to do it earlier in the boot sequence.
However, the secondary CPU still needs it to be done when loading up
the MMU.

Reported-by: Erhard F. <[email protected]>
Fixes: 215b823707ce ("powerpc/32s: set up an early static hash table for KASAN")
Signed-off-by: Christophe Leroy <[email protected]>
---
arch/powerpc/kernel/head_32.S | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 1d5f1bd0dacd..f255e22184b4 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -752,6 +752,7 @@ __secondary_start:
stw r0,0(r3)

/* load up the MMU */
+ bl load_segment_registers
bl load_up_mmu

/* ptr to phys current thread */
--
2.13.3


2019-06-11 17:04:44

by Christophe Leroy

[permalink] [raw]
Subject: Re: [PATCH] powerpc/32s: fix initial setup of segment registers on secondary CPU



Le 11/06/2019 à 17:47, Christophe Leroy a écrit :
> The patch referenced below moved the loading of segment registers
> out of load_up_mmu() in order to do it earlier in the boot sequence.
> However, the secondary CPU still needs it to be done when loading up
> the MMU.
>
> Reported-by: Erhard F. <[email protected]>
> Fixes: 215b823707ce ("powerpc/32s: set up an early static hash table for KASAN")

Cc: [email protected]

> Signed-off-by: Christophe Leroy <[email protected]>
> ---
> arch/powerpc/kernel/head_32.S | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
> index 1d5f1bd0dacd..f255e22184b4 100644
> --- a/arch/powerpc/kernel/head_32.S
> +++ b/arch/powerpc/kernel/head_32.S
> @@ -752,6 +752,7 @@ __secondary_start:
> stw r0,0(r3)
>
> /* load up the MMU */
> + bl load_segment_registers
> bl load_up_mmu
>
> /* ptr to phys current thread */
>

2019-06-16 12:24:28

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc/32s: fix initial setup of segment registers on secondary CPU

On Tue, 2019-06-11 at 15:47:20 UTC, Christophe Leroy wrote:
> The patch referenced below moved the loading of segment registers
> out of load_up_mmu() in order to do it earlier in the boot sequence.
> However, the secondary CPU still needs it to be done when loading up
> the MMU.
>
> Reported-by: Erhard F. <[email protected]>
> Fixes: 215b823707ce ("powerpc/32s: set up an early static hash table for KASAN")
> Signed-off-by: Christophe Leroy <[email protected]>

Applied to powerpc fixes, thanks.

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

cheers

2019-06-18 12:32:04

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc/32s: fix initial setup of segment registers on secondary CPU

Christophe Leroy <[email protected]> writes:
> Le 11/06/2019 à 17:47, Christophe Leroy a écrit :
>> The patch referenced below moved the loading of segment registers
>> out of load_up_mmu() in order to do it earlier in the boot sequence.
>> However, the secondary CPU still needs it to be done when loading up
>> the MMU.
>>
>> Reported-by: Erhard F. <[email protected]>
>> Fixes: 215b823707ce ("powerpc/32s: set up an early static hash table for KASAN")
>
> Cc: [email protected]

Sorry patchwork didn't pick that up and I missed it. The AUTOSEL bot
will probably pick it up anyway though.

cheers

>> diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
>> index 1d5f1bd0dacd..f255e22184b4 100644
>> --- a/arch/powerpc/kernel/head_32.S
>> +++ b/arch/powerpc/kernel/head_32.S
>> @@ -752,6 +752,7 @@ __secondary_start:
>> stw r0,0(r3)
>>
>> /* load up the MMU */
>> + bl load_segment_registers
>> bl load_up_mmu
>>
>> /* ptr to phys current thread */
>>

2019-06-18 12:45:50

by Christophe Leroy

[permalink] [raw]
Subject: Re: [PATCH] powerpc/32s: fix initial setup of segment registers on secondary CPU



Le 18/06/2019 à 14:31, Michael Ellerman a écrit :
> Christophe Leroy <[email protected]> writes:
>> Le 11/06/2019 à 17:47, Christophe Leroy a écrit :
>>> The patch referenced below moved the loading of segment registers
>>> out of load_up_mmu() in order to do it earlier in the boot sequence.
>>> However, the secondary CPU still needs it to be done when loading up
>>> the MMU.
>>>
>>> Reported-by: Erhard F. <[email protected]>
>>> Fixes: 215b823707ce ("powerpc/32s: set up an early static hash table for KASAN")
>>
>> Cc: [email protected]
>
> Sorry patchwork didn't pick that up and I missed it. The AUTOSEL bot
> will probably pick it up anyway though.

Don't worry, this was unneeded because we added KASAN in 5.2.
My mistake.
Christophe

>
> cheers
>
>>> diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
>>> index 1d5f1bd0dacd..f255e22184b4 100644
>>> --- a/arch/powerpc/kernel/head_32.S
>>> +++ b/arch/powerpc/kernel/head_32.S
>>> @@ -752,6 +752,7 @@ __secondary_start:
>>> stw r0,0(r3)
>>>
>>> /* load up the MMU */
>>> + bl load_segment_registers
>>> bl load_up_mmu
>>>
>>> /* ptr to phys current thread */
>>>