Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1441581

[PATCH RT 09/11] trace: correct off by one while recording the trace-event

From Steven Rostedt <rostedt@goodmis.org>
Newsgroups linux.kernel
Subject [PATCH RT 09/11] trace: correct off by one while recording the trace-event
Date 2016-07-12 19:00 +0200
Message-ID <rU9cn-7AG-51@gated-at.bofh.it> (permalink)
References <rU9cl-7AG-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


3.12.61-rt82-rc1 stable review patch.
If anyone has any objections, please let me know.

------------------

From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

Trace events like raw_syscalls show always a preempt code of one. The
reason is that on PREEMPT kernels rcu_read_lock_sched_notrace()
increases the preemption counter and the function recording the counter
is caller within the RCU section.

Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
[ Changed this to upstream version. See commit e947841c0dce ]
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 include/trace/ftrace.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 645d749d3c9c..1c74dcd4c76e 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -536,6 +536,9 @@ ftrace_raw_event_##call(void *__data, proto)				\
 									\
 	local_save_flags(irq_flags);					\
 	pc = preempt_count();						\
+	/* Account for tracepoint preempt disable */			\
+	if (IS_ENABLED(CONFIG_PREEMPT))					\
+		pc--;							\
 									\
 	__data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
 									\
-- 
2.8.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH RT 00/11] Linux 3.12.61-rt82-rc1 Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  [PATCH RT 10/11] x86: Fix an RT MCE crash Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  [PATCH RT 11/11] Linux 3.12.61-rt82-rc1 Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  [PATCH RT 07/11] locallock: add local_lock_on() Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  [PATCH RT 08/11] mm: perform lru_add_drain_all() remotely Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  [PATCH RT 06/11] arm: lazy preempt: correct resched condition Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  [PATCH RT 09/11] trace: correct off by one while recording the trace-event Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  [PATCH RT 01/11] kvm, rt: change async pagefault code locking for PREEMPT_RT Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  [PATCH RT 03/11] list_bl: fixup bogus lockdep warning Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  [PATCH RT 02/11] net: dev: always take qdiscs busylock in __dev_xmit_skb() Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 19:00 +0200
  Linux 3.12.61-rt82-rc2 Steven Rostedt <rostedt@goodmis.org> - 2016-07-13 01:30 +0200

csiph-web