From: Peter Zijlstra <peterz@infradead.org>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
rostedt@goodmis.org
Cc: peterz@infradead.org, mingo@kernel.org, joel@joelfernandes.org,
gregkh@linuxfoundation.org, gustavo@embeddedor.com,
tglx@linutronix.de, paulmck@kernel.org, josh@joshtriplett.org,
mathieu.desnoyers@efficios.com, jiangshanlai@gmail.com,
luto@kernel.org, tony.luck@intel.com, frederic@kernel.org,
dan.carpenter@oracle.com, mhiramat@kernel.org
Subject: [PATCH v3 12/22] tracing: Employ trace_rcu_{enter,exit}()
Date: Wed, 19 Feb 2020 15:47:36 +0100 [thread overview]
Message-ID: <20200219150745.060958307@infradead.org> (raw)
In-Reply-To: 20200219144724.800607165@infradead.org
Replace the opencoded (and incomplete) RCU manipulations with the new
helpers to ensure a regular RCU context when calling into
__ftrace_trace_stack().
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
kernel/trace/trace.c | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2989,24 +2989,11 @@ void __trace_stack(struct trace_array *t
int pc)
{
struct trace_buffer *buffer = tr->array_buffer.buffer;
+ unsigned long rcu_flags;
- if (rcu_is_watching()) {
- __ftrace_trace_stack(buffer, flags, skip, pc, NULL);
- return;
- }
-
- /*
- * When an NMI triggers, RCU is enabled via rcu_nmi_enter(),
- * but if the above rcu_is_watching() failed, then the NMI
- * triggered someplace critical, and rcu_irq_enter() should
- * not be called from NMI.
- */
- if (unlikely(in_nmi()))
- return;
-
- rcu_irq_enter_irqsave();
+ rcu_flags = trace_rcu_enter();
__ftrace_trace_stack(buffer, flags, skip, pc, NULL);
- rcu_irq_exit_irqsave();
+ trace_rcu_exit(rcu_flags);
}
/**
next prev parent reply other threads:[~2020-02-19 15:14 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 14:47 [PATCH v3 00/22] tracing vs world Peter Zijlstra
2020-02-19 14:47 ` [PATCH v3 01/22] hardirq/nmi: Allow nested nmi_enter() Peter Zijlstra
2020-02-19 15:31 ` Steven Rostedt
2020-02-19 16:56 ` Borislav Petkov
2020-02-19 17:07 ` Peter Zijlstra
2020-02-20 8:41 ` Will Deacon
2020-02-20 9:19 ` Marc Zyngier
2020-02-20 13:18 ` Petr Mladek
2020-02-19 14:47 ` [PATCH v3 02/22] x86,mce: Delete ist_begin_non_atomic() Peter Zijlstra
2020-02-19 17:13 ` Borislav Petkov
2020-02-19 17:21 ` Andy Lutomirski
2020-02-19 17:33 ` Peter Zijlstra
2020-02-19 22:12 ` Andy Lutomirski
2020-02-19 22:33 ` Luck, Tony
2020-02-19 22:48 ` Andy Lutomirski
2020-02-20 7:39 ` Peter Zijlstra
2020-02-19 17:42 ` Borislav Petkov
2020-02-19 17:46 ` Peter Zijlstra
2020-02-19 14:47 ` [PATCH v3 03/22] x86: Replace ist_enter() with nmi_enter() Peter Zijlstra
2020-02-20 10:54 ` Borislav Petkov
2020-02-20 12:11 ` Peter Zijlstra
2020-02-19 14:47 ` [PATCH v3 04/22] x86/doublefault: Make memmove() notrace/NOKPROBE Peter Zijlstra
2020-02-19 15:36 ` Steven Rostedt
2020-02-19 15:40 ` Peter Zijlstra
2020-02-19 15:55 ` Steven Rostedt
2020-02-19 15:57 ` Peter Zijlstra
2020-02-19 16:04 ` Peter Zijlstra
2020-02-19 16:12 ` Steven Rostedt
2020-02-19 16:27 ` Paul E. McKenney
2020-02-19 16:34 ` Peter Zijlstra
2020-02-19 16:46 ` Paul E. McKenney
2020-02-19 17:05 ` Steven Rostedt
2020-02-20 12:17 ` Borislav Petkov
2020-02-20 12:37 ` Peter Zijlstra
2020-02-19 15:47 ` Steven Rostedt
2020-02-19 14:47 ` [PATCH v3 05/22] rcu: Make RCU IRQ enter/exit functions rely on in_nmi() Peter Zijlstra
2020-02-19 16:31 ` Paul E. McKenney
2020-02-19 16:37 ` Peter Zijlstra
2020-02-19 16:45 ` Paul E. McKenney
2020-02-19 17:03 ` Peter Zijlstra
2020-02-19 17:42 ` Paul E. McKenney
2020-02-19 17:16 ` [PATCH] rcu/kprobes: Comment why rcu_nmi_enter() is marked NOKPROBE Steven Rostedt
2020-02-19 17:18 ` Joel Fernandes
2020-02-19 17:41 ` Paul E. McKenney
2020-02-20 5:54 ` Masami Hiramatsu
2020-02-19 14:47 ` [PATCH v3 06/22] rcu: Rename rcu_irq_{enter,exit}_irqson() Peter Zijlstra
2020-02-19 16:38 ` Paul E. McKenney
2020-02-19 14:47 ` [PATCH v3 07/22] rcu: Mark rcu_dynticks_curr_cpu_in_eqs() inline Peter Zijlstra
2020-02-19 16:39 ` Paul E. McKenney
2020-02-19 17:19 ` Steven Rostedt
2020-02-19 14:47 ` [PATCH v3 08/22] rcu,tracing: Create trace_rcu_{enter,exit}() Peter Zijlstra
2020-02-19 15:49 ` Steven Rostedt
2020-02-19 15:58 ` Peter Zijlstra
2020-02-19 16:15 ` Steven Rostedt
2020-02-19 16:35 ` Peter Zijlstra
2020-02-19 16:44 ` Paul E. McKenney
2020-02-20 10:34 ` Peter Zijlstra
2020-02-20 13:58 ` Paul E. McKenney
2020-02-19 14:47 ` [PATCH v3 09/22] sched,rcu,tracing: Avoid tracing before in_nmi() is correct Peter Zijlstra
2020-02-19 15:50 ` Steven Rostedt
2020-02-19 15:50 ` Steven Rostedt
2020-02-19 14:47 ` [PATCH v3 10/22] x86,tracing: Add comments to do_nmi() Peter Zijlstra
2020-02-19 15:51 ` Steven Rostedt
2020-02-19 14:47 ` [PATCH v3 11/22] perf,tracing: Prepare the perf-trace interface for RCU changes Peter Zijlstra
2020-02-19 14:47 ` Peter Zijlstra [this message]
2020-02-19 15:52 ` [PATCH v3 12/22] tracing: Employ trace_rcu_{enter,exit}() Steven Rostedt
2020-02-19 14:47 ` [PATCH v3 13/22] tracing: Remove regular RCU context for _rcuidle tracepoints (again) Peter Zijlstra
2020-02-19 15:53 ` Steven Rostedt
2020-02-19 16:43 ` Paul E. McKenney
2020-02-19 16:47 ` Peter Zijlstra
2020-02-19 17:05 ` Peter Zijlstra
2020-02-19 17:21 ` Steven Rostedt
2020-02-19 17:40 ` Paul E. McKenney
2020-02-19 18:00 ` Steven Rostedt
2020-02-19 19:05 ` Paul E. McKenney
2020-02-19 14:47 ` [PATCH v3 14/22] perf,tracing: Allow function tracing when !RCU Peter Zijlstra
2020-02-19 14:47 ` [PATCH v3 15/22] x86/int3: Ensure that poke_int3_handler() is not traced Peter Zijlstra
2020-02-19 14:47 ` [PATCH v3 16/22] locking/atomics, kcsan: Add KCSAN instrumentation Peter Zijlstra
2020-02-19 15:46 ` Steven Rostedt
2020-02-19 16:03 ` Peter Zijlstra
2020-02-19 16:50 ` Paul E. McKenney
2020-02-19 16:54 ` Peter Zijlstra
2020-02-19 17:36 ` Paul E. McKenney
2020-02-19 14:47 ` [PATCH v3 17/22] asm-generic/atomic: Use __always_inline for pure wrappers Peter Zijlstra
2020-02-19 14:47 ` [PATCH v3 18/22] asm-generic/atomic: Use __always_inline for fallback wrappers Peter Zijlstra
2020-02-19 16:55 ` Paul E. McKenney
2020-02-19 17:06 ` Peter Zijlstra
2020-02-19 17:35 ` Paul E. McKenney
2020-02-19 14:47 ` [PATCH v3 19/22] compiler: Simple READ/WRITE_ONCE() implementations Peter Zijlstra
2020-02-19 14:47 ` [PATCH v3 20/22] locking/atomics: Flip fallbacks and instrumentation Peter Zijlstra
2020-02-19 14:47 ` [PATCH v3 21/22] x86/int3: Avoid atomic instrumentation Peter Zijlstra
2020-02-19 14:47 ` [PATCH v3 22/22] x86/int3: Ensure that poke_int3_handler() is not sanitized Peter Zijlstra
2020-02-19 16:06 ` Dmitry Vyukov
2020-02-19 16:30 ` Peter Zijlstra
2020-02-19 16:51 ` Peter Zijlstra
2020-02-19 17:20 ` Peter Zijlstra
2020-02-20 10:37 ` Dmitry Vyukov
2020-02-20 12:06 ` Peter Zijlstra
2020-02-20 16:22 ` Dmitry Vyukov
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=20200219150745.060958307@infradead.org \
--to=peterz@infradead.org \
--cc=dan.carpenter@oracle.com \
--cc=frederic@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=gustavo@embeddedor.com \
--cc=jiangshanlai@gmail.com \
--cc=joel@joelfernandes.org \
--cc=josh@joshtriplett.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.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;
as well as URLs for NNTP newsgroup(s).