Commit 1f03b2bc authored by Marc Zyngier's avatar Marc Zyngier Committed by Paolo Bonzini
Browse files

KVM: Disable preemption in kvm_get_running_vcpu() 



Accessing a per-cpu variable only makes sense when preemption is
disabled (and the kernel does check this when the right debug options
are switched on).

For kvm_get_running_vcpu(), it is fine to return the value after
re-enabling preemption, as the preempt notifiers will make sure that
this is kept consistent across task migration (the comment above the
function hints at it, but lacks the crucial preemption management).

While we're at it, move the comment from the ARM code, which explains
why the whole thing works.

Fixes: 7495e22b ("KVM: Move running VCPU from ARM to common code").
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: default avatarZenghui Yu <yuzenghui@huawei.com>
Tested-by: default avatarZenghui Yu <yuzenghui@huawei.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/318984f6-bc36-33a3-abc6-bf2295974b06@huawei.com


Message-id: <20200207163410.31276-1-maz@kernel.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bab0c318

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

+0 −12
Original line number Diff line number Diff line
@@ -179,18 +179,6 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, 
	return value;

}



/*

 * This function will return the VCPU that performed the MMIO access and

 * trapped from within the VM, and will return NULL if this is a userspace

 * access.

 *

 * We can disable preemption locally around accessing the per-CPU variable,

 * and use the resolved vcpu pointer after enabling preemption again, because

 * even if the current thread is migrated to another CPU, reading the per-CPU

 * value later will give us the same value as we update the per-CPU variable

 * in the preempt notifier handlers.

 */



/* Must be called with irq->irq_lock held */

static void vgic_hw_irq_spending(struct kvm_vcpu *vcpu, struct vgic_irq *irq,

				 bool is_uaccess)

virt/kvm/kvm_main.c

+13 −3
Original line number Diff line number Diff line
@@ -4409,12 +4409,22 @@ static void kvm_sched_out(struct preempt_notifier *pn, 


/**

 * kvm_get_running_vcpu - get the vcpu running on the current CPU.

 * Thanks to preempt notifiers, this can also be called from

 * preemptible context.

 *

 * We can disable preemption locally around accessing the per-CPU variable,

 * and use the resolved vcpu pointer after enabling preemption again,

 * because even if the current thread is migrated to another CPU, reading

 * the per-CPU value later will give us the same value as we update the

 * per-CPU variable in the preempt notifier handlers.

 */

struct kvm_vcpu *kvm_get_running_vcpu(void)

{

        return __this_cpu_read(kvm_running_vcpu);

	struct kvm_vcpu *vcpu;



	preempt_disable();

	vcpu = __this_cpu_read(kvm_running_vcpu);

	preempt_enable();



	return vcpu;

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE