From: "Paul E. McKenney" <paulmck@kernel.org>
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
rostedt@goodmis.org, Frederic Weisbecker <frederic@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Neeraj Upadhyay <quic_neeraju@quicinc.com>,
Uladzislau Rezki <uladzislau.rezki@sony.com>,
Joel Fernandes <joel@joelfernandes.org>,
Boqun Feng <boqun.feng@gmail.com>,
Nicolas Saenz Julienne <nsaenz@kernel.org>,
Marcelo Tosatti <mtosatti@redhat.com>,
Xiongfeng Wang <wangxiongfeng2@huawei.com>,
Yu Liao <liaoyu15@huawei.com>, Phil Auld <pauld@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Alex Belits <abelits@marvell.com>,
"Paul E . McKenney" <paulmck@kernel.org>
Subject: [PATCH rcu 07/23] context_tracking: Rename context_tracking_enter/exit() to ct_user_enter/exit()
Date: Mon, 20 Jun 2022 16:10:13 -0700 [thread overview]
Message-ID: <20220620231029.3844583-7-paulmck@kernel.org> (raw)
In-Reply-To: <20220620231027.GA3844372@paulmck-ThinkPad-P17-Gen-1>
From: Frederic Weisbecker <frederic@kernel.org>
context_tracking_enter() and context_tracking_exit() have confusing
names that don't explain the fact they are referring to user/guest state.
Use more self-explanatory names and shrink to the new context tracking
prefix instead.
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>
---
include/linux/context_tracking.h | 13 +++++++------
kernel/context_tracking.c | 12 ++++++------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index 69532cd18f72c..7a5f04ae1758f 100644
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -17,21 +17,22 @@ extern void context_tracking_cpu_set(int cpu);
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);
+extern void ct_user_enter(enum ctx_state state);
+extern void ct_user_exit(enum ctx_state state);
+
extern void user_enter_callable(void);
extern void user_exit_callable(void);
static inline void user_enter(void)
{
if (context_tracking_enabled())
- context_tracking_enter(CONTEXT_USER);
+ ct_user_enter(CONTEXT_USER);
}
static inline void user_exit(void)
{
if (context_tracking_enabled())
- context_tracking_exit(CONTEXT_USER);
+ ct_user_exit(CONTEXT_USER);
}
/* Called with interrupts disabled. */
@@ -57,7 +58,7 @@ static inline enum ctx_state exception_enter(void)
prev_ctx = this_cpu_read(context_tracking.state);
if (prev_ctx != CONTEXT_KERNEL)
- context_tracking_exit(prev_ctx);
+ ct_user_exit(prev_ctx);
return prev_ctx;
}
@@ -67,7 +68,7 @@ static inline void exception_exit(enum ctx_state prev_ctx)
if (!IS_ENABLED(CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK) &&
context_tracking_enabled()) {
if (prev_ctx != CONTEXT_KERNEL)
- context_tracking_enter(prev_ctx);
+ ct_user_enter(prev_ctx);
}
}
diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index 9d4a872ca92c4..87454e3515546 100644
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -112,7 +112,7 @@ EXPORT_SYMBOL_GPL(__ct_user_enter);
* or context_tracking_guest_enter(). It should be the arch entry code
* responsibility to call into context tracking with IRQs disabled.
*/
-void context_tracking_enter(enum ctx_state state)
+void ct_user_enter(enum ctx_state state)
{
unsigned long flags;
@@ -131,8 +131,8 @@ void context_tracking_enter(enum ctx_state state)
__ct_user_enter(state);
local_irq_restore(flags);
}
-NOKPROBE_SYMBOL(context_tracking_enter);
-EXPORT_SYMBOL_GPL(context_tracking_enter);
+NOKPROBE_SYMBOL(ct_user_enter);
+EXPORT_SYMBOL_GPL(ct_user_enter);
/**
* user_enter_callable() - Unfortunate ASM callable version of user_enter() for
@@ -197,7 +197,7 @@ EXPORT_SYMBOL_GPL(__ct_user_exit);
* or context_tracking_guest_exit(). It should be the arch entry code
* responsibility to call into context tracking with IRQs disabled.
*/
-void context_tracking_exit(enum ctx_state state)
+void ct_user_exit(enum ctx_state state)
{
unsigned long flags;
@@ -208,8 +208,8 @@ void context_tracking_exit(enum ctx_state state)
__ct_user_exit(state);
local_irq_restore(flags);
}
-NOKPROBE_SYMBOL(context_tracking_exit);
-EXPORT_SYMBOL_GPL(context_tracking_exit);
+NOKPROBE_SYMBOL(ct_user_exit);
+EXPORT_SYMBOL_GPL(ct_user_exit);
/**
* user_exit_callable() - Unfortunate ASM callable version of user_exit() for
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2022-06-20 23:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 23:10 [PATCH rcu 0/23] RCU/context-tracking updates for v5.20 Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 01/23] rcu: Dump rcuc kthread status for CPUs not reporting quiescent state Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 02/23] rcu: Apply noinstr to rcu_idle_enter() and rcu_idle_exit() Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 03/23] context_tracking: Remove unused context_tracking_in_user() Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 04/23] context_tracking: Add a note about noinstr VS unsafe context tracking functions Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 05/23] context_tracking: Rename __context_tracking_enter/exit() to __ct_user_enter/exit() Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 06/23] context_tracking: Rename context_tracking_user_enter/exit() to user_enter/exit_callable() Paul E. McKenney
2022-06-20 23:10 ` Paul E. McKenney [this message]
2022-06-20 23:10 ` [PATCH rcu 08/23] context_tracking: Rename context_tracking_cpu_set() to ct_cpu_track_user() Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 09/23] context_tracking: Split user tracking Kconfig Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 10/23] context_tracking: Take idle eqs entrypoints over RCU Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 11/23] context_tracking: Take IRQ " Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 12/23] context_tracking: Take NMI " Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 13/23] rcu/context-tracking: Remove rcu_irq_enter/exit() Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 14/23] rcu/context_tracking: Move dynticks counter to context tracking Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 15/23] rcu/context_tracking: Move dynticks_nesting " Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 16/23] rcu/context_tracking: Move dynticks_nmi_nesting " Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 17/23] rcu/context-tracking: Move deferred nocb resched " Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 18/23] rcu/context-tracking: Move RCU-dynticks internal functions to context_tracking Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 19/23] rcu/context-tracking: Remove unused and/or unecessary middle functions Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 20/23] context_tracking: Convert state to atomic_t Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 21/23] rcu/context_tracking: Merge dynticks counter and context tracking states Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 22/23] MAINTAINERS: Add Paul as context tracking maintainer Paul E. McKenney
2022-06-20 23:10 ` [PATCH rcu 23/23] context_tracking: Interrupts always disabled for ct_idle_exit() Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220620231029.3844583-7-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=abelits@marvell.com \
--cc=boqun.feng@gmail.com \
--cc=frederic@kernel.org \
--cc=joel@joelfernandes.org \
--cc=kernel-team@fb.com \
--cc=liaoyu15@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=nsaenz@kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=pauld@redhat.com \
--cc=peterz@infradead.org \
--cc=quic_neeraju@quicinc.com \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=uladzislau.rezki@sony.com \
--cc=wangxiongfeng2@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®