From 3fba2cc0c03f434f968752ab4a7eb45a324eff59 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:52 +0100 Subject: [PATCH] Revert "FROMGIT: KVM: arm64: vgic-v3: Fix vcpu index comparison" This reverts commit d11273c6b3d0556c26fc7a63137508b330fabba7. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ibfdd432ac711a871576c40d25cce9af7a1233bac --- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c index 9943a3fe1b0a..bf7ec4a78497 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c +++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c @@ -763,12 +763,10 @@ static int vgic_register_all_redist_iodevs(struct kvm *kvm) } if (ret) { - /* The current c failed, so iterate over the previous ones. */ - int i; - + /* The current c failed, so we start with the previous one. */ mutex_lock(&kvm->slots_lock); - for (i = 0; i < c; i++) { - vcpu = kvm_get_vcpu(kvm, i); + for (c--; c >= 0; c--) { + vcpu = kvm_get_vcpu(kvm, c); vgic_unregister_redist_iodev(vcpu); } mutex_unlock(&kvm->slots_lock);