Commit 9bcb9065 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: VMX: Get rid of eVMCS specific VMX controls sanitization 



With the updated eVMCSv1 definition, there's no known 'problematic'
controls which are exposed in VMX control MSRs but are not present in
eVMCSv1: all known Hyper-V versions either don't expose the new fields
by not setting bits in the VMX feature controls or support the new
eVMCS revision.

Get rid of VMX control MSRs filtering for KVM on Hyper-V.

Note: VMX control MSRs filtering for Hyper-V on KVM
(nested_evmcs_filter_control_msr()) stays as even the updated eVMCSv1
definition doesn't have all the features implemented by KVM and some
fields are still missing. Moreover, nested_evmcs_filter_control_msr()
has to support the original eVMCSv1 version when VMM wishes so.

Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.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-17-vkuznets@redhat.com


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

arch/x86/kvm/vmx/evmcs.c

+0 −13
Original line number Diff line number Diff line
@@ -322,19 +322,6 @@ const struct evmcs_field vmcs_field_to_evmcs_1[] = { 
};

const unsigned int nr_evmcs_1_fields = ARRAY_SIZE(vmcs_field_to_evmcs_1);



#if IS_ENABLED(CONFIG_HYPERV)

__init void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf)

{

	vmcs_conf->cpu_based_exec_ctrl &= ~EVMCS1_UNSUPPORTED_EXEC_CTRL;

	vmcs_conf->pin_based_exec_ctrl &= ~EVMCS1_UNSUPPORTED_PINCTRL;

	vmcs_conf->cpu_based_2nd_exec_ctrl &= ~EVMCS1_UNSUPPORTED_2NDEXEC;

	vmcs_conf->cpu_based_3rd_exec_ctrl = 0;



	vmcs_conf->vmexit_ctrl &= ~EVMCS1_UNSUPPORTED_VMEXIT_CTRL;

	vmcs_conf->vmentry_ctrl &= ~EVMCS1_UNSUPPORTED_VMENTRY_CTRL;

}

#endif



bool nested_enlightened_vmentry(struct kvm_vcpu *vcpu, u64 *evmcs_gpa)

{

	struct hv_vp_assist_page assist_page;

arch/x86/kvm/vmx/evmcs.h

+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ static inline void evmcs_load(u64 phys_addr) 
	vp_ap->enlighten_vmentry = 1;

}



__init void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf);

#else /* !IS_ENABLED(CONFIG_HYPERV) */

static __always_inline void evmcs_write64(unsigned long field, u64 value) {}

static inline void evmcs_write32(unsigned long field, u32 value) {}

arch/x86/kvm/vmx/vmx.c

+0 −5
Original line number Diff line number Diff line
@@ -2766,11 +2766,6 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, 
	vmcs_conf->vmexit_ctrl         = _vmexit_control;

	vmcs_conf->vmentry_ctrl        = _vmentry_control;



#if IS_ENABLED(CONFIG_HYPERV)

	if (enlightened_vmcs)

		evmcs_sanitize_exec_ctrls(vmcs_conf);

#endif



	return 0;

}