There're two different places storing Guest CET states, the states
managed with XSAVES/XRSTORS, as restored/saved
in previous patch, can be read/write directly from/to the MSRs.
For those stored in VMCS fields, they're access via vmcs_read/
vmcs_write.

Signed-off-by: Yang Weijiang <weijiang.y...@intel.com>
---
 arch/x86/kvm/vmx/vmx.c | 43 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 123285177c6b..e5eacd01e984 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -1774,6 +1774,27 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct 
msr_data *msr_info)
                else
                        msr_info->data = vmx->pt_desc.guest.addr_a[index / 2];
                break;
+       case MSR_IA32_S_CET:
+               msr_info->data = vmcs_readl(GUEST_S_CET);
+               break;
+       case MSR_IA32_U_CET:
+               rdmsrl(MSR_IA32_U_CET, msr_info->data);
+               break;
+       case MSR_IA32_INT_SSP_TAB:
+               msr_info->data = vmcs_readl(GUEST_INTR_SSP_TABLE);
+               break;
+       case MSR_IA32_PL0_SSP:
+               rdmsrl(MSR_IA32_PL0_SSP, msr_info->data);
+               break;
+       case MSR_IA32_PL1_SSP:
+               rdmsrl(MSR_IA32_PL1_SSP, msr_info->data);
+               break;
+       case MSR_IA32_PL2_SSP:
+               rdmsrl(MSR_IA32_PL2_SSP, msr_info->data);
+               break;
+       case MSR_IA32_PL3_SSP:
+               rdmsrl(MSR_IA32_PL3_SSP, msr_info->data);
+               break;
        case MSR_TSC_AUX:
                if (!msr_info->host_initiated &&
                    !guest_cpuid_has(vcpu, X86_FEATURE_RDTSCP))
@@ -2007,6 +2028,28 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct 
msr_data *msr_info)
                else
                        vmx->pt_desc.guest.addr_a[index / 2] = data;
                break;
+       case MSR_IA32_S_CET:
+               vmcs_writel(GUEST_S_CET, data);
+               break;
+       case MSR_IA32_U_CET:
+               wrmsrl(MSR_IA32_U_CET, data);
+               break;
+       case MSR_IA32_INT_SSP_TAB:
+               vmcs_writel(GUEST_INTR_SSP_TABLE, data);
+               break;
+       case MSR_IA32_PL0_SSP:
+               wrmsrl(MSR_IA32_PL0_SSP, data);
+               break;
+       case MSR_IA32_PL1_SSP:
+               wrmsrl(MSR_IA32_PL1_SSP, data);
+               break;
+       case MSR_IA32_PL2_SSP:
+               wrmsrl(MSR_IA32_PL2_SSP, data);
+               break;
+       case MSR_IA32_PL3_SSP:
+               wrmsrl(MSR_IA32_PL3_SSP, data);
+               break;
+
        case MSR_TSC_AUX:
                if (!msr_info->host_initiated &&
                    !guest_cpuid_has(vcpu, X86_FEATURE_RDTSCP))
-- 
2.17.2

Reply via email to