KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1
PATCH 1/1 KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1
kvm-unit-tests' eventinj "NMI failing on IDT" test results in NMI being delivered to the host (L1) when it's running nested. The problem seems to
be: svm_complete_interrupts() raises 'nmi_injected' flag but later we decide to reflect EXIT_NPF to L1. The flag remains pending and we do NMI injection upon entry so it got delivered to L1 instead of L2.
It seems that VMX code solves the same issue in prepare_vmcs12(), this was introduced with code refactoring in commit 5f3d5799974b ("KVM: nVMX: Rework event injection and recovery").
--- arch/x86/kvm/svm.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/kvm/svm.c +8 -0
@@ -3419,6 +3419,14 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)kvm_mmu_reset_context (&svm->vcpu);kvm_mmu_load (&svm->vcpu); +/* +* Drop what we picked up for L2 via svm_complete_interrupts() so it +* doesn't end up in L1. +*/ + svm->vcpu.arch.nmi_injected = false; +kvm_clear_exception_queue (&svm->vcpu); +kvm_clear_interrupt_queue (&svm->vcpu); +return 0 ; }
Signature · 1 line
2.20.1
Quoted 23 lines · Vitaly Kuznetsov
kvm-unit-tests' eventinj "NMI failing on IDT" test results in NMI being delivered to the host (L1) when it's running nested. The problem seems to
be:svm_complete_interrupts()raises 'nmi_injected' flag but later we decide to reflectEXIT_NPFto L1. The flag remains pending and we do NMI injection upon entry so it got delivered to L1 instead of L2.It seems that VMX code solves the same issue in
prepare_vmcs12(), this was introduced with code refactoring in commit5f3d5799974b("KVM: nVMX: Rework event injection and recovery").Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/svm.c | 8 ++++++++ 1 file changed, 8 insertions(+)arch/x86/kvm/svm.c +0
-0@@ -3419,6 +3419,14 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)kvm_mmu_reset_context (&svm->vcpu);kvm_mmu_load (&svm->vcpu);
arch/x86/kvm/svm.c static int nested_svm_vmexit(struct vcpu_svm *svm) · line 3431
Quoted 10 lines
arch/x86/kvm/svm.c +8
-0+/* +* Drop what we picked up for L2 via svm_complete_interrupts() so it +* doesn't end up in L1. +*/ + svm->vcpu.arch.nmi_injected = false; +kvm_clear_exception_queue (&svm->vcpu); +kvm_clear_interrupt_queue (&svm->vcpu); +return 0 ; }
Ping?
Signature · 1 line
Vitaly
Quoted 8 lines · Vitaly Kuznetsov
kvm-unit-tests' eventinj "NMI failing on IDT" test results in NMI being delivered to the host (L1) when it's running nested. The problem seems to
be:svm_complete_interrupts()raises 'nmi_injected' flag but later we decide to reflectEXIT_NPFto L1. The flag remains pending and we do NMI injection upon entry so it got delivered to L1 instead of L2.It seems that VMX code solves the same issue in
prepare_vmcs12(), this was introduced with code refactoring in commit5f3d5799974b("KVM: nVMX: Rework
Queued, thanks.
Paolo