Commit 4c0b4bc6 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Paolo Bonzini

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: default avatarDavidlohr Bueso <dbueso@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 267ad7bc
...@@ -514,7 +514,7 @@ int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, ...@@ -514,7 +514,7 @@ int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
dvcpu->arch.wait = 0; dvcpu->arch.wait = 0;
if (swait_active(&dvcpu->wq)) if (swq_has_sleeper(&dvcpu->wq))
swake_up(&dvcpu->wq); swake_up(&dvcpu->wq);
return 0; return 0;
...@@ -1179,7 +1179,7 @@ static void kvm_mips_comparecount_func(unsigned long data) ...@@ -1179,7 +1179,7 @@ static void kvm_mips_comparecount_func(unsigned long data)
kvm_mips_callbacks->queue_timer_int(vcpu); kvm_mips_callbacks->queue_timer_int(vcpu);
vcpu->arch.wait = 0; vcpu->arch.wait = 0;
if (swait_active(&vcpu->wq)) if (swq_has_sleeper(&vcpu->wq))
swake_up(&vcpu->wq); swake_up(&vcpu->wq);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment