Skip to contentSkip to conversation

printk/tracing: rework console tracing

PATCH In review zhangwei(Jovi) 3 participants 3 messages Mar 4, 2013 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 printk/tracing: rework console tracing

Quoted 1 line

From 0a2bd3ad03fc9acd125f4eeb585a1e09027a182a Mon Sep 17 00:00:00 2001

From: "zhangwei(Jovi)" <[email protected]>
Date: Mon, 4 Mar 2013 17:45:10 +0800
Subject: [PATCH] printk/tracing: rework console tracing

commit 7ff9554bb(printk: convert byte-buffer to variable-length record buffer) removed start and end parameters in call_console_drivers,
but those parameters still exists in include/trace/events/printk.h.

Without start and end parameters handling, printk tracing became more simple as:

    trace_console(text, len);
---
 include/trace/events/printk.h |   25 ++++++-------------------
 kernel/printk.c               |    2 +-
 2 files changed, 7 insertions(+), 20 deletions(-)
include/trace/events/printk.h +6 -19
index 94ec79c..c008bc9 100644
@@ -6,31 +6,18 @@
 
 #include <linux/tracepoint.h>
 
-TRACE_EVENT_CONDITION(console,
-	TP_PROTO(const char *log_buf, unsigned start, unsigned end,
-		 unsigned log_buf_len),
+TRACE_EVENT(console,
+	TP_PROTO(const char *text, size_t len),
 
-	TP_ARGS(log_buf, start, end, log_buf_len),
-
-	TP_CONDITION(start != end),
+	TP_ARGS(text, len),
 
 	TP_STRUCT__entry(
-		__dynamic_array(char, msg, end - start + 1)
+		__dynamic_array(char, msg, len + 1)
 	),
 
 	TP_fast_assign(
-		if ((start & (log_buf_len - 1)) > (end & (log_buf_len - 1))) {
-			memcpy(__get_dynamic_array(msg),
-			       log_buf + (start & (log_buf_len - 1)),
-			       log_buf_len - (start & (log_buf_len - 1)));
-			memcpy((char *)__get_dynamic_array(msg) +
-			       log_buf_len - (start & (log_buf_len - 1)),
-			       log_buf, end & (log_buf_len - 1));
-		} else
-			memcpy(__get_dynamic_array(msg),
-			       log_buf + (start & (log_buf_len - 1)),
-			       end - start);
-		((char *)__get_dynamic_array(msg))[end - start] = 0;
+		memcpy(__get_dynamic_array(msg), text, len);
+		((char *)__get_dynamic_array(msg))[len] = 0;
 	),
 
 	TP_printk("%s", __get_str(msg))
kernel/printk.c +1 -1
index 0b31715..e1c687d 100644
@@ -1266,7 +1266,7 @@ static void call_console_drivers(int level, const char *text, size_t len)
 {
 	struct console *con;
 
-	trace_console(text, 0, len, len);
+	trace_console(text, len);
 
 	if (level >= console_loglevel && !ignore_loglevel)
 		return;
Signature · 1 line
1.7.9.7
Acked-by on v1 1/1
#1 lore raw

2013/3/4 zhangwei(Jovi) <[email protected]>:

Quoted 5 lines

From 0a2bd3ad03fc9acd125f4eeb585a1e09027a182a Mon Sep 17 00:00:00 2001
From: "zhangwei(Jovi)" <[email protected]>
Date: Mon, 4 Mar 2013 17:45:10 +0800
Subject: [PATCH] printk/tracing: rework console tracing

Quoted 8 lines

commit 7ff9554bb(printk: convert byte-buffer to variable-length record buffer) removed start and end parameters in call_console_drivers,
but those parameters still exists in include/trace/events/printk.h.

Without start and end parameters handling, printk tracing became more simple as:

    trace_console(text, len);

Very welcome simplification!

maintainer Acked-by on v1 1/1
#2 lore raw
In reply to zhangwei(Jovi)
Quoted 9 lines · zhangwei(Jovi)
Quoted 1 line

From 0a2bd3ad03fc9acd125f4eeb585a1e09027a182a Mon Sep 17 00:00:00 2001

From: "zhangwei(Jovi)" <[email protected]>
Date: Mon, 4 Mar 2013 17:45:10 +0800
Subject: [PATCH] printk/tracing: rework console tracing

commit 7ff9554bb(printk: convert byte-buffer to variable-length record buffer) removed start and end parameters in call_console_drivers,
but those parameters still exists in include/trace/events/printk.h.

Quoted 5 lines

Without start and end parameters handling, printk tracing became more simple as:

    trace_console(text, len);

---

Who wants to take this? I can pull it into my 3.10 queue if no one else wants to process this.

-- Steve