* [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss
@ 2020-02-09 18:14 Christophe Leroy
2020-02-15 6:28 ` Leonardo Bras
2020-02-19 12:39 ` Michael Ellerman
0 siblings, 2 replies; 7+ messages in thread
From: Christophe Leroy @ 2020-02-09 18:14 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman
Cc: linuxppc-dev, linux-kernel
In ITLB miss handled the line supposed to clear bits 20-23 on the
L2 ITLB entry is buggy and does indeed nothing, leading to undefined
value which could allow execution when it shouldn't.
Properly do the clearing with the relevant instruction.
Fixes: 74fabcadfd43 ("powerpc/8xx: don't use r12/SPRN_SPRG_SCRATCH2 in TLB Miss handlers")
Cc: stable@vger.kernel.org
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/kernel/head_8xx.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 9922306ae512..073a651787df 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -256,7 +256,7 @@ InstructionTLBMiss:
* set. All other Linux PTE bits control the behavior
* of the MMU.
*/
- rlwimi r10, r10, 0, 0x0f00 /* Clear bits 20-23 */
+ rlwinm r10, r10, 0, ~0x0f00 /* Clear bits 20-23 */
rlwimi r10, r10, 4, 0x0400 /* Copy _PAGE_EXEC into bit 21 */
ori r10, r10, RPN_PATTERN | 0x200 /* Set 22 and 24-27 */
mtspr SPRN_MI_RPN, r10 /* Update TLB entry */
--
2.25.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss
2020-02-09 18:14 [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss Christophe Leroy
@ 2020-02-15 6:28 ` Leonardo Bras
2020-02-15 10:17 ` Christophe Leroy
2020-02-19 12:39 ` Michael Ellerman
1 sibling, 1 reply; 7+ messages in thread
From: Leonardo Bras @ 2020-02-15 6:28 UTC (permalink / raw)
To: Christophe Leroy, Benjamin Herrenschmidt, Paul Mackerras,
Michael Ellerman
Cc: linuxppc-dev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1617 bytes --]
On Sun, 2020-02-09 at 18:14 +0000, Christophe Leroy wrote:
> In ITLB miss handled the line supposed to clear bits 20-23 on the
> L2 ITLB entry is buggy and does indeed nothing, leading to undefined
> value which could allow execution when it shouldn't.
>
> Properly do the clearing with the relevant instruction.
>
> Fixes: 74fabcadfd43 ("powerpc/8xx: don't use r12/SPRN_SPRG_SCRATCH2 in TLB Miss handlers")
> Cc: stable@vger.kernel.org
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
> arch/powerpc/kernel/head_8xx.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
> index 9922306ae512..073a651787df 100644
> --- a/arch/powerpc/kernel/head_8xx.S
> +++ b/arch/powerpc/kernel/head_8xx.S
> @@ -256,7 +256,7 @@ InstructionTLBMiss:
> * set. All other Linux PTE bits control the behavior
> * of the MMU.
> */
> - rlwimi r10, r10, 0, 0x0f00 /* Clear bits 20-23 */
> + rlwinm r10, r10, 0, ~0x0f00 /* Clear bits 20-23 */
> rlwimi r10, r10, 4, 0x0400 /* Copy _PAGE_EXEC into bit 21 */
> ori r10, r10, RPN_PATTERN | 0x200 /* Set 22 and 24-27 */
> mtspr SPRN_MI_RPN, r10 /* Update TLB entry */
Looks a valid change.
rlwimi r10, r10, 0, 0x0f00 means:
r10 = ((r10 << 0) & 0x0f00) | (r10 & ~0x0f00) which ends up being
r10 = r10
On ISA, rlwinm is recommended for clearing high order bits.
rlwinm r10, r10, 0, ~0x0f00 means:
r10 = (r10 << 0) & ~0x0f00
Which does exactly what the comments suggests.
FWIW:
Reviwed-by: Leonardo Bras <leonardo@linux.ibm.com>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss
2020-02-15 6:28 ` Leonardo Bras
@ 2020-02-15 10:17 ` Christophe Leroy
2020-02-17 14:10 ` Leonardo Bras
0 siblings, 1 reply; 7+ messages in thread
From: Christophe Leroy @ 2020-02-15 10:17 UTC (permalink / raw)
To: Leonardo Bras, Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman
Cc: linuxppc-dev, linux-kernel
Le 15/02/2020 à 07:28, Leonardo Bras a écrit :
> On Sun, 2020-02-09 at 18:14 +0000, Christophe Leroy wrote:
>> In ITLB miss handled the line supposed to clear bits 20-23 on the
>> L2 ITLB entry is buggy and does indeed nothing, leading to undefined
>> value which could allow execution when it shouldn't.
>>
>> Properly do the clearing with the relevant instruction.
>>
>> Fixes: 74fabcadfd43 ("powerpc/8xx: don't use r12/SPRN_SPRG_SCRATCH2 in TLB Miss handlers")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
>> ---
>> arch/powerpc/kernel/head_8xx.S | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
>> index 9922306ae512..073a651787df 100644
>> --- a/arch/powerpc/kernel/head_8xx.S
>> +++ b/arch/powerpc/kernel/head_8xx.S
>> @@ -256,7 +256,7 @@ InstructionTLBMiss:
>> * set. All other Linux PTE bits control the behavior
>> * of the MMU.
>> */
>> - rlwimi r10, r10, 0, 0x0f00 /* Clear bits 20-23 */
>> + rlwinm r10, r10, 0, ~0x0f00 /* Clear bits 20-23 */
>> rlwimi r10, r10, 4, 0x0400 /* Copy _PAGE_EXEC into bit 21 */
>> ori r10, r10, RPN_PATTERN | 0x200 /* Set 22 and 24-27 */
>> mtspr SPRN_MI_RPN, r10 /* Update TLB entry */
>
> Looks a valid change.
> rlwimi r10, r10, 0, 0x0f00 means:
> r10 = ((r10 << 0) & 0x0f00) | (r10 & ~0x0f00) which ends up being
> r10 = r10
>
> On ISA, rlwinm is recommended for clearing high order bits.
> rlwinm r10, r10, 0, ~0x0f00 means:
> r10 = (r10 << 0) & ~0x0f00
>
> Which does exactly what the comments suggests.
>
> FWIW:
> Reviwed-by: Leonardo Bras <leonardo@linux.ibm.com>
>
I guess you mean
Reviewed-by: Leonardo Bras <leonardo@linux.ibm.com>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss
2020-02-15 10:17 ` Christophe Leroy
@ 2020-02-17 14:10 ` Leonardo Bras
0 siblings, 0 replies; 7+ messages in thread
From: Leonardo Bras @ 2020-02-17 14:10 UTC (permalink / raw)
To: Christophe Leroy, Benjamin Herrenschmidt, Paul Mackerras,
Michael Ellerman
Cc: linuxppc-dev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2020 bytes --]
On Sat, 2020-02-15 at 11:17 +0100, Christophe Leroy wrote:
>
> Le 15/02/2020 à 07:28, Leonardo Bras a écrit :
> > On Sun, 2020-02-09 at 18:14 +0000, Christophe Leroy wrote:
> > > In ITLB miss handled the line supposed to clear bits 20-23 on the
> > > L2 ITLB entry is buggy and does indeed nothing, leading to undefined
> > > value which could allow execution when it shouldn't.
> > >
> > > Properly do the clearing with the relevant instruction.
> > >
> > > Fixes: 74fabcadfd43 ("powerpc/8xx: don't use r12/SPRN_SPRG_SCRATCH2 in TLB Miss handlers")
> > > Cc: stable@vger.kernel.org
> > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> > > ---
> > > arch/powerpc/kernel/head_8xx.S | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
> > > index 9922306ae512..073a651787df 100644
> > > --- a/arch/powerpc/kernel/head_8xx.S
> > > +++ b/arch/powerpc/kernel/head_8xx.S
> > > @@ -256,7 +256,7 @@ InstructionTLBMiss:
> > > * set. All other Linux PTE bits control the behavior
> > > * of the MMU.
> > > */
> > > - rlwimi r10, r10, 0, 0x0f00 /* Clear bits 20-23 */
> > > + rlwinm r10, r10, 0, ~0x0f00 /* Clear bits 20-23 */
> > > rlwimi r10, r10, 4, 0x0400 /* Copy _PAGE_EXEC into bit 21 */
> > > ori r10, r10, RPN_PATTERN | 0x200 /* Set 22 and 24-27 */
> > > mtspr SPRN_MI_RPN, r10 /* Update TLB entry */
> >
> > Looks a valid change.
> > rlwimi r10, r10, 0, 0x0f00 means:
> > r10 = ((r10 << 0) & 0x0f00) | (r10 & ~0x0f00) which ends up being
> > r10 = r10
> >
> > On ISA, rlwinm is recommended for clearing high order bits.
> > rlwinm r10, r10, 0, ~0x0f00 means:
> > r10 = (r10 << 0) & ~0x0f00
> >
> > Which does exactly what the comments suggests.
> >
> > FWIW:
> > Reviwed-by: Leonardo Bras <leonardo@linux.ibm.com>
> >
>
> I guess you mean
>
> Reviewed-by: Leonardo Bras <leonardo@linux.ibm.com>
Yes, sorry for the typo.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss
2020-02-09 18:14 [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss Christophe Leroy
2020-02-15 6:28 ` Leonardo Bras
@ 2020-02-19 12:39 ` Michael Ellerman
1 sibling, 0 replies; 7+ messages in thread
From: Michael Ellerman @ 2020-02-19 12:39 UTC (permalink / raw)
To: Christophe Leroy, Benjamin Herrenschmidt, Paul Mackerras
Cc: linuxppc-dev, linux-kernel
On Sun, 2020-02-09 at 18:14:42 UTC, Christophe Leroy wrote:
> In ITLB miss handled the line supposed to clear bits 20-23 on the
> L2 ITLB entry is buggy and does indeed nothing, leading to undefined
> value which could allow execution when it shouldn't.
>
> Properly do the clearing with the relevant instruction.
>
> Fixes: 74fabcadfd43 ("powerpc/8xx: don't use r12/SPRN_SPRG_SCRATCH2 in TLB Miss handlers")
> Cc: stable@vger.kernel.org
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Applied to powerpc fixes, thanks.
https://git.kernel.org/powerpc/c/a4031afb9d10d97f4d0285844abbc0ab04245304
cheers
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss
@ 2020-02-11 4:28 Leonardo Bras
2020-02-20 21:53 ` Leonardo Bras
0 siblings, 1 reply; 7+ messages in thread
From: Leonardo Bras @ 2020-02-11 4:28 UTC (permalink / raw)
To: christophe.leroy, benh, paulus, mpe; +Cc: linuxppc-dev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1625 bytes --]
Christophe Leroy <christophe.leroy@c-s.fr> writes:
> In ITLB miss handled the line supposed to clear bits 20-23 on the
> L2 ITLB entry is buggy and does indeed nothing, leading to undefined
> value which could allow execution when it shouldn't.
>
> Properly do the clearing with the relevant instruction.
>
> Fixes: 74fabcadfd43 ("powerpc/8xx: don't use r12/SPRN_SPRG_SCRATCH2 in TLB Miss handlers")
> Cc: stable@vger.kernel.org
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
> arch/powerpc/kernel/head_8xx.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
> index 9922306ae512..073a651787df 100644
> --- a/arch/powerpc/kernel/head_8xx.S
> +++ b/arch/powerpc/kernel/head_8xx.S
> @@ -256,7 +256,7 @@ InstructionTLBMiss:
> * set. All other Linux PTE bits control the behavior
> * of the MMU.
> */
> - rlwimi r10, r10, 0, 0x0f00 /* Clear bits 20-23 */
> + rlwinm r10, r10, 0, ~0x0f00 /* Clear bits 20-23 */
> rlwimi r10, r10, 4, 0x0400 /* Copy _PAGE_EXEC into bit 21 */
> ori r10, r10, RPN_PATTERN | 0x200 /* Set 22 and 24-27 */
> mtspr SPRN_MI_RPN, r10 /* Update TLB entry */
> --
> 2.25.0
Looks a valid change.
rlwimi r10, r10, 0, 0x0f00 means:
r10 = ((r10 << 0) & 0x0f00) | (r10 & ~0x0f00) which ends up being
r10 = r10
On ISA, rlwinm is recommended for clearing high order bits.
rlwinm r10, r10, 0, ~0x0f00 means:
r10 = (r10 << 0) & ~0x0f00
Which does exactly what the comments suggests.
FWIW:
Reviwed-by: Leonardo Bras <leonardo@linux.ibm.com>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss
2020-02-11 4:28 Leonardo Bras
@ 2020-02-20 21:53 ` Leonardo Bras
0 siblings, 0 replies; 7+ messages in thread
From: Leonardo Bras @ 2020-02-20 21:53 UTC (permalink / raw)
To: christophe.leroy, benh, paulus, mpe; +Cc: linuxppc-dev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1203 bytes --]
On Tue, 2020-02-11 at 01:28 -0300, Leonardo Bras wrote:
> Looks a valid change.
> rlwimi r10, r10, 0, 0x0f00 means:
> r10 = ((r10 << 0) & 0x0f00) | (r10 & ~0x0f00) which ends up being
> r10 = r10
>
> On ISA, rlwinm is recommended for clearing high order bits.
> rlwinm r10, r10, 0, ~0x0f00 means:
> r10 = (r10 << 0) & ~0x0f00
>
> Which does exactly what the comments suggests.
>
> FWIW:
> Reviwed-by: Leonardo Bras <leonardo@linux.ibm.com>
Sorry, I just realized the above was not very clear on my part.
What I meant to say was:
I think your change is correct, as it correctly fixes this line.
I would suggest adding the text bellow to your commit message, making
it easier to understand why rlwimi is not the right instruction clear
bytes 20-23, and why rlwinm is.
The current instruction can be translated to C as:
rlwimi r10, r10, 0, 0x0f00
r10 = ((r10 << 0) & 0x0f00) | (r10 & ~0x0f00) ->
r10 = (r10 & 0x0f00) | (r10 & ~0x0f00) ->
r10 = r10
The new proposed instruction can be translated to C as:
rlwinm r10, r10, 0, ~0x0f00 ->
r10 = (r10 << 0) & ~0x0f00
Which clears bits 20-23 as comment on code states.
Best regards,
Leonardo Bras
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-02-20 21:54 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-09 18:14 [PATCH] powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss Christophe Leroy
2020-02-15 6:28 ` Leonardo Bras
2020-02-15 10:17 ` Christophe Leroy
2020-02-17 14:10 ` Leonardo Bras
2020-02-19 12:39 ` Michael Ellerman
2020-02-11 4:28 Leonardo Bras
2020-02-20 21:53 ` Leonardo Bras
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).