lkml.org 
[lkml]   [2022]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 080/130] x86/retpoline: Cleanup some #ifdefery
    Date
    From: Peter Zijlstra <peterz@infradead.org>

    commit 369ae6ffc41a3c1137cab697635a84d0cc7cdcea upstream.

    On it's own not much of a cleanup but it prepares for more/similar
    code.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    [cascardo: conflict fixup because of DISABLE_ENQCMD]
    [cascardo: no changes at nospec-branch.h and bpf_jit_comp.c]
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/include/asm/disabled-features.h | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    --- a/arch/x86/include/asm/disabled-features.h
    +++ b/arch/x86/include/asm/disabled-features.h
    @@ -56,6 +56,13 @@
    # define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))
    #endif

    +#ifdef CONFIG_RETPOLINE
    +# define DISABLE_RETPOLINE 0
    +#else
    +# define DISABLE_RETPOLINE ((1 << (X86_FEATURE_RETPOLINE & 31)) | \
    + (1 << (X86_FEATURE_RETPOLINE_LFENCE & 31)))
    +#endif
    +
    /* Force disable because it's broken beyond repair */
    #define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))

    @@ -73,7 +80,7 @@
    #define DISABLED_MASK8 0
    #define DISABLED_MASK9 (DISABLE_SMAP)
    #define DISABLED_MASK10 0
    -#define DISABLED_MASK11 0
    +#define DISABLED_MASK11 (DISABLE_RETPOLINE)
    #define DISABLED_MASK12 0
    #define DISABLED_MASK13 0
    #define DISABLED_MASK14 0

    \
     
     \ /
      Last update: 2022-07-12 20:55    [W:4.047 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site