Commit 044f0f03 authored May 29, 2014 by James Hogan Committed by Paolo Bonzini May 30, 2014

MIPS: KVM: Deliver guest interrupts after local_irq_disable()

When about to run the guest, deliver guest interrupts after disabling
host interrupts. This should prevent an hrtimer interrupt from being
handled after delivering guest interrupts, and therefore not delivering
the guest timer interrupt until after the next guest exit.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: kvm@vger.kernel.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: Sanjay Lal <sanjayl@kymasys.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 16fd5c1d

arch/mips/kvm/kvm_mips.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -419,11 +419,11 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run run)
		vcpu->mmio_needed = 0;
		}

		local_irq_disable();
		/* Check if we have any exceptions/interrupts pending */
		kvm_mips_deliver_interrupts(vcpu,
		kvm_read_c0_guest_cause(vcpu->arch.cop0));

		local_irq_disable();
		kvm_guest_enter();

		r = __kvm_mips_vcpu_run(run, vcpu);