On 03/24/2011 02:47 PM, Marcelo Tosatti wrote:
Since "Fix race between nmi injection and enabling nmi window", pending NMI can be represented in KVM_REQ_NMI vcpu->requests bit. When setting vcpu state via SET_VCPU_EVENTS, for example during reset, the REQ_NMI bit should be cleared otherwise pending NMI is transferred to nmi_pending upon vcpu entry. Also should consider requests bit on runnable conditional. BZ: http://bugzilla.redhat.com/show_bug.cgi?id=684719 Signed-off-by: Marcelo Tosatti<mtosatti@xxxxxxxxxx> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f1e4025..d7f4c4f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2677,8 +2677,11 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu, events->interrupt.shadow); vcpu->arch.nmi_injected = events->nmi.injected; - if (events->flags& KVM_VCPUEVENT_VALID_NMI_PENDING) + if (events->flags& KVM_VCPUEVENT_VALID_NMI_PENDING) { vcpu->arch.nmi_pending = events->nmi.pending; + if (!vcpu->arch.nmi_pending) + clear_bit(KVM_REQ_NMI,&vcpu->requests); + } kvm_x86_ops->set_nmi_mask(vcpu, events->nmi.masked); if (events->flags& KVM_VCPUEVENT_VALID_SIPI_VECTOR) @@ -6149,7 +6152,8 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) !vcpu->arch.apf.halted) || !list_empty_careful(&vcpu->async_pf.done) || vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED - || vcpu->arch.nmi_pending || + || vcpu->arch.nmi_pending + || test_bit(KVM_REQ_NMI,&vcpu->requests) || (kvm_arch_interrupt_allowed(vcpu)&& kvm_cpu_has_interrupt(vcpu)); }
Ouch, right. But shouldn't we have similar processing when getting vcpu events? Otherwise a pending nmi can be lost during live migration.
-- error compiling committee.c: too many arguments to function -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
