Commit 0ffc781a authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Paul E. McKenney
Browse files

context_tracking: Rename __context_tracking_enter/exit() to __ct_user_enter/exit() 



The context tracking namespace is going to expand and some new functions
will require even longer names. Start shrinking the context_tracking
prefix to "ct" as is already the case for some existing macros, this
will make the introduction of new functions easier.

Acked-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Neeraj Upadhyay <quic_neeraju@quicinc.com>
Cc: Uladzislau Rezki <uladzislau.rezki@sony.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Nicolas Saenz Julienne <nsaenz@kernel.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Cc: Yu Liao <liaoyu15@huawei.com>
Cc: Phil Auld <pauld@redhat.com>
Cc: Paul Gortmaker<paul.gortmaker@windriver.com>
Cc: Alex Belits <abelits@marvell.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Reviewed-by: default avatarNicolas Saenz Julienne <nsaenzju@redhat.com>
Tested-by: default avatarNicolas Saenz Julienne <nsaenzju@redhat.com>
parent f67671ba

include/linux/context_tracking.h

+6 −6
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
extern void context_tracking_cpu_set(int cpu);



/* Called with interrupts disabled.  */

extern void __context_tracking_enter(enum ctx_state state);

extern void __context_tracking_exit(enum ctx_state state);

extern void __ct_user_enter(enum ctx_state state);

extern void __ct_user_exit(enum ctx_state state);



extern void context_tracking_enter(enum ctx_state state);

extern void context_tracking_exit(enum ctx_state state);
@@ -38,13 +38,13 @@ static inline void user_exit(void) 
static __always_inline void user_enter_irqoff(void)

{

	if (context_tracking_enabled())

		__context_tracking_enter(CONTEXT_USER);

		__ct_user_enter(CONTEXT_USER);



}

static __always_inline void user_exit_irqoff(void)

{

	if (context_tracking_enabled())

		__context_tracking_exit(CONTEXT_USER);

		__ct_user_exit(CONTEXT_USER);

}



static inline enum ctx_state exception_enter(void)
@@ -74,7 +74,7 @@ static inline void exception_exit(enum ctx_state prev_ctx) 
static __always_inline bool context_tracking_guest_enter(void)

{

	if (context_tracking_enabled())

		__context_tracking_enter(CONTEXT_GUEST);

		__ct_user_enter(CONTEXT_GUEST);



	return context_tracking_enabled_this_cpu();

}
@@ -82,7 +82,7 @@ static __always_inline bool context_tracking_guest_enter(void) 
static __always_inline void context_tracking_guest_exit(void)

{

	if (context_tracking_enabled())

		__context_tracking_exit(CONTEXT_GUEST);

		__ct_user_exit(CONTEXT_GUEST);

}



/**

kernel/context_tracking.c

+10 −10
Original line number Diff line number Diff line
@@ -51,15 +51,15 @@ static __always_inline void context_tracking_recursion_exit(void) 
}



/**

 * context_tracking_enter - Inform the context tracking that the CPU is going

 *                          enter user or guest space mode.

 * __ct_user_enter - Inform the context tracking that the CPU is going

 *		     to enter user or guest space mode.

 *

 * This function must be called right before we switch from the kernel

 * to user or guest space, when it's guaranteed the remaining kernel

 * instructions to execute won't use any RCU read side critical section

 * because this function sets RCU in extended quiescent state.

 */

void noinstr __context_tracking_enter(enum ctx_state state)

void noinstr __ct_user_enter(enum ctx_state state)

{

	/* Kernel threads aren't supposed to go to userspace */

	WARN_ON_ONCE(!current->mm);
@@ -101,7 +101,7 @@ void noinstr __context_tracking_enter(enum ctx_state state) 
	}

	context_tracking_recursion_exit();

}

EXPORT_SYMBOL_GPL(__context_tracking_enter);

EXPORT_SYMBOL_GPL(__ct_user_enter);



/*

 * OBSOLETE:
@@ -128,7 +128,7 @@ void context_tracking_enter(enum ctx_state state) 
		return;



	local_irq_save(flags);

	__context_tracking_enter(state);

	__ct_user_enter(state);

	local_irq_restore(flags);

}

NOKPROBE_SYMBOL(context_tracking_enter);
@@ -149,7 +149,7 @@ void context_tracking_user_enter(void) 
NOKPROBE_SYMBOL(context_tracking_user_enter);



/**

 * context_tracking_exit - Inform the context tracking that the CPU is

 * __ct_user_exit - Inform the context tracking that the CPU is

 *		    exiting user or guest mode and entering the kernel.

 *

 * This function must be called after we entered the kernel from user or
@@ -160,7 +160,7 @@ NOKPROBE_SYMBOL(context_tracking_user_enter); 
 * This call supports re-entrancy. This way it can be called from any exception

 * handler without needing to know if we came from userspace or not.

 */

void noinstr __context_tracking_exit(enum ctx_state state)

void noinstr __ct_user_exit(enum ctx_state state)

{

	if (!context_tracking_recursion_enter())

		return;
@@ -183,7 +183,7 @@ void noinstr __context_tracking_exit(enum ctx_state state) 
	}

	context_tracking_recursion_exit();

}

EXPORT_SYMBOL_GPL(__context_tracking_exit);

EXPORT_SYMBOL_GPL(__ct_user_exit);



/*

 * OBSOLETE:
@@ -202,7 +202,7 @@ void context_tracking_exit(enum ctx_state state) 
		return;



	local_irq_save(flags);

	__context_tracking_exit(state);

	__ct_user_exit(state);

	local_irq_restore(flags);

}

NOKPROBE_SYMBOL(context_tracking_exit);