From: Joel Fernandes <joel@joelfernandes.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
rostedt@goodmis.org, mingo@kernel.org,
gregkh@linuxfoundation.org, gustavo@embeddedor.com,
tglx@linutronix.de, paulmck@kernel.org, josh@joshtriplett.org,
mathieu.desnoyers@efficios.com, jiangshanlai@gmail.com
Subject: Re: [PATCH v2 1/9] rcu: Rename rcu_irq_{enter,exit}_irqson()
Date: Wed, 12 Feb 2020 17:38:37 -0500 [thread overview]
Message-ID: <20200212223837.GB115917@google.com> (raw)
In-Reply-To: <20200212210749.858223764@infradead.org>
On Wed, Feb 12, 2020 at 10:01:40PM +0100, Peter Zijlstra wrote:
> The functions do in fact use local_irq_{save,restore}() and can
> therefore be used when IRQs are in fact disabled. Worse, they are
> already used in places where IRQs are disabled, leading to great
> confusion when reading the code.
>
> Rename them to fix this confusion.
Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
thanks,
- Joel
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
> include/linux/rcupdate.h | 4 ++--
> include/linux/rcutiny.h | 4 ++--
> include/linux/rcutree.h | 4 ++--
> include/linux/tracepoint.h | 4 ++--
> kernel/cpu_pm.c | 4 ++--
> kernel/rcu/tree.c | 8 ++++----
> kernel/trace/trace.c | 4 ++--
> 7 files changed, 16 insertions(+), 16 deletions(-)
>
> --- a/include/linux/rcupdate.h
> +++ b/include/linux/rcupdate.h
> @@ -120,9 +120,9 @@ static inline void rcu_init_nohz(void) {
> */
> #define RCU_NONIDLE(a) \
> do { \
> - rcu_irq_enter_irqson(); \
> + rcu_irq_enter_irqsave(); \
> do { a; } while (0); \
> - rcu_irq_exit_irqson(); \
> + rcu_irq_exit_irqsave(); \
> } while (0)
>
> /*
> --- a/include/linux/rcutiny.h
> +++ b/include/linux/rcutiny.h
> @@ -68,8 +68,8 @@ static inline int rcu_jiffies_till_stall
> static inline void rcu_idle_enter(void) { }
> static inline void rcu_idle_exit(void) { }
> static inline void rcu_irq_enter(void) { }
> -static inline void rcu_irq_exit_irqson(void) { }
> -static inline void rcu_irq_enter_irqson(void) { }
> +static inline void rcu_irq_exit_irqsave(void) { }
> +static inline void rcu_irq_enter_irqsave(void) { }
> static inline void rcu_irq_exit(void) { }
> static inline void exit_rcu(void) { }
> static inline bool rcu_preempt_need_deferred_qs(struct task_struct *t)
> --- a/include/linux/rcutree.h
> +++ b/include/linux/rcutree.h
> @@ -46,8 +46,8 @@ void rcu_idle_enter(void);
> void rcu_idle_exit(void);
> void rcu_irq_enter(void);
> void rcu_irq_exit(void);
> -void rcu_irq_enter_irqson(void);
> -void rcu_irq_exit_irqson(void);
> +void rcu_irq_enter_irqsave(void);
> +void rcu_irq_exit_irqsave(void);
>
> void exit_rcu(void);
>
> --- a/include/linux/tracepoint.h
> +++ b/include/linux/tracepoint.h
> @@ -181,7 +181,7 @@ static inline struct tracepoint *tracepo
> */ \
> if (rcuidle) { \
> __idx = srcu_read_lock_notrace(&tracepoint_srcu);\
> - rcu_irq_enter_irqson(); \
> + rcu_irq_enter_irqsave(); \
> } \
> \
> it_func_ptr = rcu_dereference_raw((tp)->funcs); \
> @@ -195,7 +195,7 @@ static inline struct tracepoint *tracepo
> } \
> \
> if (rcuidle) { \
> - rcu_irq_exit_irqson(); \
> + rcu_irq_exit_irqsave(); \
> srcu_read_unlock_notrace(&tracepoint_srcu, __idx);\
> } \
> \
> --- a/kernel/cpu_pm.c
> +++ b/kernel/cpu_pm.c
> @@ -24,10 +24,10 @@ static int cpu_pm_notify(enum cpu_pm_eve
> * could be disfunctional in cpu idle. Copy RCU_NONIDLE code to let
> * RCU know this.
> */
> - rcu_irq_enter_irqson();
> + rcu_irq_enter_irqsave();
> ret = __atomic_notifier_call_chain(&cpu_pm_notifier_chain, event, NULL,
> nr_to_call, nr_calls);
> - rcu_irq_exit_irqson();
> + rcu_irq_exit_irqsave();
>
> return notifier_to_errno(ret);
> }
> --- a/kernel/rcu/tree.c
> +++ b/kernel/rcu/tree.c
> @@ -699,10 +699,10 @@ void rcu_irq_exit(void)
> /*
> * Wrapper for rcu_irq_exit() where interrupts are enabled.
> *
> - * If you add or remove a call to rcu_irq_exit_irqson(), be sure to test
> + * If you add or remove a call to rcu_irq_exit_irqsave(), be sure to test
> * with CONFIG_RCU_EQS_DEBUG=y.
> */
> -void rcu_irq_exit_irqson(void)
> +void rcu_irq_exit_irqsave(void)
> {
> unsigned long flags;
>
> @@ -875,10 +875,10 @@ void rcu_irq_enter(void)
> /*
> * Wrapper for rcu_irq_enter() where interrupts are enabled.
> *
> - * If you add or remove a call to rcu_irq_enter_irqson(), be sure to test
> + * If you add or remove a call to rcu_irq_enter_irqsave(), be sure to test
> * with CONFIG_RCU_EQS_DEBUG=y.
> */
> -void rcu_irq_enter_irqson(void)
> +void rcu_irq_enter_irqsave(void)
> {
> unsigned long flags;
>
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -3004,9 +3004,9 @@ void __trace_stack(struct trace_array *t
> if (unlikely(in_nmi()))
> return;
>
> - rcu_irq_enter_irqson();
> + rcu_irq_enter_irqsave();
> __ftrace_trace_stack(buffer, flags, skip, pc, NULL);
> - rcu_irq_exit_irqson();
> + rcu_irq_exit_irqsave();
> }
>
> /**
>
>
next prev parent reply other threads:[~2020-02-12 22:38 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 21:01 [PATCH v2 0/9] tracing vs rcu vs nmi Peter Zijlstra
2020-02-12 21:01 ` [PATCH v2 1/9] rcu: Rename rcu_irq_{enter,exit}_irqson() Peter Zijlstra
2020-02-12 21:01 ` Peter Zijlstra
2020-02-12 22:38 ` Joel Fernandes [this message]
2020-02-12 22:38 ` Joel Fernandes
2020-02-12 21:01 ` [PATCH v2 2/9] rcu: Mark rcu_dynticks_curr_cpu_in_eqs() inline Peter Zijlstra
2020-02-12 21:01 ` Peter Zijlstra
2020-02-12 22:38 ` Joel Fernandes
2020-02-13 1:41 ` Steven Rostedt
2020-02-13 14:25 ` Joel Fernandes
2020-02-12 21:01 ` [PATCH v2 3/9] rcu,tracing: Create trace_rcu_{enter,exit}() Peter Zijlstra
2020-02-12 21:01 ` Peter Zijlstra
2020-02-12 23:20 ` Joel Fernandes
2020-02-13 8:27 ` Peter Zijlstra
2020-02-13 13:31 ` Joel Fernandes
2020-02-13 13:51 ` Paul E. McKenney
2020-02-13 16:40 ` Peter Zijlstra
2020-02-13 18:56 ` Paul E. McKenney
2020-02-13 20:44 ` Joel Fernandes
2020-02-13 20:44 ` Joel Fernandes
2020-02-13 20:54 ` Paul E. McKenney
2020-02-13 21:19 ` Joel Fernandes
2020-02-13 21:38 ` Steven Rostedt
2020-02-13 21:38 ` Steven Rostedt
2020-02-13 21:50 ` Paul E. McKenney
2020-02-13 21:50 ` Paul E. McKenney
2020-02-13 22:04 ` Steven Rostedt
2020-02-13 22:39 ` Paul E. McKenney
2020-02-14 6:19 ` Masami Hiramatsu
2020-02-15 14:59 ` Paul E. McKenney
2020-02-15 14:59 ` Paul E. McKenney
2020-02-17 8:55 ` Masami Hiramatsu
2020-02-17 16:31 ` Paul E. McKenney
2020-02-18 4:33 ` Masami Hiramatsu
2020-02-18 16:12 ` Paul E. McKenney
2020-02-18 16:15 ` Mathieu Desnoyers
2020-02-18 16:35 ` Steven Rostedt
2020-02-18 17:46 ` Steven Rostedt
2020-02-18 17:46 ` Steven Rostedt
2020-02-18 20:18 ` Paul E. McKenney
2020-02-19 2:45 ` Masami Hiramatsu
2020-03-06 18:01 ` Masami Hiramatsu
2020-03-06 18:01 ` Masami Hiramatsu
2020-03-06 18:47 ` Joel Fernandes
2020-03-06 18:47 ` Joel Fernandes
2020-03-06 19:11 ` Joel Fernandes
2020-03-07 1:58 ` Masami Hiramatsu
2020-03-07 1:58 ` Masami Hiramatsu
2020-03-06 0:42 ` Thomas Gleixner
2020-02-13 21:48 ` Paul E. McKenney
2020-02-13 22:58 ` Joel Fernandes
2020-02-13 22:58 ` Joel Fernandes
2020-02-13 23:55 ` Steven Rostedt
2020-02-18 19:58 ` Peter Zijlstra
2020-02-18 19:58 ` Peter Zijlstra
2020-02-18 20:17 ` Paul E. McKenney
2020-02-18 20:40 ` Peter Zijlstra
2020-02-18 21:39 ` Paul E. McKenney
2020-02-19 9:57 ` Peter Zijlstra
2020-02-19 12:46 ` Paul E. McKenney
2020-02-12 23:27 ` Joel Fernandes
2020-02-12 23:27 ` Joel Fernandes
2020-02-13 8:28 ` Peter Zijlstra
2020-02-13 18:39 ` Joel Fernandes
2020-02-12 21:01 ` [PATCH v2 4/9] sched,rcu,tracing: Avoid tracing before in_nmi() is correct Peter Zijlstra
2020-02-12 21:01 ` Peter Zijlstra
2020-02-12 21:01 ` [PATCH v2 5/9] x86,tracing: Add comments to do_nmi() Peter Zijlstra
2020-02-12 21:01 ` [PATCH v2 6/9] perf,tracing: Prepare the perf-trace interface for RCU changes Peter Zijlstra
2020-02-12 21:01 ` Peter Zijlstra
2020-02-12 23:28 ` Joel Fernandes
2020-02-13 8:29 ` Peter Zijlstra
2020-02-13 18:38 ` Joel Fernandes
2020-02-12 21:01 ` [PATCH v2 7/9] tracing: Employ trace_rcu_{enter,exit}() Peter Zijlstra
2020-02-12 21:01 ` Peter Zijlstra
2020-02-12 21:01 ` [PATCH v2 8/9] tracing: Remove regular RCU context for _rcuidle tracepoints (again) Peter Zijlstra
2020-02-12 21:01 ` [PATCH v2 9/9] perf,tracing: Allow function tracing when !RCU Peter Zijlstra
2020-02-14 2:28 ` Sergey Senozhatsky
2020-02-14 2:42 ` Sergey Senozhatsky
2020-02-14 3:32 ` Steven Rostedt
2020-02-14 3:32 ` Steven Rostedt
2020-02-14 20:38 ` Kim Phillips
2020-02-14 22:48 ` Steven Rostedt
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=20200212223837.GB115917@google.com \
--to=joel@joelfernandes.org \
--cc=gregkh@linuxfoundation.org \
--cc=gustavo@embeddedor.com \
--cc=jiangshanlai@gmail.com \
--cc=josh@joshtriplett.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).