Re: [PATCH 01/19] context_tracking: Rename __context_tracking_enter/exit() to __ct_user_enter/exit()
From: Paul E. McKenney
Date: Thu Mar 10 2022 - 14:28:06 EST
On Wed, Mar 02, 2022 at 04:47:52PM +0100, Frederic Weisbecker wrote:
> 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.
>
> Signed-off-by: Frederic Weisbecker <frederic@xxxxxxxxxx>
Acked-by: Paul E. McKenney <paulmck@xxxxxxxxxx>
> Cc: Paul E. McKenney <paulmck@xxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Neeraj Upadhyay <quic_neeraju@xxxxxxxxxxx>
> Cc: Uladzislau Rezki <uladzislau.rezki@xxxxxxxx>
> Cc: Joel Fernandes <joel@xxxxxxxxxxxxxxxxx>
> Cc: Boqun Feng <boqun.feng@xxxxxxxxx>
> Cc: Nicolas Saenz Julienne <nsaenz@xxxxxxxxxx>
> Cc: Marcelo Tosatti <mtosatti@xxxxxxxxxx>
> Cc: Xiongfeng Wang <wangxiongfeng2@xxxxxxxxxx>
> Cc: Yu Liao<liaoyu15@xxxxxxxxxx>
> Cc: Phil Auld <pauld@xxxxxxxxxx>
> Cc: Paul Gortmaker<paul.gortmaker@xxxxxxxxxxxxx>
> Cc: Alex Belits <abelits@xxxxxxxxxxx>
> ---
> include/linux/context_tracking.h | 12 ++++++------
> kernel/context_tracking.c | 20 ++++++++++----------
> 2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
> index 7a14807c9d1a..773035124bad 100644
> --- a/include/linux/context_tracking.h
> +++ b/include/linux/context_tracking.h
> @@ -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);
> }
>
> /**
> diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
> index 36a98c48aedc..ad2a973393a6 100644
> --- a/kernel/context_tracking.c
> +++ b/kernel/context_tracking.c
> @@ -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);
>
> void context_tracking_enter(enum ctx_state state)
> {
> @@ -119,7 +119,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);
> @@ -132,8 +132,8 @@ void context_tracking_user_enter(void)
> NOKPROBE_SYMBOL(context_tracking_user_enter);
>
> /**
> - * context_tracking_exit - Inform the context tracking that the CPU is
> - * exiting user or guest mode and entering the kernel.
> + * __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
> * guest space before any use of RCU read side critical section. This
> @@ -143,7 +143,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;
> @@ -166,7 +166,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);
>
> void context_tracking_exit(enum ctx_state state)
> {
> @@ -176,7 +176,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);
> --
> 2.25.1
>