]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
KVM: PPC: Book3S HV nestedv2: Fix doorbell emulation
authorGautam Menghani <gautam@linux.ibm.com>
Wed, 5 Jun 2024 11:39:10 +0000 (17:09 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 6 Jun 2024 12:38:34 +0000 (22:38 +1000)
Doorbell emulation is broken for KVM on PAPR guests as support for DPDES
was not added in the initial patch series. Due to this, a KVM on PAPR
guest with SMT > 1 cannot be booted with the XICS interrupt controller
as doorbells are setup in the initial probe path when using XICS
(pSeries_smp_probe()).

Command to replicate the above bug:

qemu-system-ppc64 \
-drive file=rhel.qcow2,format=qcow2 \
-m 20G \
-smp 8,cores=1,threads=8 \
-cpu  host \
-nographic \
-machine pseries,ic-mode=xics -accel kvm

Add doorbell state handling support in the host KVM code to fix doorbell
emulation.

Fixes: 19d31c5f1157 ("KVM: PPC: Add support for nestedv2 guests")
Cc: stable@vger.kernel.org # v6.7+
Signed-off-by: Gautam Menghani <gautam@linux.ibm.com>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240605113913.83715-3-gautam@linux.ibm.com
arch/powerpc/kvm/book3s_hv.c

index 83bd331a4ef4574dd27cb508778deabd64456a75..9df24fb50b0e96726dfc6cb4bfd9738d5febf3f5 100644 (file)
@@ -4187,6 +4187,11 @@ static int kvmhv_vcpu_entry_nestedv2(struct kvm_vcpu *vcpu, u64 time_limit,
        int trap;
        long rc;
 
+       if (vcpu->arch.doorbell_request) {
+               vcpu->arch.doorbell_request = 0;
+               kvmppc_set_dpdes(vcpu, 1);
+       }
+
        io = &vcpu->arch.nestedv2_io;
 
        msr = mfmsr();