Like vmx_compute_tertiary_exec_control(), before L1 set VMCS, compute its
nested VMX feature control MSR's value according to guest CPUID setting.
Signed-off-by: Robert Hoo <robert.hu@xxxxxxxxxxxxxxx>
---
arch/x86/kvm/vmx/vmx.c | 22 +++++++++++++++++-----
arch/x86/kvm/vmx/vmx.h | 1 +
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index f29a91c..cf8ab95 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -4377,10 +4377,20 @@ u32 vmx_exec_control(struct vcpu_vmx *vmx)
#define vmx_adjust_sec_exec_exiting(vmx, exec_control, lname, uname) \
vmx_adjust_sec_exec_control(vmx, exec_control, lname, uname, uname##_EXITING, true)
-static u64 vmx_tertiary_exec_control(struct vcpu_vmx *vmx)
+static void vmx_compute_tertiary_exec_control(struct vcpu_vmx *vmx)
{
- /* Though currently, no special adjustment. There might be in the future*/
- return vmcs_config.cpu_based_3rd_exec_ctrl;
+ struct kvm_vcpu *vcpu = &vmx->vcpu;
+ u32 exec_control = vmcs_config.cpu_based_3rd_exec_ctrl;
+
+ if (nested) {
+ if (guest_cpuid_has(vcpu, X86_FEATURE_KEYLOCKER))
+ vmx->nested.msrs.tertiary_ctls |=
+ TERTIARY_EXEC_LOADIWKEY_EXITING;
+ else
+ vmx->nested.msrs.tertiary_ctls &=
+ ~TERTIARY_EXEC_LOADIWKEY_EXITING;
+ }
+ vmx->tertiary_exec_control = exec_control;
}
static void vmx_compute_secondary_exec_control(struct vcpu_vmx *vmx)
@@ -4493,8 +4503,10 @@ static void init_vmcs(struct vcpu_vmx *vmx)
secondary_exec_controls_set(vmx, vmx->secondary_exec_control);
}
- if (cpu_has_tertiary_exec_ctrls())
- tertiary_exec_controls_set(vmx, vmx_tertiary_exec_control(vmx));
+ if (cpu_has_tertiary_exec_ctrls()) {
+ vmx_compute_tertiary_exec_control(vmx);
+ tertiary_exec_controls_set(vmx, vmx->tertiary_exec_control);
+ }
if (kvm_vcpu_apicv_active(&vmx->vcpu)) {
vmcs_write64(EOI_EXIT_BITMAP0, 0);
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index 94f1c27..0915fad 100644
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -209,6 +209,7 @@ struct vcpu_vmx {
u32 msr_ia32_umwait_control;
u32 secondary_exec_control;
+ u64 tertiary_exec_control;
/*
* loaded_vmcs points to the VMCS currently used in this vcpu. For a
--
1.8.3.1
