Commit 064eedf2 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: VMX: eVMCS: make evmcs_sanitize_exec_ctrls() work again 



It was noticed that evmcs_sanitize_exec_ctrls() is not being executed
nowadays despite the code checking 'enable_evmcs' static key looking
correct. Turns out, static key magic doesn't work in '__init' section
(and it is unclear when things changed) but setup_vmcs_config() is called
only once per CPU so we don't really need it to. Switch to checking
'enlightened_vmcs' instead, it is supposed to be in sync with
'enable_evmcs'.

Opportunistically make evmcs_sanitize_exec_ctrls '__init' and drop unneeded
extra newline from it.

Reported-by: default avatarYang Weijiang <weijiang.yang@intel.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20201014143346.2430936-1-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 97a71a54

arch/x86/kvm/vmx/evmcs.c

+1 −2
Original line number Diff line number Diff line
@@ -297,14 +297,13 @@ const struct evmcs_field vmcs_field_to_evmcs_1[] = { 
};

const unsigned int nr_evmcs_1_fields = ARRAY_SIZE(vmcs_field_to_evmcs_1);



void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf)

__init void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf)

{

	vmcs_conf->pin_based_exec_ctrl &= ~EVMCS1_UNSUPPORTED_PINCTRL;

	vmcs_conf->cpu_based_2nd_exec_ctrl &= ~EVMCS1_UNSUPPORTED_2NDEXEC;



	vmcs_conf->vmexit_ctrl &= ~EVMCS1_UNSUPPORTED_VMEXIT_CTRL;

	vmcs_conf->vmentry_ctrl &= ~EVMCS1_UNSUPPORTED_VMENTRY_CTRL;



}

#endif

arch/x86/kvm/vmx/evmcs.h

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

}



void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf);

__init void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf);

#else /* !IS_ENABLED(CONFIG_HYPERV) */

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

static inline void evmcs_write32(unsigned long field, u32 value) {}
@@ -194,7 +194,6 @@ static inline u64 evmcs_read64(unsigned long field) { return 0; } 
static inline u32 evmcs_read32(unsigned long field) { return 0; }

static inline u16 evmcs_read16(unsigned long field) { return 0; }

static inline void evmcs_load(u64 phys_addr) {}

static inline void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf) {}

static inline void evmcs_touch_msr_bitmap(void) {}

#endif /* IS_ENABLED(CONFIG_HYPERV) */

arch/x86/kvm/vmx/vmx.c

+3 −1
Original line number Diff line number Diff line
@@ -2560,8 +2560,10 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, 
	vmcs_conf->vmexit_ctrl         = _vmexit_control;

	vmcs_conf->vmentry_ctrl        = _vmentry_control;



	if (static_branch_unlikely(&enable_evmcs))

#if IS_ENABLED(CONFIG_HYPERV)

	if (enlightened_vmcs)

		evmcs_sanitize_exec_ctrls(vmcs_conf);

#endif



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE