Commit abd72296 authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: arm/arm64: Simplify active_change_prepare and plug race 



We don't need to stop a specific VCPU when changing the active state,
because private IRQs can only be modified by a running VCPU for the
VCPU itself and it is therefore already stopped.

However, it is also possible for two VCPUs to be modifying the active
state of SPIs at the same time, which can cause the thread being stuck
in the loop that checks other VCPU threads for a potentially very long
time, or to modify the active state of a running VCPU.  Fix this by
serializing all accesses to setting and clearing the active state of
interrupts using the KVM mutex.

Reported-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 3197191e

arch/arm/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -233,8 +233,6 @@ struct kvm_vcpu *kvm_arm_get_running_vcpu(void); 
struct kvm_vcpu __percpu **kvm_get_running_vcpus(void);

void kvm_arm_halt_guest(struct kvm *kvm);

void kvm_arm_resume_guest(struct kvm *kvm);

void kvm_arm_halt_vcpu(struct kvm_vcpu *vcpu);

void kvm_arm_resume_vcpu(struct kvm_vcpu *vcpu);



int kvm_arm_copy_coproc_indices(struct kvm_vcpu *vcpu, u64 __user *uindices);

unsigned long kvm_arm_num_coproc_regs(struct kvm_vcpu *vcpu);

arch/arm64/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -333,8 +333,6 @@ struct kvm_vcpu *kvm_arm_get_running_vcpu(void); 
struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void);

void kvm_arm_halt_guest(struct kvm *kvm);

void kvm_arm_resume_guest(struct kvm *kvm);

void kvm_arm_halt_vcpu(struct kvm_vcpu *vcpu);

void kvm_arm_resume_vcpu(struct kvm_vcpu *vcpu);



u64 __kvm_call_hyp(void *hypfn, ...);

#define kvm_call_hyp(f, ...) __kvm_call_hyp(kvm_ksym_ref(f), ##__VA_ARGS__)

virt/kvm/arm/arm.c

+4 −16
Original line number Diff line number Diff line
@@ -539,27 +539,15 @@ void kvm_arm_halt_guest(struct kvm *kvm) 
	kvm_make_all_cpus_request(kvm, KVM_REQ_VCPU_EXIT);

}



void kvm_arm_halt_vcpu(struct kvm_vcpu *vcpu)

{

	vcpu->arch.pause = true;

	kvm_vcpu_kick(vcpu);

}



void kvm_arm_resume_vcpu(struct kvm_vcpu *vcpu)

{

	struct swait_queue_head *wq = kvm_arch_vcpu_wq(vcpu);



	vcpu->arch.pause = false;

	swake_up(wq);

}



void kvm_arm_resume_guest(struct kvm *kvm)

{

	int i;

	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_arm_resume_vcpu(vcpu);

	kvm_for_each_vcpu(i, vcpu, kvm) {

		vcpu->arch.pause = false;

		swake_up(kvm_arch_vcpu_wq(vcpu));

	}

}



static void vcpu_sleep(struct kvm_vcpu *vcpu)

virt/kvm/arm/vgic/vgic-mmio.c

+10 −8
Original line number Diff line number Diff line
@@ -231,23 +231,21 @@ static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq, 
 * be migrated while we don't hold the IRQ locks and we don't want to be

 * chasing moving targets.

 *

 * For private interrupts, we only have to make sure the single and only VCPU

 * that can potentially queue the IRQ is stopped.

 * For private interrupts we don't have to do anything because userspace

 * accesses to the VGIC state already require all VCPUs to be stopped, and

 * only the VCPU itself can modify its private interrupts active state, which

 * guarantees that the VCPU is not running.

 */

static void vgic_change_active_prepare(struct kvm_vcpu *vcpu, u32 intid)

{

	if (intid < VGIC_NR_PRIVATE_IRQS)

		kvm_arm_halt_vcpu(vcpu);

	else

	if (intid > VGIC_NR_PRIVATE_IRQS)

		kvm_arm_halt_guest(vcpu->kvm);

}



/* See vgic_change_active_prepare */

static void vgic_change_active_finish(struct kvm_vcpu *vcpu, u32 intid)

{

	if (intid < VGIC_NR_PRIVATE_IRQS)

		kvm_arm_resume_vcpu(vcpu);

	else

	if (intid > VGIC_NR_PRIVATE_IRQS)

		kvm_arm_resume_guest(vcpu->kvm);

}
@@ -271,11 +269,13 @@ void vgic_mmio_write_cactive(struct kvm_vcpu *vcpu, 
{

	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);



	mutex_lock(&vcpu->kvm->lock);

	vgic_change_active_prepare(vcpu, intid);



	__vgic_mmio_write_cactive(vcpu, addr, len, val);



	vgic_change_active_finish(vcpu, intid);

	mutex_unlock(&vcpu->kvm->lock);

}



void vgic_mmio_uaccess_write_cactive(struct kvm_vcpu *vcpu,
@@ -305,11 +305,13 @@ void vgic_mmio_write_sactive(struct kvm_vcpu *vcpu, 
{

	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);



	mutex_lock(&vcpu->kvm->lock);

	vgic_change_active_prepare(vcpu, intid);



	__vgic_mmio_write_sactive(vcpu, addr, len, val);



	vgic_change_active_finish(vcpu, intid);

	mutex_unlock(&vcpu->kvm->lock);

}



void vgic_mmio_uaccess_write_sactive(struct kvm_vcpu *vcpu,

virt/kvm/arm/vgic/vgic.c

+6 −5
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ struct vgic_global kvm_vgic_global_state __ro_after_init = { 


/*

 * Locking order is always:

 * kvm->lock (mutex)

 *   its->cmd_lock (mutex)

 *     its->its_lock (mutex)

 *       vgic_cpu->ap_list_lock

CRA Git | Maintained and supported by SUSTech CRA and CCSE