mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
kvm,mips: Fix potential swait_active() races
For example, the following could occur, making us miss a wakeup: CPU0 CPU1 kvm_vcpu_block kvm_mips_comparecount_func [L] swait_active(&vcpu->wq) [S] prepare_to_swait(&vcpu->wq) [L] if (!kvm_vcpu_has_pending_timer(vcpu)) schedule() [S] queue_timer_int(vcpu) Ensure that the swait_active() check is not hoisted over the interrupt. Signed-off-by: Davidlohr Bueso <dbueso@suse.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
267ad7bc2d
commit
4c0b4bc60f
|
@ -514,7 +514,7 @@ int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
|
|||
|
||||
dvcpu->arch.wait = 0;
|
||||
|
||||
if (swait_active(&dvcpu->wq))
|
||||
if (swq_has_sleeper(&dvcpu->wq))
|
||||
swake_up(&dvcpu->wq);
|
||||
|
||||
return 0;
|
||||
|
@ -1179,7 +1179,7 @@ static void kvm_mips_comparecount_func(unsigned long data)
|
|||
kvm_mips_callbacks->queue_timer_int(vcpu);
|
||||
|
||||
vcpu->arch.wait = 0;
|
||||
if (swait_active(&vcpu->wq))
|
||||
if (swq_has_sleeper(&vcpu->wq))
|
||||
swake_up(&vcpu->wq);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue