Commit 378c4c18 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: VMX: Check CPU_BASED_{INTR,NMI}_WINDOW_EXITING in setup_vmcs_config() 



CPU_BASED_{INTR,NMI}_WINDOW_EXITING controls are toggled dynamically by
vmx_enable_{irq,nmi}_window, handle_interrupt_window(), handle_nmi_window()
but setup_vmcs_config() doesn't check their existence. Add the check and
filter the controls out in vmx_exec_control().

Note: KVM explicitly supports CPUs without VIRTUAL_NMIS and all these CPUs
are supposedly lacking NMI_WINDOW_EXITING too. Adjust cpu_has_virtual_nmis()
accordingly.

No functional change intended.

Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20220830133737.1539624-21-vkuznets@redhat.com


Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ffaaf591

arch/x86/kvm/vmx/capabilities.h

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ static inline bool cpu_has_vmx_basic_inout(void) 


static inline bool cpu_has_virtual_nmis(void)

{

	return vmcs_config.pin_based_exec_ctrl & PIN_BASED_VIRTUAL_NMIS;

	return vmcs_config.pin_based_exec_ctrl & PIN_BASED_VIRTUAL_NMIS &&

	       vmcs_config.cpu_based_exec_ctrl & CPU_BASED_NMI_WINDOW_EXITING;

}



static inline bool cpu_has_vmx_preemption_timer(void)

arch/x86/kvm/vmx/vmx.c

+7 −1
Original line number Diff line number Diff line
@@ -2564,10 +2564,12 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, 
	      CPU_BASED_MWAIT_EXITING |

	      CPU_BASED_MONITOR_EXITING |

	      CPU_BASED_INVLPG_EXITING |

	      CPU_BASED_RDPMC_EXITING;

	      CPU_BASED_RDPMC_EXITING |

	      CPU_BASED_INTR_WINDOW_EXITING;



	opt = CPU_BASED_TPR_SHADOW |

	      CPU_BASED_USE_MSR_BITMAPS |

	      CPU_BASED_NMI_WINDOW_EXITING |

	      CPU_BASED_ACTIVATE_SECONDARY_CONTROLS |

	      CPU_BASED_ACTIVATE_TERTIARY_CONTROLS;

	if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS,
@@ -4378,6 +4380,10 @@ static u32 vmx_exec_control(struct vcpu_vmx *vmx) 
{

	u32 exec_control = vmcs_config.cpu_based_exec_ctrl;



	/* INTR_WINDOW_EXITING and NMI_WINDOW_EXITING are toggled dynamically */

	exec_control &= ~(CPU_BASED_INTR_WINDOW_EXITING |

			  CPU_BASED_NMI_WINDOW_EXITING);



	if (vmx->vcpu.arch.switch_db_regs & KVM_DEBUGREG_WONT_EXIT)

		exec_control &= ~CPU_BASED_MOV_DR_EXITING;