Commit 3a521161 authored by Eric Auger's avatar Eric Auger Committed by Marc Zyngier
Browse files

KVM: arm/arm64: vgic: Reset base address on kvm_vgic_dist_destroy() 



On vgic_dist_destroy(), the addresses are not reset. However for
kvm selftest purpose this would allow to continue the test execution
even after a failure when running KVM_RUN. So let's reset the
base addresses.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210405163941.510258-5-eric.auger@redhat.com
parent 8542a8f9

arch/arm64/kvm/vgic/vgic-init.c

+5 −1
Original line number Diff line number Diff line
@@ -335,13 +335,16 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) 
	kfree(dist->spis);

	dist->spis = NULL;

	dist->nr_spis = 0;

	dist->vgic_dist_base = VGIC_ADDR_UNDEF;



	if (kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3) {

	if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3) {

		list_for_each_entry_safe(rdreg, next, &dist->rd_regions, list) {

			list_del(&rdreg->list);

			kfree(rdreg);

		}

		INIT_LIST_HEAD(&dist->rd_regions);

	} else {

		dist->vgic_cpu_base = VGIC_ADDR_UNDEF;

	}



	if (vgic_has_its(kvm))
@@ -362,6 +365,7 @@ void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) 
	vgic_flush_pending_lpis(vcpu);



	INIT_LIST_HEAD(&vgic_cpu->ap_list_head);

	vgic_cpu->rd_iodev.base_addr = VGIC_ADDR_UNDEF;

}



/* To be called with kvm->lock held */