lkml.org 
[lkml]   [2019]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 02/27] x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET)
    Date
    Add CPU feature flags for Control-flow Enforcement Technology (CET).

    CPUID.(EAX=7,ECX=0):ECX[bit 7] Shadow stack
    CPUID.(EAX=7,ECX=0):EDX[bit 20] Indirect branch tracking

    Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
    Reviewed-by: Borislav Petkov <bp@suse.de>
    ---
    arch/x86/include/asm/cpufeatures.h | 2 ++
    arch/x86/kernel/cpu/cpuid-deps.c | 2 ++
    2 files changed, 4 insertions(+)

    diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
    index 75f27ee2c263..21b2d9497c0f 100644
    --- a/arch/x86/include/asm/cpufeatures.h
    +++ b/arch/x86/include/asm/cpufeatures.h
    @@ -323,6 +323,7 @@
    #define X86_FEATURE_PKU (16*32+ 3) /* Protection Keys for Userspace */
    #define X86_FEATURE_OSPKE (16*32+ 4) /* OS Protection Keys Enable */
    #define X86_FEATURE_AVX512_VBMI2 (16*32+ 6) /* Additional AVX512 Vector Bit Manipulation Instructions */
    +#define X86_FEATURE_SHSTK (16*32+ 7) /* Shadow Stack */
    #define X86_FEATURE_GFNI (16*32+ 8) /* Galois Field New Instructions */
    #define X86_FEATURE_VAES (16*32+ 9) /* Vector AES */
    #define X86_FEATURE_VPCLMULQDQ (16*32+10) /* Carry-Less Multiplication Double Quadword */
    @@ -347,6 +348,7 @@
    #define X86_FEATURE_MD_CLEAR (18*32+10) /* VERW clears CPU buffers */
    #define X86_FEATURE_TSX_FORCE_ABORT (18*32+13) /* "" TSX_FORCE_ABORT */
    #define X86_FEATURE_PCONFIG (18*32+18) /* Intel PCONFIG */
    +#define X86_FEATURE_IBT (18*32+20) /* Indirect Branch Tracking */
    #define X86_FEATURE_SPEC_CTRL (18*32+26) /* "" Speculation Control (IBRS + IBPB) */
    #define X86_FEATURE_INTEL_STIBP (18*32+27) /* "" Single Thread Indirect Branch Predictors */
    #define X86_FEATURE_FLUSH_L1D (18*32+28) /* Flush L1D cache */
    diff --git a/arch/x86/kernel/cpu/cpuid-deps.c b/arch/x86/kernel/cpu/cpuid-deps.c
    index 2c0bd38a44ab..68ef07175062 100644
    --- a/arch/x86/kernel/cpu/cpuid-deps.c
    +++ b/arch/x86/kernel/cpu/cpuid-deps.c
    @@ -59,6 +59,8 @@ static const struct cpuid_dep cpuid_deps[] = {
    { X86_FEATURE_AVX512_4VNNIW, X86_FEATURE_AVX512F },
    { X86_FEATURE_AVX512_4FMAPS, X86_FEATURE_AVX512F },
    { X86_FEATURE_AVX512_VPOPCNTDQ, X86_FEATURE_AVX512F },
    + { X86_FEATURE_SHSTK, X86_FEATURE_XSAVES },
    + { X86_FEATURE_IBT, X86_FEATURE_XSAVES },
    {}
    };

    --
    2.17.1
    \
     
     \ /
      Last update: 2019-06-06 22:19    [W:4.132 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site