lkml.org 
[lkml]   [2023]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 17/26] KVM: x86: Report KVM supported CET MSRs as to-be-saved
    Date
    Add CET MSRs to the list of MSRs reported to userspace if the feature,
    i.e. IBT or SHSTK, associated with the MSRs is supported by KVM.

    SSP can only be read via RDSSP. Writing even requires destructive and
    potentially faulting operations such as SAVEPREVSSP/RSTORSSP or
    SETSSBSY/CLRSSBSY. Let the host use a pseudo-MSR that is just a wrapper
    for the GUEST_SSP field of the VMCS.

    Suggested-by: Chao Gao <chao.gao@intel.com>
    Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
    ---
    arch/x86/include/uapi/asm/kvm_para.h | 1 +
    arch/x86/kvm/vmx/vmx.c | 2 ++
    arch/x86/kvm/x86.c | 18 ++++++++++++++++++
    3 files changed, 21 insertions(+)

    diff --git a/arch/x86/include/uapi/asm/kvm_para.h b/arch/x86/include/uapi/asm/kvm_para.h
    index 6e64b27b2c1e..9864bbcf2470 100644
    --- a/arch/x86/include/uapi/asm/kvm_para.h
    +++ b/arch/x86/include/uapi/asm/kvm_para.h
    @@ -58,6 +58,7 @@
    #define MSR_KVM_ASYNC_PF_INT 0x4b564d06
    #define MSR_KVM_ASYNC_PF_ACK 0x4b564d07
    #define MSR_KVM_MIGRATION_CONTROL 0x4b564d08
    +#define MSR_KVM_SSP 0x4b564d09

    struct kvm_steal_time {
    __u64 steal;
    diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
    index be20a60047b1..d3d0d74fef70 100644
    --- a/arch/x86/kvm/vmx/vmx.c
    +++ b/arch/x86/kvm/vmx/vmx.c
    @@ -7009,6 +7009,8 @@ static bool vmx_has_emulated_msr(struct kvm *kvm, u32 index)
    case MSR_AMD64_TSC_RATIO:
    /* This is AMD only. */
    return false;
    + case MSR_KVM_SSP:
    + return kvm_cpu_cap_has(X86_FEATURE_SHSTK);
    default:
    return true;
    }
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index 44b8cf459dfc..74d2d00a1681 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -1476,6 +1476,9 @@ static const u32 msrs_to_save_base[] = {

    MSR_IA32_XFD, MSR_IA32_XFD_ERR,
    MSR_IA32_XSS,
    + MSR_IA32_U_CET, MSR_IA32_S_CET,
    + MSR_IA32_PL0_SSP, MSR_IA32_PL1_SSP, MSR_IA32_PL2_SSP,
    + MSR_IA32_PL3_SSP, MSR_IA32_INT_SSP_TAB,
    };

    static const u32 msrs_to_save_pmu[] = {
    @@ -1576,6 +1579,7 @@ static const u32 emulated_msrs_all[] = {

    MSR_K7_HWCR,
    MSR_KVM_POLL_CONTROL,
    + MSR_KVM_SSP,
    };

    static u32 emulated_msrs[ARRAY_SIZE(emulated_msrs_all)];
    @@ -7371,6 +7375,20 @@ static void kvm_probe_msr_to_save(u32 msr_index)
    if (!kvm_caps.supported_xss)
    return;
    break;
    + case MSR_IA32_U_CET:
    + case MSR_IA32_S_CET:
    + if (!kvm_cpu_cap_has(X86_FEATURE_SHSTK) &&
    + !kvm_cpu_cap_has(X86_FEATURE_IBT))
    + return;
    + break;
    + case MSR_IA32_INT_SSP_TAB:
    + if (!kvm_cpu_cap_has(X86_FEATURE_LM))
    + return;
    + fallthrough;
    + case MSR_IA32_PL0_SSP ... MSR_IA32_PL3_SSP:
    + if (!kvm_cpu_cap_has(X86_FEATURE_SHSTK))
    + return;
    + break;
    default:
    break;
    }
    --
    2.27.0
    \
     
     \ /
      Last update: 2023-11-24 09:00    [W:7.381 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site