ff16701a29
Move the conditional invocation of __switch_to_xtra() into an inline function so the logic can be shared between 32 and 64 bit. Remove the handthrough of the TSS pointer and retrieve the pointer directly in the bitmap handling function. Use this_cpu_ptr() instead of the per_cpu() indirection. This is a preparatory change so integration of conditional indirect branch speculation optimization happens only in one place. 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/20181125185005.280855518@linutronix.de
25 lines
702 B
C
25 lines
702 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
//
|
|
// Code shared between 32 and 64 bit
|
|
|
|
void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p);
|
|
|
|
/*
|
|
* This needs to be inline to optimize for the common case where no extra
|
|
* work needs to be done.
|
|
*/
|
|
static inline void switch_to_extra(struct task_struct *prev,
|
|
struct task_struct *next)
|
|
{
|
|
unsigned long next_tif = task_thread_info(next)->flags;
|
|
unsigned long prev_tif = task_thread_info(prev)->flags;
|
|
|
|
/*
|
|
* __switch_to_xtra() handles debug registers, i/o bitmaps,
|
|
* speculation mitigations etc.
|
|
*/
|
|
if (unlikely(next_tif & _TIF_WORK_CTXSW_NEXT ||
|
|
prev_tif & _TIF_WORK_CTXSW_PREV))
|
|
__switch_to_xtra(prev, next);
|
|
}
|