KVM: nVMX: use correct clean fields when copying from eVMCS
PATCH 1/1 KVM: nVMX: use correct clean fields when copying from eVMCS
Unfortunately, a couple of mistakes were made while implementing Enlightened VMCS support, in particular, wrong clean fields were used in copy_enlightened_to_vmcs12():
- exception_bitmap is covered by CONTROL_EXCPN;
- vm_exit_controls/pin_based_vm_exec_control/secondary_vm_exec_control are covered by CONTROL_GRP1.
Fixes 945679e301ea0 ("KVM: nVMX: add enlightened VMCS state")
Signed-off-by Vitaly Kuznetsov <[email protected]>
--- arch/x86/kvm/vmx/nested.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/nested.c +2 -2
@@ -1397,7 +1397,7 @@ static int copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx) }if (unlikely (!(evmcs->hv_clean_fields & -HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_PROC ))) { +HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EXCPN ))) { vmcs12->exception_bitmap = evmcs->exception_bitmap; }
@@ -1437,7 +1437,7 @@ static int copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx) }if (unlikely (!(evmcs->hv_clean_fields & -HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1 ))) { +HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1 ))) { vmcs12->pin_based_vm_exec_control = evmcs->pin_based_vm_exec_control; vmcs12->vm_exit_controls = evmcs->vm_exit_controls;
Signature · 1 line
2.20.1
2019-06-13 13:35+0200, Vitaly Kuznetsov:
Quoted 10 lines
Unfortunately, a couple of mistakes were made while implementing Enlightened VMCS support, in particular, wrong clean fields were used in
copy_enlightened_to_vmcs12():
-exception_bitmapis covered byCONTROL_EXCPN;
- vm_exit_controls/pin_based_vm_exec_control/secondary_vm_exec_control are covered byCONTROL_GRP1.Fixes 945679e301ea0 ("KVM: nVMX: add enlightened VMCS state")Signed-off-by Vitaly Kuznetsov <[email protected]>---
Reviewed-by Radim Krčmář <[email protected]>