KVM: PPC: Book3S HV: Enable hypervisor virtualization interrupts while in guest

The new XIVE interrupt controller on POWER9 can direct external
interrupts to the hypervisor or the guest.  The interrupts directed to
the hypervisor are controlled by an LPCR bit called LPCR_HVICE, and
come in as a "hypervisor virtualization interrupt".  This sets the
LPCR bit so that hypervisor virtualization interrupts can occur while
we are in the guest.  We then also need to cope with exiting the guest
because of a hypervisor virtualization interrupt.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/arch/powerpc/include/asm/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h
index 05cabed3d1bdff2005adf5bbe28d485ddd67277c..09a802bb702faf95b3e5f2875546acf085f2a392 100644 (file)
--- a/arch/powerpc/include/asm/kvm_asm.h
+++ b/arch/powerpc/include/asm/kvm_asm.h
@@ -99,6 +99,7 @@
 #define BOOK3S_INTERRUPT_H_EMUL_ASSIST 0xe40
 #define BOOK3S_INTERRUPT_HMI           0xe60
 #define BOOK3S_INTERRUPT_H_DOORBELL    0xe80
+#define BOOK3S_INTERRUPT_H_VIRT                0xea0
 #define BOOK3S_INTERRUPT_PERFMON       0xf00
 #define BOOK3S_INTERRUPT_ALTIVEC       0xf20
 #define BOOK3S_INTERRUPT_VSX           0xf40

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index aca9fbfaf16f5143ae2684708d670d16952773a4..b6bc867dfc61ce2e224baae014178933cda944b5 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -962,6 +962,7 @@ static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu,
                break;
        case BOOK3S_INTERRUPT_EXTERNAL:
        case BOOK3S_INTERRUPT_H_DOORBELL:
+       case BOOK3S_INTERRUPT_H_VIRT:
                vcpu->stat.ext_intr_exits++;
                r = RESUME_GUEST;
                break;
@@ -3305,9 +3306,15 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm)
        /* On POWER8 turn on online bit to enable PURR/SPURR */
        if (cpu_has_feature(CPU_FTR_ARCH_207S))
                lpcr |= LPCR_ONL;
-       /* On POWER9, VPM0 bit is reserved (VPM0=1 behaviour is assumed) */
-       if (cpu_has_feature(CPU_FTR_ARCH_300))
+       /*
+        * On POWER9, VPM0 bit is reserved (VPM0=1 behaviour is assumed)
+        * Set HVICE bit to enable hypervisor virtualization interrupts.
+        */
+       if (cpu_has_feature(CPU_FTR_ARCH_300)) {
                lpcr &= ~LPCR_VPM0;
+               lpcr |= LPCR_HVICE;
+       }
+
        kvm->arch.lpcr = lpcr;
 
        /*