lkml.org 
[lkml]   [2018]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/pti] x86/speculation: Unify conditional spectre v2 print functions
    Commit-ID:  495d470e9828500e0155027f230449ac5e29c025
    Gitweb: https://git.kernel.org/tip/495d470e9828500e0155027f230449ac5e29c025
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Sun, 25 Nov 2018 19:33:44 +0100
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Wed, 28 Nov 2018 11:57:09 +0100

    x86/speculation: Unify conditional spectre v2 print functions

    There is no point in having two functions and a conditional at the call
    site.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Ingo Molnar <mingo@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Jiri Kosina <jkosina@suse.cz>
    Cc: Tom Lendacky <thomas.lendacky@amd.com>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Cc: David Woodhouse <dwmw@amazon.co.uk>
    Cc: Tim Chen <tim.c.chen@linux.intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Dave Hansen <dave.hansen@intel.com>
    Cc: Casey Schaufler <casey.schaufler@intel.com>
    Cc: Asit Mallick <asit.k.mallick@intel.com>
    Cc: Arjan van de Ven <arjan@linux.intel.com>
    Cc: Jon Masters <jcm@redhat.com>
    Cc: Waiman Long <longman9394@gmail.com>
    Cc: Greg KH <gregkh@linuxfoundation.org>
    Cc: Dave Stewart <david.c.stewart@intel.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: stable@vger.kernel.org
    Link: https://lkml.kernel.org/r/20181125185004.986890749@linutronix.de


    ---
    arch/x86/kernel/cpu/bugs.c | 17 ++++-------------
    1 file changed, 4 insertions(+), 13 deletions(-)

    diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
    index 9279cbabe16e..4f5a6319dca6 100644
    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -257,15 +257,9 @@ static const struct {
    { "auto", SPECTRE_V2_CMD_AUTO, false },
    };

    -static void __init spec2_print_if_insecure(const char *reason)
    +static void __init spec_v2_print_cond(const char *reason, bool secure)
    {
    - if (boot_cpu_has_bug(X86_BUG_SPECTRE_V2))
    - pr_info("%s selected on command line.\n", reason);
    -}
    -
    -static void __init spec2_print_if_secure(const char *reason)
    -{
    - if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V2))
    + if (boot_cpu_has_bug(X86_BUG_SPECTRE_V2) != secure)
    pr_info("%s selected on command line.\n", reason);
    }

    @@ -309,11 +303,8 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)
    return SPECTRE_V2_CMD_AUTO;
    }

    - if (mitigation_options[i].secure)
    - spec2_print_if_secure(mitigation_options[i].option);
    - else
    - spec2_print_if_insecure(mitigation_options[i].option);
    -
    + spec_v2_print_cond(mitigation_options[i].option,
    + mitigation_options[i].secure);
    return cmd;
    }

    \
     
     \ /
      Last update: 2018-11-28 15:31    [W:4.308 / U:2.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site