KVM: PPC: Book3S HV: XIVE: Fix vCPU id sanity check

[sfrench/cifs-2.6.git] / arch / powerpc / kvm / book3s_xive.c

diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
index 85215e79db42cf11c1b5b6e78eafe32503a7b058..a0ebc29f30b27995f2b3d479c4b3df5bb3514c5b 100644 (file)
--- a/arch/powerpc/kvm/book3s_xive.c
+++ b/arch/powerpc/kvm/book3s_xive.c
@@ -1214,12 +1214,9 @@ void kvmppc_xive_cleanup_vcpu(struct kvm_vcpu *vcpu)
 static bool kvmppc_xive_vcpu_id_valid(struct kvmppc_xive *xive, u32 cpu)
 {
        /* We have a block of xive->nr_servers VPs. We just need to check
-        * raw vCPU ids are below the expected limit for this guest's
-        * core stride ; kvmppc_pack_vcpu_id() will pack them down to an
-        * index that can be safely used to compute a VP id that belongs
-        * to the VP block.
+        * packed vCPU ids are below that.
         */
-       return cpu < xive->nr_servers * xive->kvm->arch.emul_smt_mode;
+       return kvmppc_pack_vcpu_id(xive->kvm, cpu) < xive->nr_servers;
 }
 
 int kvmppc_xive_compute_vp_id(struct kvmppc_xive *xive, u32 cpu, u32 *vp)