lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 054/267] x86/speculation: Change misspelled STIPB to STIBP
    Date
    From: Waiman Long <longman@redhat.com>

    [ Upstream commit aa77bfb354c495fc4361199e63fc5765b9e1e783 ]

    STIBP stands for Single Thread Indirect Branch Predictors. The acronym,
    however, can be easily mis-spelled as STIPB. It is perhaps due to the
    presence of another related term - IBPB (Indirect Branch Predictor
    Barrier).

    Fix the mis-spelling in the code.

    Signed-off-by: Waiman Long <longman@redhat.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: David Woodhouse <dwmw@amazon.co.uk>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Jiri Kosina <jkosina@suse.cz>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: KarimAllah Ahmed <karahmed@amazon.de>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Tim Chen <tim.c.chen@linux.intel.com>
    Cc: x86-ml <x86@kernel.org>
    Link: https://lkml.kernel.org/r/1544039368-9009-1-git-send-email-longman@redhat.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kernel/cpu/bugs.c | 6 +++---
    arch/x86/kernel/process.h | 2 +-
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
    index cf07437cd106..0ea87f9095f0 100644
    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -61,7 +61,7 @@ static u64 __ro_after_init x86_spec_ctrl_mask = SPEC_CTRL_IBRS;
    u64 __ro_after_init x86_amd_ls_cfg_base;
    u64 __ro_after_init x86_amd_ls_cfg_ssbd_mask;

    -/* Control conditional STIPB in switch_to() */
    +/* Control conditional STIBP in switch_to() */
    DEFINE_STATIC_KEY_FALSE(switch_to_cond_stibp);
    /* Control conditional IBPB in switch_mm() */
    DEFINE_STATIC_KEY_FALSE(switch_mm_cond_ibpb);
    @@ -750,12 +750,12 @@ spectre_v2_user_select_mitigation(enum spectre_v2_mitigation_cmd v2_cmd)
    "always-on" : "conditional");
    }

    - /* If enhanced IBRS is enabled no STIPB required */
    + /* If enhanced IBRS is enabled no STIBP required */
    if (spectre_v2_enabled == SPECTRE_V2_IBRS_ENHANCED)
    return;

    /*
    - * If SMT is not possible or STIBP is not available clear the STIPB
    + * If SMT is not possible or STIBP is not available clear the STIBP
    * mode.
    */
    if (!smt_possible || !boot_cpu_has(X86_FEATURE_STIBP))
    diff --git a/arch/x86/kernel/process.h b/arch/x86/kernel/process.h
    index 898e97cf6629..320ab978fb1f 100644
    --- a/arch/x86/kernel/process.h
    +++ b/arch/x86/kernel/process.h
    @@ -19,7 +19,7 @@ static inline void switch_to_extra(struct task_struct *prev,
    if (IS_ENABLED(CONFIG_SMP)) {
    /*
    * Avoid __switch_to_xtra() invocation when conditional
    - * STIPB is disabled and the only different bit is
    + * STIBP is disabled and the only different bit is
    * TIF_SPEC_IB. For CONFIG_SMP=n TIF_SPEC_IB is not
    * in the TIF_WORK_CTXSW masks.
    */
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 16:56    [W:3.817 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site