mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Frederic 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: Paul E. McKenney <paulmck@kernel.org>
Reviewed-by: Nicolas Saenz Julienne <nsaenzju@redhat.com>
Tested-by: Nicolas Saenz Julienne <nsaenzju@redhat.com>
This commit is contained in:
Frederic Weisbecker 2022-06-08 16:40:20 +02:00 committed by Paul E. McKenney
parent f67671baad
commit 0ffc781a19
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/linux/context_tracking.h
View File

@ -14,8 +14,8 @@
extern void context_tracking_cpu_set(int cpu); extern void context_tracking_cpu_set(int cpu);
/* Called with interrupts disabled. */ /* Called with interrupts disabled. */
extern void __context_tracking_enter(enum ctx_state state); extern void __ct_user_enter(enum ctx_state state);
extern void __context_tracking_exit(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_enter(enum ctx_state state);
extern void context_tracking_exit(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) static __always_inline void user_enter_irqoff(void)
{ {
if (context_tracking_enabled()) if (context_tracking_enabled())
__context_tracking_enter(CONTEXT_USER); __ct_user_enter(CONTEXT_USER);
} }
static __always_inline void user_exit_irqoff(void) static __always_inline void user_exit_irqoff(void)
{ {
if (context_tracking_enabled()) if (context_tracking_enabled())
__context_tracking_exit(CONTEXT_USER); __ct_user_exit(CONTEXT_USER);
} }
static inline enum ctx_state exception_enter(void) 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) static __always_inline bool context_tracking_guest_enter(void)
{ {
if (context_tracking_enabled()) if (context_tracking_enabled())
__context_tracking_enter(CONTEXT_GUEST); __ct_user_enter(CONTEXT_GUEST);
return context_tracking_enabled_this_cpu(); 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) static __always_inline void context_tracking_guest_exit(void)
{ {
if (context_tracking_enabled()) if (context_tracking_enabled())
__context_tracking_exit(CONTEXT_GUEST); __ct_user_exit(CONTEXT_GUEST);
} }
/** /**

20
kernel/context_tracking.c
View File

@ -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 * __ct_user_enter - Inform the context tracking that the CPU is going
* enter user or guest space mode. * to enter user or guest space mode.
* *
* This function must be called right before we switch from the kernel * This function must be called right before we switch from the kernel
* to user or guest space, when it's guaranteed the remaining 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 * instructions to execute won't use any RCU read side critical section
* because this function sets RCU in extended quiescent state. * 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 */ /* Kernel threads aren't supposed to go to userspace */
WARN_ON_ONCE(!current->mm); WARN_ON_ONCE(!current->mm);
@ -101,7 +101,7 @@ void noinstr __context_tracking_enter(enum ctx_state state)
} }
context_tracking_recursion_exit(); context_tracking_recursion_exit();
} }
EXPORT_SYMBOL_GPL(__context_tracking_enter); EXPORT_SYMBOL_GPL(__ct_user_enter);
/* /*
* OBSOLETE: * OBSOLETE:
@ -128,7 +128,7 @@ void context_tracking_enter(enum ctx_state state)
return; return;
local_irq_save(flags); local_irq_save(flags);
__context_tracking_enter(state); __ct_user_enter(state);
local_irq_restore(flags); local_irq_restore(flags);
} }
NOKPROBE_SYMBOL(context_tracking_enter); NOKPROBE_SYMBOL(context_tracking_enter);
@ -149,8 +149,8 @@ void context_tracking_user_enter(void)
NOKPROBE_SYMBOL(context_tracking_user_enter); 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. * exiting user or guest mode and entering the kernel.
* *
* This function must be called after we entered the kernel from user or * This function must be called after we entered the kernel from user or
* guest space before any use of RCU read side critical section. This * guest space before any use of RCU read side critical section. This
@ -160,7 +160,7 @@ NOKPROBE_SYMBOL(context_tracking_user_enter);
* This call supports re-entrancy. This way it can be called from any exception * 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. * 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()) if (!context_tracking_recursion_enter())
return; return;
@ -183,7 +183,7 @@ void noinstr __context_tracking_exit(enum ctx_state state)
} }
context_tracking_recursion_exit(); context_tracking_recursion_exit();
} }
EXPORT_SYMBOL_GPL(__context_tracking_exit); EXPORT_SYMBOL_GPL(__ct_user_exit);
/* /*
* OBSOLETE: * OBSOLETE:
@ -202,7 +202,7 @@ void context_tracking_exit(enum ctx_state state)
return; return;
local_irq_save(flags); local_irq_save(flags);
__context_tracking_exit(state); __ct_user_exit(state);
local_irq_restore(flags); local_irq_restore(flags);
} }
NOKPROBE_SYMBOL(context_tracking_exit); NOKPROBE_SYMBOL(context_tracking_exit);