Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 863d6dcb authored by Waiman Long's avatar Waiman Long Committed by Greg Kroah-Hartman
Browse files

x86/speculation: Change misspelled STIPB to STIBP 



[ 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: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarBorislav 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: default avatarSasha Levin <sashal@kernel.org>
parent 2e4a2d83

arch/x86/kernel/cpu/bugs.c

+3 −3
Original line number Diff line number Diff line
@@ -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))

arch/x86/kernel/process.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

		 */