[PATCH 00/14] powerpc/64: fast interrupt exits · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 01/14] powerpc: remove interrupt exit helpers unused argument · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
Re: [PATCH 01/14] powerpc: remove interrupt exit helpers unused argument · Christophe Leroy <hidden> · 2021-05-17
[PATCH 02/14] powerpc/64s: security fallback improvement · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 04/14] powerpc/64s: avoid reloading (H)SRR registers if they are still valid · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
Re: [PATCH 04/14] powerpc/64s: avoid reloading (H)SRR registers if they are still valid · Michael Ellerman <mpe@ellerman.id.au> · 2021-04-02
Re: [PATCH 04/14] powerpc/64s: avoid reloading (H)SRR registers if they are still valid · Nicholas Piggin <npiggin@gmail.com> · 2021-04-04
Re: [PATCH 04/14] powerpc/64s: avoid reloading (H)SRR registers if they are still valid · Michael Ellerman <mpe@ellerman.id.au> · 2021-04-03
Re: [PATCH 04/14] powerpc/64s: avoid reloading (H)SRR registers if they are still valid · Nicholas Piggin <npiggin@gmail.com> · 2021-04-04
[PATCH 03/14] powerpc/64s: introduce different functions to return from SRR vs HSRR interrupts · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 05/14] powerpc/64: move interrupt return asm to interrupt_64.S · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 06/14] powerpc/64s: save one more register in the masked interrupt handler · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 07/14] powerpc/64: allow alternate return locations for soft-masked interrupts · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 08/14] powerpc/64: interrupt soft-enable race fix · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 09/14] powerpc/64: treat low kernel text as irqs soft-masked · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 10/14] powerpc/64: use interrupt restart table to speed up return from interrupt · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
Re: [PATCH 10/14] powerpc/64: use interrupt restart table to speed up return from interrupt · Christophe Leroy <hidden> · 2021-03-16
Re: [PATCH 10/14] powerpc/64: use interrupt restart table to speed up return from interrupt · Nicholas Piggin <npiggin@gmail.com> · 2021-03-16
[PATCH 11/14] powerpc/64e: Remove PPR from pt_regs · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 12/14] powerpc/64s: system call avoid setting MSR[RI] until we set MSR[EE] · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
Re: [PATCH 12/14] powerpc/64s: system call avoid setting MSR[RI] until we set MSR[EE] · Christophe Leroy <hidden> · 2021-03-16
Re: [PATCH 12/14] powerpc/64s: system call avoid setting MSR[RI] until we set MSR[EE] · Nicholas Piggin <npiggin@gmail.com> · 2021-03-16
Re: [PATCH 12/14] powerpc/64s: system call avoid setting MSR[RI] until we set MSR[EE] · Michael Ellerman <mpe@ellerman.id.au> · 2021-03-19
[PATCH 13/14] powerpc/64: handle MSR EE and RI in interrupt entry wrapper · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
[PATCH 14/14] powerpc/64s: use the same default PPR for user and kernel · Nicholas Piggin <npiggin@gmail.com> · 2021-03-15
Re: [PATCH 14/14] powerpc/64s: use the same default PPR for user and kernel · Christophe Leroy <hidden> · 2021-05-17

Re: [PATCH 12/14] powerpc/64s: system call avoid setting MSR[RI] until we set MSR[EE]

From: Christophe Leroy <hidden>
Date: 2021-03-16 07:22:25


Le 15/03/2021 à 23:04, Nicholas Piggin a écrit :

This extends the MSR[RI]=0 window a little further into the system
call in order to pair RI and EE enabling with a single mtmsrd.

Time ago, I proposed to delay that on PPC32 and Michael objected, see 
https://patchwork.ozlabs.org/project/linuxppc-dev/patch/9f9dd859d571e324c7412ed9db9da8cfba678257.1548956511.git.christophe.leroy@c-s.fr/

quoted hunk ↗ jump to hunk

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
  arch/powerpc/kernel/exceptions-64s.S | 2 --
  arch/powerpc/kernel/interrupt_64.S   | 6 +++---
  2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index bd0c82ac9de5..2f14ac3c377c 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S

@@ -1999,8 +1999,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
  	mtctr	r10
  	bctr
  	.else
-	li	r10,MSR_RI
-	mtmsrd 	r10,1			/* Set RI (EE=0) */
  #ifdef CONFIG_RELOCATABLE
  	__LOAD_HANDLER(r10, system_call_common)
  	mtctr	r10

diff --git a/arch/powerpc/kernel/interrupt_64.S b/arch/powerpc/kernel/interrupt_64.S
index f28f41a1a85a..eef61800f734 100644
--- a/arch/powerpc/kernel/interrupt_64.S
+++ b/arch/powerpc/kernel/interrupt_64.S

@@ -311,10 +311,10 @@ END_BTB_FLUSH_SECTION
  	 * nothing pending. system_call_exception() will call
  	 * trace_hardirqs_off().
  	 */
-	li	r11,IRQS_ALL_DISABLED
-	li	r12,PACA_IRQ_HARD_DIS
+	li	r11,IRQS_DISABLED
+	li	r12,-1 /* Set MSR_EE and MSR_RI */
  	stb	r11,PACAIRQSOFTMASK(r13)
-	stb	r12,PACAIRQHAPPENED(r13)
+	mtmsrd	r12,1
  
  	ENTER_KERNEL_SECURITY_FALLBACK

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help