KVM: PPC: Book3E HV: call SOFT_DISABLE_INTS to sync the software state

We enter with interrupts disabled in hardware, but we need to call SOFT_DISABLE_INTS anyway to ensure that the software state is kept in sync instead of calling hard_irq_disable() directly.

Signed-off-by Tiejun Chen <[email protected]>

---

arch/powerpc/kvm/booke.c              |   11 -----------
arch/powerpc/kvm/bookehv_interrupts.S |   10 ++++++++++
2 files changed, 10 insertions(+), 11 deletions(-)

arch/powerpc/kvm/booke.c +0 -11

index 17722d8..7653c9c 100644
@@ -833,17 +833,6 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
 	int s;
 	int idx;
 
-#ifdef CONFIG_PPC64
-	WARN_ON(local_paca->irq_happened != 0);
-#endif
-
-	/*
-	 * We enter with interrupts disabled in hardware, but
-	 * we need to call hard_irq_disable anyway to ensure that
-	 * the software state is kept in sync.
-	 */
-	hard_irq_disable();
-
 	/* update before a new last_exit_type is rewritten */
 	kvmppc_update_timing_stats(vcpu);
 

arch/powerpc/kvm/bookehv_interrupts.S +10 -0

index e8ed7d6..4deaf2e 100644
@@ -33,6 +33,8 @@
 
 #ifdef CONFIG_64BIT
 #include <asm/exception-64e.h>
+#include <asm/hw_irq.h>
+#include <asm/irqflags.h>
 #else
 #include "../kernel/head_booke.h" /* for THREAD_NORMSAVE() */
 #endif

@@ -465,6 +467,14 @@ _GLOBAL(kvmppc_resume_host)
 	mtspr	SPRN_EPCR, r3
 	isync
 
+#ifdef CONFIG_64BIT
+	/*
+	 * We enter with interrupts disabled in hardware, but
+	 * we need to call SOFT_DISABLE_INTS anyway to ensure
+	 * that the software state is kept in sync.
+	 */
+	SOFT_DISABLE_INTS(r3,r5)
+#endif
 	/* Switch to kernel stack and jump to handler. */
 	PPC_LL	r3, HOST_RUN(r1)
 	mr	r5, r14 /* intno */

Signature · 1 line

1.7.9.5

Quoted 5 lines · Tiejun Chen

We enter with interrupts disabled in hardware, but we need to call SOFT_DISABLE_INTS anyway to ensure that the software state is kept in sync instead of calling hard_irq_disable() directly.

Signed-off-by Tiejun Chen <[email protected]>

Scott, Ben, could you please ack?

Quoted 6 lines · Alexander Graf

Quoted 4 lines · Tiejun Chen

We enter with interrupts disabled in hardware, but we need to call SOFT_DISABLE_INTS anyway to ensure that the software state is kept in sync instead of calling hard_irq_disable() directly.

Quoted 3 lines

Quoted 1 line

Signed-off-by Tiejun Chen <[email protected]>

Scott, Ben, could you please ack?

ACK, but it needs to be updated due to this patch that renames SOFT_DISABLE_INTS:

http://patchwork.ozlabs.org/patch/259337/

Quoted 9 lines · Scott Wood

Quoted 8 lines · Alexander Graf

Quoted 5 lines · Tiejun Chen

We enter with interrupts disabled in hardware, but we need to call SOFT_DISABLE_INTS anyway to ensure that the software state is kept in sync instead of calling hard_irq_disable() directly.

Signed-off-by Tiejun Chen <[email protected]>

Quoted 6 lines

Quoted 1 line

Scott, Ben, could you please ack?

ACK, but it needs to be updated due to this patch that renames SOFT_DISABLE_INTS:

http://patchwork.ozlabs.org/patch/259337/

Note that the latter was applied to powerpc -next already.