From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: [PATCH v4 15/27] tracing: Employ trace_rcu_{enter,exit}() Date: Fri, 21 Feb 2020 14:34:31 +0100 Message-ID: <20200221134215.951340533@infradead.org> References: <20200221133416.777099322@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Sender: linux-kernel-owner@vger.kernel.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 List-Id: linux-arch.vger.kernel.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) Reviewed-by: Steven Rostedt (VMware) --- 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; + int 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); } /** From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bombadil.infradead.org ([198.137.202.133]:56324 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728646AbgBUNu1 (ORCPT ); Fri, 21 Feb 2020 08:50:27 -0500 Message-ID: <20200221134215.951340533@infradead.org> Date: Fri, 21 Feb 2020 14:34:31 +0100 From: Peter Zijlstra Subject: [PATCH v4 15/27] tracing: Employ trace_rcu_{enter,exit}() References: <20200221133416.777099322@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-arch-owner@vger.kernel.org List-ID: 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 Message-ID: <20200221133431.PwbAUvqlK3QZ7JXcak19N2mwh_12Ypf45BHykS5ZsGo@z> 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) Reviewed-by: Steven Rostedt (VMware) --- 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; + int 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); } /**