x86/kvm/nVMX: fix VMCLEAR when Enlightened VMCS is in use
When Enlightened VMCS is in use, it is valid to do VMCLEAR and, according to TLFS, this should "transition an enlightened VMCS from the active to the non-active state". It is, however, wrong to assume that it is only valid to do VMCLEAR for the eVMCS which is currently active on the vCPU performing VMCLEAR. Currently, the logic in handle_vmclear() is broken: in case, there is no active eVMCS on the vCPU doing VMCLEAR we treat the argument as a 'normal' VMCS and kvm_vcpu_write_guest() to the 'launch_state' field irreversibly corrupts the memory area. So, in case the VMCLEAR argument is not the current active eVMCS on the vCPU, how can we know if the area it is pointing to is a normal or an enlightened VMCS? Thanks to the bug in Hyper-V (see commit72aeb60c52
("KVM: nVMX: Verify eVMCS revision id match supported eVMCS version on eVMCS VMPTRLD")) we can not, the revision can't be used to distinguish between them. So let's assume it is always enlightened in case enlightened vmentry is enabled in the assist page. Also, check if vmx->nested.enlightened_vmcs_enabled to minimize the impact for 'unenlightened' workloads. Fixes:b8bbab928f
("KVM: nVMX: implement enlightened VMPTRLD and VMCLEAR") Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Родитель
a21a39c206
Коммит
11e349143e
|
@ -3,6 +3,7 @@
|
|||
#include <linux/errno.h>
|
||||
#include <linux/smp.h>
|
||||
|
||||
#include "../hyperv.h"
|
||||
#include "evmcs.h"
|
||||
#include "vmcs.h"
|
||||
#include "vmx.h"
|
||||
|
@ -313,6 +314,23 @@ void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf)
|
|||
}
|
||||
#endif
|
||||
|
||||
bool nested_enlightened_vmentry(struct kvm_vcpu *vcpu, u64 *evmcs_gpa)
|
||||
{
|
||||
struct hv_vp_assist_page assist_page;
|
||||
|
||||
*evmcs_gpa = -1ull;
|
||||
|
||||
if (unlikely(!kvm_hv_get_assist_page(vcpu, &assist_page)))
|
||||
return false;
|
||||
|
||||
if (unlikely(!assist_page.enlighten_vmentry))
|
||||
return false;
|
||||
|
||||
*evmcs_gpa = assist_page.current_nested_vmcs;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu)
|
||||
{
|
||||
struct vcpu_vmx *vmx = to_vmx(vcpu);
|
||||
|
|
|
@ -195,6 +195,7 @@ 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) */
|
||||
|
||||
bool nested_enlightened_vmentry(struct kvm_vcpu *vcpu, u64 *evmcs_gpa);
|
||||
uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu);
|
||||
int nested_enable_evmcs(struct kvm_vcpu *vcpu,
|
||||
uint16_t *vmcs_version);
|
||||
|
|
|
@ -1783,27 +1783,22 @@ static int nested_vmx_handle_enlightened_vmptrld(struct kvm_vcpu *vcpu,
|
|||
bool from_launch)
|
||||
{
|
||||
struct vcpu_vmx *vmx = to_vmx(vcpu);
|
||||
struct hv_vp_assist_page assist_page;
|
||||
bool evmcs_gpa_changed = false;
|
||||
u64 evmcs_gpa;
|
||||
|
||||
if (likely(!vmx->nested.enlightened_vmcs_enabled))
|
||||
return 1;
|
||||
|
||||
if (unlikely(!kvm_hv_get_assist_page(vcpu, &assist_page)))
|
||||
if (!nested_enlightened_vmentry(vcpu, &evmcs_gpa))
|
||||
return 1;
|
||||
|
||||
if (unlikely(!assist_page.enlighten_vmentry))
|
||||
return 1;
|
||||
|
||||
if (unlikely(assist_page.current_nested_vmcs !=
|
||||
vmx->nested.hv_evmcs_vmptr)) {
|
||||
|
||||
if (unlikely(evmcs_gpa != vmx->nested.hv_evmcs_vmptr)) {
|
||||
if (!vmx->nested.hv_evmcs)
|
||||
vmx->nested.current_vmptr = -1ull;
|
||||
|
||||
nested_release_evmcs(vcpu);
|
||||
|
||||
if (kvm_vcpu_map(vcpu, gpa_to_gfn(assist_page.current_nested_vmcs),
|
||||
if (kvm_vcpu_map(vcpu, gpa_to_gfn(evmcs_gpa),
|
||||
&vmx->nested.hv_evmcs_map))
|
||||
return 0;
|
||||
|
||||
|
@ -1838,7 +1833,7 @@ static int nested_vmx_handle_enlightened_vmptrld(struct kvm_vcpu *vcpu,
|
|||
}
|
||||
|
||||
vmx->nested.dirty_vmcs12 = true;
|
||||
vmx->nested.hv_evmcs_vmptr = assist_page.current_nested_vmcs;
|
||||
vmx->nested.hv_evmcs_vmptr = evmcs_gpa;
|
||||
|
||||
evmcs_gpa_changed = true;
|
||||
/*
|
||||
|
@ -4436,6 +4431,7 @@ static int handle_vmclear(struct kvm_vcpu *vcpu)
|
|||
struct vcpu_vmx *vmx = to_vmx(vcpu);
|
||||
u32 zero = 0;
|
||||
gpa_t vmptr;
|
||||
u64 evmcs_gpa;
|
||||
|
||||
if (!nested_vmx_check_permission(vcpu))
|
||||
return 1;
|
||||
|
@ -4451,10 +4447,18 @@ static int handle_vmclear(struct kvm_vcpu *vcpu)
|
|||
return nested_vmx_failValid(vcpu,
|
||||
VMXERR_VMCLEAR_VMXON_POINTER);
|
||||
|
||||
if (vmx->nested.hv_evmcs_map.hva) {
|
||||
if (vmptr == vmx->nested.hv_evmcs_vmptr)
|
||||
nested_release_evmcs(vcpu);
|
||||
} else {
|
||||
/*
|
||||
* When Enlightened VMEntry is enabled on the calling CPU we treat
|
||||
* memory area pointer by vmptr as Enlightened VMCS (as there's no good
|
||||
* way to distinguish it from VMCS12) and we must not corrupt it by
|
||||
* writing to the non-existent 'launch_state' field. The area doesn't
|
||||
* have to be the currently active EVMCS on the calling CPU and there's
|
||||
* nothing KVM has to do to transition it from 'active' to 'non-active'
|
||||
* state. It is possible that the area will stay mapped as
|
||||
* vmx->nested.hv_evmcs but this shouldn't be a problem.
|
||||
*/
|
||||
if (likely(!vmx->nested.enlightened_vmcs_enabled ||
|
||||
!nested_enlightened_vmentry(vcpu, &evmcs_gpa))) {
|
||||
if (vmptr == vmx->nested.current_vmptr)
|
||||
nested_release_vmcs12(vcpu);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче