* [PATCH] nVMX: Fix pick-up of uninjected NMIs
@ 2013-10-23 16:42 Jan Kiszka
2013-10-28 12:57 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2013-10-23 16:42 UTC (permalink / raw)
To: Paolo Bonzini, Gleb Natapov; +Cc: kvm
__vmx_complete_interrupts stored uninjected NMIs in arch.nmi_injected,
not arch.nmi_pending. So we actually need to check the former field in
vmcs12_save_pending_event. This fixes the eventinj unit test when run
in nested KVM.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
arch/x86/kvm/vmx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index feef3a1..81ce389 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -8078,7 +8078,7 @@ static void vmcs12_save_pending_event(struct kvm_vcpu *vcpu,
}
vmcs12->idt_vectoring_info_field = idt_vectoring;
- } else if (vcpu->arch.nmi_pending) {
+ } else if (vcpu->arch.nmi_injected) {
vmcs12->idt_vectoring_info_field =
INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR;
} else if (vcpu->arch.interrupt.pending) {
--
1.8.1.1.298.ge7eed54
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] nVMX: Fix pick-up of uninjected NMIs
2013-10-23 16:42 [PATCH] nVMX: Fix pick-up of uninjected NMIs Jan Kiszka
@ 2013-10-28 12:57 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2013-10-28 12:57 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Gleb Natapov, kvm
Il 23/10/2013 18:42, Jan Kiszka ha scritto:
> __vmx_complete_interrupts stored uninjected NMIs in arch.nmi_injected,
> not arch.nmi_pending. So we actually need to check the former field in
> vmcs12_save_pending_event. This fixes the eventinj unit test when run
> in nested KVM.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> arch/x86/kvm/vmx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index feef3a1..81ce389 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -8078,7 +8078,7 @@ static void vmcs12_save_pending_event(struct kvm_vcpu *vcpu,
> }
>
> vmcs12->idt_vectoring_info_field = idt_vectoring;
> - } else if (vcpu->arch.nmi_pending) {
> + } else if (vcpu->arch.nmi_injected) {
> vmcs12->idt_vectoring_info_field =
> INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR;
> } else if (vcpu->arch.interrupt.pending) {
>
Applied to kvm.git queue, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-28 12:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-23 16:42 [PATCH] nVMX: Fix pick-up of uninjected NMIs Jan Kiszka
2013-10-28 12:57 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).