lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Wake up waitqueue before calling get_cpu()

Browse Source 
This moves the get_cpu() call down to be called after we wake up the
waiters. Therefore the waitqueue locks can safely be rt mutex.

Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Sven-Thorsten Dietrich <sven@thebigcorporation.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Jan Blunck
2009-04-07 23:58:56 +00:00
committed by Avi Kivity
parent 14d0bc1f7c
commit 9b62e5b10f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kvm/x86.c
View File

@@ -4569,7 +4569,7 @@ static void vcpu_kick_intr(void *info)
void kvm_vcpu_kick(struct kvm_vcpu *vcpu) void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
{ {
int ipi_pcpu = vcpu->cpu; int ipi_pcpu = vcpu->cpu;
int cpu = get_cpu(); int cpu;
if (waitqueue_active(&vcpu->wq)) { if (waitqueue_active(&vcpu->wq)) {
wake_up_interruptible(&vcpu->wq); wake_up_interruptible(&vcpu->wq);
@@ -4579,6 +4579,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
* We may be called synchronously with irqs disabled in guest mode, * We may be called synchronously with irqs disabled in guest mode,
* So need not to call smp_call_function_single() in that case. * So need not to call smp_call_function_single() in that case.
*/ */
cpu = get_cpu();
if (vcpu->guest_mode && vcpu->cpu != cpu) if (vcpu->guest_mode && vcpu->cpu != cpu)
smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0); smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0);
put_cpu(); put_cpu();