From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: [PATCH v4 14/27] perf,tracing: Prepare the perf-trace interface for RCU changes Date: Fri, 21 Feb 2020 14:34:30 +0100 Message-ID: <20200221134215.861984902@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, "Steven Rostedt (VMware)" List-Id: linux-arch.vger.kernel.org The tracepoint interface will stop providing regular RCU context; make sure we do it ourselves, since perf makes use of regular RCU protected data. Suggested-by: Steven Rostedt (VMware) Suggested-by: Mathieu Desnoyers Signed-off-by: Peter Zijlstra (Intel) --- kernel/events/core.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8950,6 +8950,7 @@ void perf_tp_event(u16 event_type, u64 c { struct perf_sample_data data; struct perf_event *event; + int rcu_flags; struct perf_raw_record raw = { .frag = { @@ -8961,6 +8962,8 @@ void perf_tp_event(u16 event_type, u64 c perf_sample_data_init(&data, 0, 0); data.raw = &raw; + rcu_flags = trace_rcu_enter(); + perf_trace_buf_update(record, event_type); hlist_for_each_entry_rcu(event, head, hlist_entry) { @@ -8996,6 +8999,8 @@ void perf_tp_event(u16 event_type, u64 c } perf_swevent_put_recursion_context(rctx); + + trace_rcu_exit(rcu_flags); } EXPORT_SYMBOL_GPL(perf_tp_event); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bombadil.infradead.org ([198.137.202.133]:56316 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728502AbgBUNu1 (ORCPT ); Fri, 21 Feb 2020 08:50:27 -0500 Message-ID: <20200221134215.861984902@infradead.org> Date: Fri, 21 Feb 2020 14:34:30 +0100 From: Peter Zijlstra Subject: [PATCH v4 14/27] perf,tracing: Prepare the perf-trace interface for RCU changes 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, "Steven Rostedt (VMware)" Message-ID: <20200221133430.pBkufRWBCmytRHf4i5DPemuugXRPdYJUQgZSh7RALiY@z> The tracepoint interface will stop providing regular RCU context; make sure we do it ourselves, since perf makes use of regular RCU protected data. Suggested-by: Steven Rostedt (VMware) Suggested-by: Mathieu Desnoyers Signed-off-by: Peter Zijlstra (Intel) --- kernel/events/core.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8950,6 +8950,7 @@ void perf_tp_event(u16 event_type, u64 c { struct perf_sample_data data; struct perf_event *event; + int rcu_flags; struct perf_raw_record raw = { .frag = { @@ -8961,6 +8962,8 @@ void perf_tp_event(u16 event_type, u64 c perf_sample_data_init(&data, 0, 0); data.raw = &raw; + rcu_flags = trace_rcu_enter(); + perf_trace_buf_update(record, event_type); hlist_for_each_entry_rcu(event, head, hlist_entry) { @@ -8996,6 +8999,8 @@ void perf_tp_event(u16 event_type, u64 c } perf_swevent_put_recursion_context(rctx); + + trace_rcu_exit(rcu_flags); } EXPORT_SYMBOL_GPL(perf_tp_event);