Skip to contentSkip to conversation

ftrace: Fix outputting formats of x86-tsc and counter when use trace_clock

PATCH In review Yoshihiro YUNOMAE 2 participants 4 messages Apr 23, 2013 – Jun 11, 2013 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ftrace: Fix outputting formats of x86-tsc and counter when use trace_clock

Outputting formats of x86-tsc and counter should be a raw format, but after applying the patch(2b6080f28c7cc3efc8625ab71495aae89aeb63a0), the format was changed to nanosec. This is because the global variable trace_clock_id was used. When we use multiple buffers, clock_id of each sub-buffer should be used. Then, this patch uses tr->clock_id instead of the global variable trace_clock_id.

Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
---
 kernel/trace/trace.c |    8 +++-----
 kernel/trace/trace.h |    2 --
 2 files changed, 3 insertions(+), 7 deletions(-)
kernel/trace/trace.c +3 -5
index 7297079..2ab9ccb 100644
@@ -652,8 +652,6 @@ static struct {
 	ARCH_TRACE_CLOCKS
 };
 
-int trace_clock_id;
-
 /*
  * trace_parser_get_init - gets the buffer for trace parser
  */
@@ -2815,7 +2813,7 @@ __tracing_open(struct inode *inode, struct file *file, bool snapshot)
 		iter->iter_flags |= TRACE_FILE_ANNOTATE;
 
 	/* Output in nanoseconds only if we are using a clock in nanoseconds. */
-	if (trace_clocks[trace_clock_id].in_ns)
+	if (trace_clocks[tr->clock_id].in_ns)
 		iter->iter_flags |= TRACE_FILE_TIME_IN_NS;
 
 	/* stop the trace while dumping if we are not opening "snapshot" */
@@ -3814,7 +3812,7 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp)
 		iter->iter_flags |= TRACE_FILE_LAT_FMT;
 
 	/* Output in nanoseconds only if we are using a clock in nanoseconds. */
-	if (trace_clocks[trace_clock_id].in_ns)
+	if (trace_clocks[tr->clock_id].in_ns)
 		iter->iter_flags |= TRACE_FILE_TIME_IN_NS;
 
 	iter->cpu_file = tc->cpu;
