Commit 02e3858f authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: vgic: Force vcpu vgic teardown on vcpu destroy 



When failing to create a vcpu because (for example) it has a
duplicate vcpu_id, we destroy the vcpu. Amusingly, this leaves
the redistributor registered with the KVM_MMIO bus.

This is no good, and we should properly clean the mess. Force
a teardown of the vgic vcpu interface, including the RD device
before returning to the caller.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20231207151201.3028710-4-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent d26b9cb3

arch/arm64/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 
	kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);

	kvm_timer_vcpu_terminate(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);



	kvm_vgic_vcpu_destroy(vcpu);

	kvm_arm_vcpu_destroy(vcpu);

}

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

+4 −1
Original line number Diff line number Diff line
@@ -379,8 +379,11 @@ static void __kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) 
	vgic_flush_pending_lpis(vcpu);



	INIT_LIST_HEAD(&vgic_cpu->ap_list_head);

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

		vgic_unregister_redist_iodev(vcpu);

		vgic_cpu->rd_iodev.base_addr = VGIC_ADDR_UNDEF;

	}

}



void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)

{

arch/arm64/kvm/vgic/vgic-mmio-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ int vgic_register_redist_iodev(struct kvm_vcpu *vcpu) 
	return ret;

}



static void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu)

void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu)

{

	struct vgic_io_device *rd_dev = &vcpu->arch.vgic_cpu.rd_iodev;

arch/arm64/kvm/vgic/vgic.h

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ int vgic_v3_lpi_sync_pending_status(struct kvm *kvm, struct vgic_irq *irq); 
int vgic_v3_save_pending_tables(struct kvm *kvm);

int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count);

int vgic_register_redist_iodev(struct kvm_vcpu *vcpu);

void vgic_unregister_redist_iodev(struct kvm_vcpu *vcpu);

bool vgic_v3_check_base(struct kvm *kvm);



void vgic_v3_load(struct kvm_vcpu *vcpu);