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

Commit 72906690 authored by Xiaoyao Li's avatar Xiaoyao Li Committed by Greg Kroah-Hartman
Browse files

KVM: VMX: Rename NMI_PENDING to NMI_WINDOW 



[ Upstream commit 4e2a0bc56ad197e5ccfab8395649b681067fe8cb ]

Rename the NMI-window exiting related definitions to match the latest
Intel SDM. No functional changes.

Signed-off-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Stable-dep-of: 31de69f4eea7 ("KVM: nVMX: Properly expose ENABLE_USR_WAIT_PAUSE control to L1")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent da8ff592

arch/x86/include/asm/vmx.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#define CPU_BASED_CR8_LOAD_EXITING              0x00080000

#define CPU_BASED_CR8_STORE_EXITING             0x00100000

#define CPU_BASED_TPR_SHADOW                    0x00200000

#define CPU_BASED_VIRTUAL_NMI_PENDING		0x00400000

#define CPU_BASED_NMI_WINDOW_EXITING		0x00400000

#define CPU_BASED_MOV_DR_EXITING                0x00800000

#define CPU_BASED_UNCOND_IO_EXITING             0x01000000

#define CPU_BASED_USE_IO_BITMAPS                0x02000000

arch/x86/kvm/vmx/nested.c

+6 −6
Original line number Diff line number Diff line
@@ -2074,7 +2074,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12) 
	 */

	exec_control = vmx_exec_control(vmx); /* L0's desires */

	exec_control &= ~CPU_BASED_INTR_WINDOW_EXITING;

	exec_control &= ~CPU_BASED_VIRTUAL_NMI_PENDING;

	exec_control &= ~CPU_BASED_NMI_WINDOW_EXITING;

	exec_control &= ~CPU_BASED_TPR_SHADOW;

	exec_control |= vmcs12->cpu_based_vm_exec_control;
@@ -2459,7 +2459,7 @@ static int nested_vmx_check_nmi_controls(struct vmcs12 *vmcs12) 
		return -EINVAL;



	if (CC(!nested_cpu_has_virtual_nmis(vmcs12) &&

	       nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING)))

	       nested_cpu_has(vmcs12, CPU_BASED_NMI_WINDOW_EXITING)))

		return -EINVAL;



	return 0;
@@ -3039,7 +3039,7 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, 
	u32 exit_qual;



	evaluate_pending_interrupts = exec_controls_get(vmx) &

		(CPU_BASED_INTR_WINDOW_EXITING | CPU_BASED_VIRTUAL_NMI_PENDING);

		(CPU_BASED_INTR_WINDOW_EXITING | CPU_BASED_NMI_WINDOW_EXITING);

	if (likely(!evaluate_pending_interrupts) && kvm_vcpu_apicv_active(vcpu))

		evaluate_pending_interrupts |= vmx_has_apicv_interrupt(vcpu);
@@ -3267,7 +3267,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) 
	 */

	if ((vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) &&

	    !(vmcs12->vm_entry_intr_info_field & INTR_INFO_VALID_MASK) &&

	    !(vmcs12->cpu_based_vm_exec_control & CPU_BASED_VIRTUAL_NMI_PENDING) &&

	    !(vmcs12->cpu_based_vm_exec_control & CPU_BASED_NMI_WINDOW_EXITING) &&

	    !((vmcs12->cpu_based_vm_exec_control & CPU_BASED_INTR_WINDOW_EXITING) &&

	      (vmcs12->guest_rflags & X86_EFLAGS_IF))) {

		vmx->nested.nested_run_pending = 0;
@@ -5379,7 +5379,7 @@ bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason) 
	case EXIT_REASON_INTERRUPT_WINDOW:

		return nested_cpu_has(vmcs12, CPU_BASED_INTR_WINDOW_EXITING);

	case EXIT_REASON_NMI_WINDOW:

		return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING);

		return nested_cpu_has(vmcs12, CPU_BASED_NMI_WINDOW_EXITING);

	case EXIT_REASON_TASK_SWITCH:

		return true;

	case EXIT_REASON_CPUID:
@@ -5870,7 +5870,7 @@ void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps) 
		CPU_BASED_ALWAYSON_WITHOUT_TRUE_MSR;

	msrs->procbased_ctls_high &=

		CPU_BASED_INTR_WINDOW_EXITING |

		CPU_BASED_VIRTUAL_NMI_PENDING | CPU_BASED_USE_TSC_OFFSETING |

		CPU_BASED_NMI_WINDOW_EXITING | CPU_BASED_USE_TSC_OFFSETING |

		CPU_BASED_HLT_EXITING | CPU_BASED_INVLPG_EXITING |

		CPU_BASED_MWAIT_EXITING | CPU_BASED_CR3_LOAD_EXITING |

		CPU_BASED_CR3_STORE_EXITING |

arch/x86/kvm/vmx/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -4469,7 +4469,7 @@ static void enable_nmi_window(struct kvm_vcpu *vcpu) 
		return;

	}



	exec_controls_setbit(to_vmx(vcpu), CPU_BASED_VIRTUAL_NMI_PENDING);

	exec_controls_setbit(to_vmx(vcpu), CPU_BASED_NMI_WINDOW_EXITING);

}



static void vmx_inject_irq(struct kvm_vcpu *vcpu)
@@ -5295,7 +5295,7 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu) 
static int handle_nmi_window(struct kvm_vcpu *vcpu)

{

	WARN_ON_ONCE(!enable_vnmi);

	exec_controls_clearbit(to_vmx(vcpu), CPU_BASED_VIRTUAL_NMI_PENDING);

	exec_controls_clearbit(to_vmx(vcpu), CPU_BASED_NMI_WINDOW_EXITING);

	++vcpu->stat.nmi_window_exits;

	kvm_make_request(KVM_REQ_EVENT, vcpu);

tools/testing/selftests/kvm/include/x86_64/vmx.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#define CPU_BASED_CR8_LOAD_EXITING		0x00080000

#define CPU_BASED_CR8_STORE_EXITING		0x00100000

#define CPU_BASED_TPR_SHADOW			0x00200000

#define CPU_BASED_VIRTUAL_NMI_PENDING		0x00400000

#define CPU_BASED_NMI_WINDOW_EXITING		0x00400000

#define CPU_BASED_MOV_DR_EXITING		0x00800000

#define CPU_BASED_UNCOND_IO_EXITING		0x01000000

#define CPU_BASED_USE_IO_BITMAPS		0x02000000