On 24/05/2017 16:34, Radim Krčmář wrote: >> - if (atomic_read(&vcpu->arch.nmi_queued)) >> + if (vcpu->arch.nmi_pending || >> + atomic_read(&vcpu->arch.nmi_queued)) >> return true; > Hm, I think we've been missing '&& kvm_x86_ops->nmi_allowed(vcpu)'. > > The undesired resume if we have suppressed NMI is not making it much > worse, but wouldn't "kvm_test_request(KVM_REQ_NMI, vcpu)" also work > here? Yes, it would be fine (maybe better considering that we have a KVM_REQ_SMI check just below). Ying, please use it for v2. Thanks, Paolo