From: Frederic Weisbecker <frederic@kernel.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Frederic Weisbecker <frederic@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Phil Auld <pauld@redhat.com>, Alex Belits <abelits@marvell.com>,
Nicolas Saenz Julienne <nsaenz@kernel.org>,
Xiongfeng Wang <wangxiongfeng2@huawei.com>,
Neeraj Upadhyay <quic_neeraju@quicinc.com>,
Thomas Gleixner <tglx@linutronix.de>,
Yu Liao <liaoyu15@huawei.com>, Boqun Feng <boqun.feng@gmail.com>,
"Paul E . McKenney" <paulmck@kernel.org>,
Marcelo Tosatti <mtosatti@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Uladzislau Rezki <uladzislau.rezki@sony.com>,
Joel Fernandes <joel@joelfernandes.org>,
Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH 06/21] context_tracking: Rename context_tracking_enter/exit() to ct_user_enter/exit()
Date: Thu, 19 May 2022 16:58:08 +0200 [thread overview]
Message-ID: <20220519145823.618983-7-frederic@kernel.org> (raw)
In-Reply-To: <20220519145823.618983-1-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: Paul E. McKenney <paulmck@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>
---
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 69532cd18f72..7a5f04ae1758 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 e4e7aad6c2bc..bfbc5d846a62 100644
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -108,7 +108,7 @@ EXPORT_SYMBOL_GPL(__ct_user_enter);
* unsafe because it involves illegal RCU uses through tracing and lockdep. This
* must be fixed first.
*/
-void context_tracking_enter(enum ctx_state state)
+void ct_user_enter(enum ctx_state state)
{
unsigned long flags;
@@ -127,8 +127,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
@@ -186,7 +186,7 @@ EXPORT_SYMBOL_GPL(__ct_user_exit);
* unsafe because it involves illegal RCU uses through tracing and lockdep. This
* must be fixed first.
*/
-void context_tracking_exit(enum ctx_state state)
+void ct_user_exit(enum ctx_state state)
{
unsigned long flags;
@@ -197,8 +197,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.25.1
next prev parent reply other threads:[~2022-05-19 14:59 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 14:58 [PATCH 00/21] rcu/context-tracking: Merge RCU eqs-dynticks counter to context tracking v3 Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 01/21] context_tracking: Remove unused context_tracking_in_user() Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 02/21] rcu: Tag rcu_irq_*_irqson() as noinstr Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 03/21] context_tracking: Add a note about noinstr VS unsafe context tracking functions Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 04/21] context_tracking: Rename __context_tracking_enter/exit() to __ct_user_enter/exit() Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 05/21] context_tracking: Rename context_tracking_user_enter/exit() to user_enter/exit_callable() Frederic Weisbecker
2022-05-19 14:58 ` Frederic Weisbecker [this message]
2022-05-19 14:58 ` [PATCH 07/21] context_tracking: Rename context_tracking_cpu_set() to ct_cpu_track_user() Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 08/21] context_tracking: Split user tracking Kconfig Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 09/21] context_tracking: Take idle eqs entrypoints over RCU Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 10/21] context_tracking: Take IRQ " Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 11/21] context_tracking: Take NMI " Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 12/21] rcu/context-tracking: Remove rcu_irq_enter/exit() Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 13/21] rcu/context_tracking: Move dynticks counter to context tracking Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 14/21] rcu/context_tracking: Move dynticks_nesting " Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 15/21] rcu/context_tracking: Move dynticks_nmi_nesting " Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 16/21] rcu/context-tracking: Move deferred nocb resched " Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 17/21] rcu/context-tracking: Move RCU-dynticks internal functions to context_tracking Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 18/21] rcu/context-tracking: Remove unused and/or unecessary middle functions Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 19/21] context_tracking: Convert state to atomic_t Frederic Weisbecker
2022-05-19 14:58 ` [PATCH 20/21] rcu/context_tracking: Merge dynticks counter and context tracking states Frederic Weisbecker
2022-05-30 18:02 ` nicolas saenz julienne
2022-05-31 14:23 ` Frederic Weisbecker
2022-05-31 16:15 ` nicolas saenz julienne
2022-06-08 14:29 ` Frederic Weisbecker
2022-06-08 17:43 ` nicolas saenz julienne
2022-05-19 14:58 ` [PATCH 21/21] MAINTAINERS: Add Paul as context tracking maintainer Frederic Weisbecker
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=20220519145823.618983-7-frederic@kernel.org \
--to=frederic@kernel.org \
--cc=abelits@marvell.com \
--cc=boqun.feng@gmail.com \
--cc=joel@joelfernandes.org \
--cc=liaoyu15@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mtosatti@redhat.com \
--cc=nsaenz@kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=pauld@redhat.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=quic_neeraju@quicinc.com \
--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