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

Commit f70cd6b0 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

context_tracking: remove duplicate enabled check 



All calls to context_tracking_enter and context_tracking_exit
are already checking context_tracking_is_enabled, except the
context_tracking_user_enter and context_tracking_user_exit
functions left in for the benefit of assembly calls.

Pull the check up to those functions, by making them simple
wrappers around the user_enter and user_exit inline functions.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Tested-by: default avatarRik van Riel <riel@redhat.com>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8cfe9866

include/linux/context_tracking.h

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ extern void context_tracking_user_exit(void); 
static inline void user_enter(void)

{

	if (context_tracking_is_enabled())

		context_tracking_user_enter();

		context_tracking_enter(CONTEXT_USER);



}

static inline void user_exit(void)

{

	if (context_tracking_is_enabled())

		context_tracking_user_exit();

		context_tracking_exit(CONTEXT_USER);

}



static inline enum ctx_state exception_enter(void)

kernel/context_tracking.c

+2 −14
Original line number Diff line number Diff line
@@ -62,15 +62,6 @@ void context_tracking_enter(enum ctx_state state) 
{

	unsigned long flags;



	/*

	 * Repeat the user_enter() check here because some archs may be calling

	 * this from asm and if no CPU needs context tracking, they shouldn't

	 * go further. Repeat the check here until they support the inline static

	 * key check.

	 */

	if (!context_tracking_is_enabled())

		return;



	/*

	 * Some contexts may involve an exception occuring in an irq,

	 * leading to that nesting:
@@ -128,7 +119,7 @@ EXPORT_SYMBOL_GPL(context_tracking_enter); 


void context_tracking_user_enter(void)

{

	context_tracking_enter(CONTEXT_USER);

	user_enter();

}

NOKPROBE_SYMBOL(context_tracking_user_enter);
@@ -148,9 +139,6 @@ void context_tracking_exit(enum ctx_state state) 
{

	unsigned long flags;



	if (!context_tracking_is_enabled())

		return;



	if (in_interrupt())

		return;
@@ -181,7 +169,7 @@ EXPORT_SYMBOL_GPL(context_tracking_exit); 


void context_tracking_user_exit(void)

{

	context_tracking_exit(CONTEXT_USER);

	user_exit();

}

NOKPROBE_SYMBOL(context_tracking_user_exit);