KVM: nVMX: Use adjusted pin controls for vmcs02 (c075c3e4) · Commits · 戴 / test

KVM provides a module parameter to allow disabling virtual NMI support to simplify testing (hardware *without* virtual NMI support is hard to come by but it does have users). When preparing vmcs02, use the accessor for pin controls to ensure that the module param is respected for nested guests. Opportunistically swap the order of applying L0's and L1's pin controls to better align with other controls and to prepare for a future patche that will ignore L1's, but not L0's, preemption timer flag. Fixes: ("kvm: vmx: Allow disabling virtual NMI support") Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by:

Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/vmx/nested.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -2013,10 +2013,9 @@ static void prepare_vmcs02_early(struct vcpu_vmx vmx, struct vmcs12 vmcs12)
		/*
		* PIN CONTROLS
		*/
		exec_control = vmcs12->pin_based_vm_exec_control;

		exec_control = vmx_pin_based_exec_ctrl(vmx);
		exec_control \|= vmcs12->pin_based_vm_exec_control;
		/* Preemption timer setting is computed directly in vmx_vcpu_run. */
		exec_control \|= vmcs_config.pin_based_exec_ctrl;
		exec_control &= ~PIN_BASED_VMX_PREEMPTION_TIMER;
		vmx->loaded_vmcs->hv_timer_armed = false;

arch/x86/kvm/vmx/vmx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3825,7 +3825,7 @@ void set_cr4_guest_host_mask(struct vcpu_vmx *vmx)
		vmcs_writel(CR4_GUEST_HOST_MASK, ~vmx->vcpu.arch.cr4_guest_owned_bits);
		}

		static u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx)
		u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx)
		{
		u32 pin_based_exec_ctrl = vmcs_config.pin_based_exec_ctrl;

arch/x86/kvm/vmx/vmx.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -480,6 +480,7 @@ static inline u32 vmx_vmexit_ctrl(void)
		}

		u32 vmx_exec_control(struct vcpu_vmx *vmx);
		u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx);

		static inline struct kvm_vmx to_kvm_vmx(struct kvm kvm)
		{

Admin message