@@ -5084,7 +5082,7 @@ tracing_stats_read(struct file *filp, char __user *ubuf,
 	cnt = ring_buffer_bytes_cpu(trace_buf->buffer, cpu);
 	trace_seq_printf(s, "bytes: %ld\n", cnt);
 
-	if (trace_clocks[trace_clock_id].in_ns) {
+	if (trace_clocks[tr->clock_id].in_ns) {
 		/* local or global for trace_clock */
 		t = ns2usecs(ring_buffer_oldest_event_ts(trace_buf->buffer, cpu));
 		usec_rem = do_div(t, USEC_PER_SEC);
kernel/trace/trace.h +0 -2
index 9e01458..0ae9e8a 100644
@@ -705,8 +705,6 @@ enum print_line_t print_trace_line(struct trace_iterator *iter);
 
 extern unsigned long trace_flags;
 
-extern int trace_clock_id;
-
 /* Standard output formatting function used for function return traces */
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 
#1 lore raw

Hi,

Would you apply this patch for the tip tree?

Thanks,
Yoshihiro YUNOMAE

Quoted 75 lines · Yoshihiro YUNOMAE

Outputting formats of x86-tsc and counter should be a raw format, but after applying the patch(2b6080f28c7cc3efc8625ab71495aae89aeb63a0), the format was changed to nanosec. This is because the global variable trace_clock_id was used. When we use multiple buffers, clock_id of each sub-buffer should be used. Then, this patch uses tr->clock_id instead of the global variable trace_clock_id.

Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
---
  kernel/trace/trace.c |    8 +++-----
  kernel/trace/trace.h |    2 --
  2 files changed, 3 insertions(+), 7 deletions(-)
kernel/trace/trace.c +3 -5
index 7297079..2ab9ccb 100644
@@ -652,8 +652,6 @@ static struct {
  	ARCH_TRACE_CLOCKS
  };
 
-int trace_clock_id;
-
  /*
   * trace_parser_get_init - gets the buffer for trace parser
   */
@@ -2815,7 +2813,7 @@ __tracing_open(struct inode *inode, struct file *file, bool snapshot)
  		iter->iter_flags |= TRACE_FILE_ANNOTATE;
 
  	/* Output in nanoseconds only if we are using a clock in nanoseconds. */
-	if (trace_clocks[trace_clock_id].in_ns)
+	if (trace_clocks[tr->clock_id].in_ns)
  		iter->iter_flags |= TRACE_FILE_TIME_IN_NS;
 
  	/* stop the trace while dumping if we are not opening "snapshot" */
@@ -3814,7 +3812,7 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp)
  		iter->iter_flags |= TRACE_FILE_LAT_FMT;
 
  	/* Output in nanoseconds only if we are using a clock in nanoseconds. */
-	if (trace_clocks[trace_clock_id].in_ns)
+	if (trace_clocks[tr->clock_id].in_ns)
  		iter->iter_flags |= TRACE_FILE_TIME_IN_NS;
 
  	iter->cpu_file = tc->cpu;
@@ -5084,7 +5082,7 @@ tracing_stats_read(struct file *filp, char __user *ubuf,
  	cnt = ring_buffer_bytes_cpu(trace_buf->buffer, cpu);
  	trace_seq_printf(s, "bytes: %ld\n", cnt);
 
-	if (trace_clocks[trace_clock_id].in_ns) {
+	if (trace_clocks[tr->clock_id].in_ns) {
  		/* local or global for trace_clock */
  		t = ns2usecs(ring_buffer_oldest_event_ts(trace_buf->buffer, cpu));
  		usec_rem = do_div(t, USEC_PER_SEC);
kernel/trace/trace.h +0 -3
index 9e01458..0ae9e8a 100644
@@ -705,8 +705,6 @@ enum print_line_t print_trace_line(struct trace_iterator *iter);
 
  extern unsigned long trace_flags;
 
-extern int trace_clock_id;
-
  /* Standard output formatting function used for function return traces */
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 4 lines
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: [email protected]
#2 lore raw

Hi Steven,

Would you review this bugfix patch?

Thanks,
Yoshihiro YUNOMAE

Quoted 98 lines · Yoshihiro YUNOMAE

Hi,

Would you apply this patch for the tip tree?

Thanks,
Yoshihiro YUNOMAE

Quoted 89 lines · Yoshihiro YUNOMAE

Outputting formats of x86-tsc and counter should be a raw format, but after
applying the patch(2b6080f28c7cc3efc8625ab71495aae89aeb63a0), the format was
changed to nanosec. This is because the global variable trace_clock_id was used.
When we use multiple buffers, clock_id of each sub-buffer should be used. Then,
this patch uses tr->clock_id instead of the global variable trace_clock_id.

Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
---
  kernel/trace/trace.c |    8 +++-----
  kernel/trace/trace.h |    2 --
  2 files changed, 3 insertions(+), 7 deletions(-)
kernel/trace/trace.c +0 -2
index 7297079..2ab9ccb 100644
@@ -652,8 +652,6 @@ static struct {
      ARCH_TRACE_CLOCKS
  };
 
-int trace_clock_id;
-
  /*
   * trace_parser_get_init - gets the buffer for trace parser
   */
@@ -2815,7 +2813,7 @@ __tracing_open(struct inode *inode, struct file
 *file, bool snapshot)
          iter->iter_flags |= TRACE_FILE_ANNOTATE;
 
      /* Output in nanoseconds only if we are using a clock in

nanoseconds. */

kernel/trace/trace.c +1 -1
-    if (trace_clocks[trace_clock_id].in_ns)
+    if (trace_clocks[tr->clock_id].in_ns)
          iter->iter_flags |= TRACE_FILE_TIME_IN_NS;
 
      /* stop the trace while dumping if we are not opening "snapshot" */
@@ -3814,7 +3812,7 @@ static int tracing_open_pipe(struct inode
 *inode, struct file *filp)
          iter->iter_flags |= TRACE_FILE_LAT_FMT;
 
      /* Output in nanoseconds only if we are using a clock in

nanoseconds. */

kernel/trace/trace.c +2 -2
-    if (trace_clocks[trace_clock_id].in_ns)
+    if (trace_clocks[tr->clock_id].in_ns)
          iter->iter_flags |= TRACE_FILE_TIME_IN_NS;
 
      iter->cpu_file = tc->cpu;
@@ -5084,7 +5082,7 @@ tracing_stats_read(struct file *filp, char
 __user *ubuf,
      cnt = ring_buffer_bytes_cpu(trace_buf->buffer, cpu);
      trace_seq_printf(s, "bytes: %ld\n", cnt);
 
-    if (trace_clocks[trace_clock_id].in_ns) {
+    if (trace_clocks[tr->clock_id].in_ns) {
          /* local or global for trace_clock */
          t = ns2usecs(ring_buffer_oldest_event_ts(trace_buf->buffer,
cpu));
          usec_rem = do_div(t, USEC_PER_SEC);
kernel/trace/trace.h +0 -2
index 9e01458..0ae9e8a 100644
@@ -705,8 +705,6 @@ enum print_line_t print_trace_line(struct
 trace_iterator *iter);
 
  extern unsigned long trace_flags;
 
-extern int trace_clock_id;
-
  /* Standard output formatting function used for function return

traces */
#ifdef CONFIG_FUNCTION_GRAPH_TRACER

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 4 lines
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: [email protected]
maintainer
#3 lore raw
Quoted 3 lines · Yoshihiro YUNOMAE

Hi Steven,

Would you review this bugfix patch?

Ah, thanks for the reminder. This got pushed down on my todo list. I'll take a look at it tonight.

-- Steve

Quoted 4 lines

Thanks,
Yoshihiro YUNOMAE