Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b656cf7 authored by Jan Kiszka's avatar Jan Kiszka Committed by Gleb Natapov
Browse files

KVM: nVMX: Fix injection of PENDING_INTERRUPT and NMI_WINDOW exits to L1 



Check if the interrupt or NMI window exit is for L1 by testing if it has
the corresponding controls enabled. This is required when we allow
direct injection from L0 to L2

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent 188424ba

arch/x86/kvm/vmx.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -6112,14 +6112,9 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu) 
	case EXIT_REASON_TRIPLE_FAULT:

	case EXIT_REASON_TRIPLE_FAULT:

		return 1;

		return 1;

	case EXIT_REASON_PENDING_INTERRUPT:

	case EXIT_REASON_PENDING_INTERRUPT:

		return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_INTR_PENDING);

	case EXIT_REASON_NMI_WINDOW:

	case EXIT_REASON_NMI_WINDOW:

		/*

		return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING);

		 * prepare_vmcs02() set the CPU_BASED_VIRTUAL_INTR_PENDING bit

		 * (aka Interrupt Window Exiting) only when L1 turned it on,

		 * so if we got a PENDING_INTERRUPT exit, this must be for L1.

		 * Same for NMI Window Exiting.

		 */

		return 1;

	case EXIT_REASON_TASK_SWITCH:

	case EXIT_REASON_TASK_SWITCH:

		return 1;

		return 1;

	case EXIT_REASON_CPUID:

	case EXIT_REASON_CPUID: