Hyperion Entertainment Message Boards

Code: Select all

This is a note to let you know that I've just added the patch titled

    powerpc/64s: Fix KVM interrupt using wrong save area

to the 5.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     powerpc-64s-fix-kvm-interrupt-using-wrong-save-area.patch
and it can be found in the queue-5.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 0bdcfa182506526fbe4e088ff9ca86a31b81828d Mon Sep 17 00:00:00 2001
From: Nicholas Piggin <[email protected]>
Date: Mon, 15 Jun 2020 16:12:47 +1000
Subject: powerpc/64s: Fix KVM interrupt using wrong save area

From: Nicholas Piggin <[email protected]>

commit 0bdcfa182506526fbe4e088ff9ca86a31b81828d upstream.

The CTR register reload in the KVM interrupt path used the wrong save
area for SLB (and NMI) interrupts.

Fixes: 9600f261acaa ("powerpc/64s/exception: Move KVM test to common code")
Cc: [email protected] # v5.7+
Reported-by: Christian Zigotzky <[email protected]>
Signed-off-by: Nicholas Piggin <[email protected]>
Tested-by: Christian Zigotzky <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 arch/powerpc/kernel/exceptions-64s.S |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -270,7 +270,7 @@ BEGIN_FTR_SECTION
 END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
 	.endif
 
-	ld	r10,PACA_EXGEN+EX_CTR(r13)
+	ld	r10,IAREA+EX_CTR(r13)
 	mtctr	r10
 BEGIN_FTR_SECTION
 	ld	r10,IAREA+EX_PPR(r13)
@@ -298,7 +298,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
 
 	.if IKVM_SKIP
 89:	mtocrf	0x80,r9
-	ld	r10,PACA_EXGEN+EX_CTR(r13)
+	ld	r10,IAREA+EX_CTR(r13)
 	mtctr	r10
 	ld	r9,IAREA+EX_R9(r13)
 	ld	r10,IAREA+EX_R10(r13)


Patches currently in stable-queue which might be from [email protected] are

queue-5.7/powerpc-64s-kuap-add-missing-isync-to-kuap-restore-p.patch
queue-5.7/powerpc-64s-exceptions-machine-check-reconcile-irq-s.patch
queue-5.7/powerpc-64s-fix-kvm-interrupt-using-wrong-save-area.patch
queue-5.7/powerpc-book3s64-radix-tlb-determine-hugepage-flush-.patch
queue-5.7/powerpc-64s-exception-fix-machine-check-no-loss-idle.patch
queue-5.7/powerpc-pseries-ras-fix-fwnmi_valid-off-by-one.patch