Skip to contentSkip to conversation

TSC trace_clock

PATCH Superseded David Sharp 5 participants 18 messages Oct 11, 2012 – Nov 14, 2012

Subsystems (20)
Arm (32-bit) x86 PowerPC MIPS +16 more subsystems

v6 of 9 Superseded Latest is v9 →

lore
Share & tools
lore

David Sharp

author
#0 lore raw

v6 cover TSC trace_clock

Added Yoshihiro Yonomae's patches to change the per_cpu stats to show raw timestamps when the clock is not in nanoseconds.

Also added a small patch to fix a warning.

David Sharp (4):
tracing,x86: Add a TSC trace_clock
tracing: Reset ring buffer when changing trace_clocks
tracing: Format non-nanosec times from tsc clock without a decimal
point.
tracing: Fix maybe-uninitialized warning in
ftrace_function_set_regexp

Yoshihiro YUNOMAE (2):
ftrace: Change unsigned long type of ring_buffer_oldest_event_ts() to

    u64

ftrace: Show raw time stamp on stats per cpu using counter or tsc
mode for trace_clock

 arch/alpha/include/asm/trace_clock.h      |    6 ++
 arch/arm/include/asm/trace_clock.h        |    6 ++
 arch/avr32/include/asm/trace_clock.h      |    6 ++
 arch/blackfin/include/asm/trace_clock.h   |    6 ++
 arch/c6x/include/asm/trace_clock.h        |    6 ++
 arch/cris/include/asm/trace_clock.h       |    6 ++
 arch/frv/include/asm/trace_clock.h        |    6 ++
 arch/h8300/include/asm/trace_clock.h      |    6 ++
 arch/hexagon/include/asm/trace_clock.h    |    6 ++
 arch/ia64/include/asm/trace_clock.h       |    6 ++
 arch/m32r/include/asm/trace_clock.h       |    6 ++
 arch/m68k/include/asm/trace_clock.h       |    6 ++
 arch/microblaze/include/asm/trace_clock.h |    6 ++
 arch/mips/include/asm/trace_clock.h       |    6 ++
 arch/mn10300/include/asm/trace_clock.h    |    6 ++
 arch/openrisc/include/asm/trace_clock.h   |    6 ++
 arch/parisc/include/asm/trace_clock.h     |    6 ++
 arch/powerpc/include/asm/trace_clock.h    |    6 ++
 arch/s390/include/asm/trace_clock.h       |    6 ++
 arch/score/include/asm/trace_clock.h      |    6 ++
 arch/sh/include/asm/trace_clock.h         |    6 ++
 arch/sparc/include/asm/trace_clock.h      |    6 ++
 arch/tile/include/asm/trace_clock.h       |    6 ++
 arch/um/include/asm/trace_clock.h         |    6 ++
 arch/unicore32/include/asm/trace_clock.h  |    6 ++
 arch/x86/include/asm/trace_clock.h        |   16 ++++++
 arch/x86/kernel/Makefile                  |    1 +
 arch/x86/kernel/trace_clock.c             |   21 ++++++++
 arch/xtensa/include/asm/trace_clock.h     |    6 ++
 include/asm-generic/trace_clock.h         |   16 ++++++
 include/linux/ftrace_event.h              |    6 ++
 include/linux/ring_buffer.h               |    2 +-
 include/linux/trace_clock.h               |    2 +
 kernel/trace/ring_buffer.c                |    4 +-
 kernel/trace/trace.c                      |   47 ++++++++++++++---
 kernel/trace/trace.h                      |    4 --
 kernel/trace/trace_events_filter.c        |    3 +-
 kernel/trace/trace_output.c               |   80 ++++++++++++++++++++---------
 38 files changed, 316 insertions(+), 42 deletions(-)
 create mode 100644 arch/alpha/include/asm/trace_clock.h
 create mode 100644 arch/arm/include/asm/trace_clock.h
 create mode 100644 arch/avr32/include/asm/trace_clock.h
 create mode 100644 arch/blackfin/include/asm/trace_clock.h
 create mode 100644 arch/c6x/include/asm/trace_clock.h
 create mode 100644 arch/cris/include/asm/trace_clock.h
 create mode 100644 arch/frv/include/asm/trace_clock.h
 create mode 100644 arch/h8300/include/asm/trace_clock.h
 create mode 100644 arch/hexagon/include/asm/trace_clock.h
 create mode 100644 arch/ia64/include/asm/trace_clock.h
 create mode 100644 arch/m32r/include/asm/trace_clock.h
 create mode 100644 arch/m68k/include/asm/trace_clock.h
 create mode 100644 arch/microblaze/include/asm/trace_clock.h
 create mode 100644 arch/mips/include/asm/trace_clock.h
 create mode 100644 arch/mn10300/include/asm/trace_clock.h
 create mode 100644 arch/openrisc/include/asm/trace_clock.h
 create mode 100644 arch/parisc/include/asm/trace_clock.h
 create mode 100644 arch/powerpc/include/asm/trace_clock.h
 create mode 100644 arch/s390/include/asm/trace_clock.h
 create mode 100644 arch/score/include/asm/trace_clock.h
 create mode 100644 arch/sh/include/asm/trace_clock.h
 create mode 100644 arch/sparc/include/asm/trace_clock.h
 create mode 100644 arch/tile/include/asm/trace_clock.h
 create mode 100644 arch/um/include/asm/trace_clock.h
 create mode 100644 arch/unicore32/include/asm/trace_clock.h
 create mode 100644 arch/x86/include/asm/trace_clock.h
 create mode 100644 arch/x86/kernel/trace_clock.c
 create mode 100644 arch/xtensa/include/asm/trace_clock.h
 create mode 100644 include/asm-generic/trace_clock.h
Signature · 1 line
1.7.7.3
author
#1 lore raw

PATCH v6 1/6 tracing,x86: Add a TSC trace_clock

In order to promote interoperability between userspace tracers and ftrace, add a trace_clock that reports raw TSC values which will then be recorded in the ring buffer. Userspace tracers that also record TSCs are then on exactly the same time base as the kernel and events can be unambiguously interlaced.

Tested: Enabled a tracepoint and the "tsc" trace_clock and saw very large timestamp values.

v2:
Move arch-specific bits out of generic code.
v3:
Rename "x86-tsc", cleanups

Google-Bug-Id: 6980623

Signed-off-by David Sharp <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Acked-by Ingo Molnar <[email protected]>
---
 arch/alpha/include/asm/trace_clock.h      |    6 ++++++
 arch/arm/include/asm/trace_clock.h        |    6 ++++++
 arch/avr32/include/asm/trace_clock.h      |    6 ++++++
 arch/blackfin/include/asm/trace_clock.h   |    6 ++++++
 arch/c6x/include/asm/trace_clock.h        |    6 ++++++
 arch/cris/include/asm/trace_clock.h       |    6 ++++++
 arch/frv/include/asm/trace_clock.h        |    6 ++++++
 arch/h8300/include/asm/trace_clock.h      |    6 ++++++
 arch/hexagon/include/asm/trace_clock.h    |    6 ++++++
 arch/ia64/include/asm/trace_clock.h       |    6 ++++++
 arch/m32r/include/asm/trace_clock.h       |    6 ++++++
 arch/m68k/include/asm/trace_clock.h       |    6 ++++++
 arch/microblaze/include/asm/trace_clock.h |    6 ++++++
 arch/mips/include/asm/trace_clock.h       |    6 ++++++
 arch/mn10300/include/asm/trace_clock.h    |    6 ++++++
 arch/openrisc/include/asm/trace_clock.h   |    6 ++++++
 arch/parisc/include/asm/trace_clock.h     |    6 ++++++
 arch/powerpc/include/asm/trace_clock.h    |    6 ++++++
 arch/s390/include/asm/trace_clock.h       |    6 ++++++
 arch/score/include/asm/trace_clock.h      |    6 ++++++
 arch/sh/include/asm/trace_clock.h         |    6 ++++++
 arch/sparc/include/asm/trace_clock.h      |    6 ++++++
 arch/tile/include/asm/trace_clock.h       |    6 ++++++
 arch/um/include/asm/trace_clock.h         |    6 ++++++
 arch/unicore32/include/asm/trace_clock.h  |    6 ++++++
 arch/x86/include/asm/trace_clock.h        |   16 ++++++++++++++++
 arch/x86/kernel/Makefile                  |    1 +
 arch/x86/kernel/trace_clock.c             |   21 +++++++++++++++++++++
 arch/xtensa/include/asm/trace_clock.h     |    6 ++++++
 include/asm-generic/trace_clock.h         |   16 ++++++++++++++++
 include/linux/trace_clock.h               |    2 ++
 kernel/trace/trace.c                      |    1 +
 32 files changed, 213 insertions(+), 0 deletions(-)
 create mode 100644 arch/alpha/include/asm/trace_clock.h
 create mode 100644 arch/arm/include/asm/trace_clock.h
 create mode 100644 arch/avr32/include/asm/trace_clock.h
 create mode 100644 arch/blackfin/include/asm/trace_clock.h
 create mode 100644 arch/c6x/include/asm/trace_clock.h
 create mode 100644 arch/cris/include/asm/trace_clock.h
 create mode 100644 arch/frv/include/asm/trace_clock.h
 create mode 100644 arch/h8300/include/asm/trace_clock.h
 create mode 100644 arch/hexagon/include/asm/trace_clock.h
 create mode 100644 arch/ia64/include/asm/trace_clock.h
 create mode 100644 arch/m32r/include/asm/trace_clock.h
 create mode 100644 arch/m68k/include/asm/trace_clock.h
 create mode 100644 arch/microblaze/include/asm/trace_clock.h
 create mode 100644 arch/mips/include/asm/trace_clock.h
 create mode 100644 arch/mn10300/include/asm/trace_clock.h
 create mode 100644 arch/openrisc/include/asm/trace_clock.h
 create mode 100644 arch/parisc/include/asm/trace_clock.h
 create mode 100644 arch/powerpc/include/asm/trace_clock.h
 create mode 100644 arch/s390/include/asm/trace_clock.h
 create mode 100644 arch/score/include/asm/trace_clock.h
 create mode 100644 arch/sh/include/asm/trace_clock.h
 create mode 100644 arch/sparc/include/asm/trace_clock.h
 create mode 100644 arch/tile/include/asm/trace_clock.h
 create mode 100644 arch/um/include/asm/trace_clock.h
 create mode 100644 arch/unicore32/include/asm/trace_clock.h
 create mode 100644 arch/x86/include/asm/trace_clock.h
 create mode 100644 arch/x86/kernel/trace_clock.c
 create mode 100644 arch/xtensa/include/asm/trace_clock.h
 create mode 100644 include/asm-generic/trace_clock.h
arch/alpha/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/arm/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/avr32/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/blackfin/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/c6x/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/cris/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/frv/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/h8300/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/hexagon/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/ia64/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/m32r/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/m68k/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/microblaze/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/mips/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/mn10300/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/openrisc/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/parisc/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/powerpc/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/s390/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/score/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/sh/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/sparc/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/tile/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/um/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/unicore32/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
arch/x86/include/asm/trace_clock.h new file +16 -0
new file mode 100644
index 0000000..7ee0d8c
@@ -0,0 +1,16 @@
+#ifndef _ASM_X86_TRACE_CLOCK_H
+#define _ASM_X86_TRACE_CLOCK_H
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+#ifdef CONFIG_X86_TSC
+
+extern u64 notrace trace_clock_x86_tsc(void);
+
+# define ARCH_TRACE_CLOCKS \
+	{ trace_clock_x86_tsc,	"x86-tsc" },
+
+#endif
+
+#endif  /* _ASM_X86_TRACE_CLOCK_H */
arch/x86/kernel/Makefile +1 -0
index 8215e56..0ee9344 100644
@@ -62,6 +62,7 @@ obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups_32.o
 obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
 obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o
+obj-$(CONFIG_X86_TSC)		+= trace_clock.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o
 obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o
arch/x86/kernel/trace_clock.c new file +21 -0
new file mode 100644
index 0000000..25b9937
@@ -0,0 +1,21 @@
+/*
+ * X86 trace clocks
+ */
+#include <asm/trace_clock.h>
+#include <asm/barrier.h>
+#include <asm/msr.h>
+
+/*
+ * trace_clock_x86_tsc(): A clock that is just the cycle counter.
+ *
+ * Unlike the other clocks, this is not in nanoseconds.
+ */
+u64 notrace trace_clock_x86_tsc(void)
+{
+	u64 ret;
+
+	rdtsc_barrier();
+	rdtscll(ret);
+
+	return ret;
+}
arch/xtensa/include/asm/trace_clock.h new file +6 -0
new file mode 100644
index 0000000..f35fab8
@@ -0,0 +1,6 @@
+#ifndef _ASM_TRACE_CLOCK_H
+#define _ASM_TRACE_CLOCK_H
+
+#include <asm-generic/trace_clock.h>
+
+#endif
include/asm-generic/trace_clock.h new file +16 -0
new file mode 100644
index 0000000..6726f1b
@@ -0,0 +1,16 @@
+#ifndef _ASM_GENERIC_TRACE_CLOCK_H
+#define _ASM_GENERIC_TRACE_CLOCK_H
+/*
+ * Arch-specific trace clocks.
+ */
+
+/*
+ * Additional trace clocks added to the trace_clocks
+ * array in kernel/trace/trace.c
+ * None if the architecture has not defined it.
+ */
+#ifndef ARCH_TRACE_CLOCKS
+# define ARCH_TRACE_CLOCKS
+#endif
+
+#endif  /* _ASM_GENERIC_TRACE_CLOCK_H */
include/linux/trace_clock.h +2 -0
index 4eb4902..d563f37 100644
@@ -12,6 +12,8 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 
+#include <asm/trace_clock.h>
+
 extern u64 notrace trace_clock_local(void);
 extern u64 notrace trace_clock(void);
 extern u64 notrace trace_clock_global(void);
kernel/trace/trace.c +1 -0
index 5c38c81..92fb08e 100644
@@ -480,6 +480,7 @@ static struct {
 	{ trace_clock_local,	"local" },
 	{ trace_clock_global,	"global" },
 	{ trace_clock_counter,	"counter" },
+	ARCH_TRACE_CLOCKS
 };
 
 int trace_clock_id;
Signature · 1 line
1.7.7.3
maintainer
#2 lore raw

Re: [PATCH v6 1/6] tracing,x86: Add a TSC trace_clock

Quoted 1 line · David Sharp

+#include <asm-generic/trace_clock.h>

Please use the Kbuild infrastructure ("generic-y += ..." in arch/*/include/asm/Kbuild)
instead of adding wrappers around the asm-generic version.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

maintainer
#3 lore raw

Re: [PATCH v6 1/6] tracing,x86: Add a TSC trace_clock

Quoted 6 lines · Geert Uytterhoeven
Quoted 1 line · David Sharp

+#include <asm-generic/trace_clock.h>

Please use the Kbuild infrastructure ("generic-y += ..." in arch/*/include/asm/Kbuild)
instead of adding wrappers around the asm-generic version.

So that's how that's done. Learn something new everyday. Too bad the one file I checked (div64.h) doesn't seem to do it for ia64 and others.

Can we please have someone clean up all the archs and remove any *.h wrappers and use the kbuild infrastructure instead. That way, when another developer goes to look at how this is done, they wont copy the wrong method again. (Maybe I'll just do it :-p)

David,

Can you just send an update of this one patch.

Thanks,

-- Steve

author
#4 lore raw

Re: [PATCH v6 1/6] tracing,x86: Add a TSC trace_clock

Quoted 11 lines · Steven Rostedt
Quoted 6 lines · Geert Uytterhoeven
Quoted 1 line · David Sharp

+#include <asm-generic/trace_clock.h>

Please use the Kbuild infrastructure ("generic-y += ..." in arch/*/include/asm/Kbuild)
instead of adding wrappers around the asm-generic version.

So that's how that's done. Learn something new everyday. Too bad the one file I checked (div64.h) doesn't seem to do it for ia64 and others.

Quoted 8 lines

Can we please have someone clean up all the archs and remove any *.h wrappers and use the kbuild infrastructure instead. That way, when another developer goes to look at how this is done, they wont copy the wrong method again. (Maybe I'll just do it :-p)

David,

Can you just send an update of this one patch.

Will do. Thanks for the education, Geert. :)

d#

author
#5 lore raw

PATCH v7 1/5 tracing,x86: Add a TSC trace_clock

In reply to Steven Rostedt

In order to promote interoperability between userspace tracers and ftrace, add a trace_clock that reports raw TSC values which will then be recorded in the ring buffer. Userspace tracers that also record TSCs are then on exactly the same time base as the kernel and events can be unambiguously interlaced.

Tested: Enabled a tracepoint and the "tsc" trace_clock and saw very large timestamp values.

v2:
Move arch-specific bits out of generic code.
v3:
Rename "x86-tsc", cleanups
v7:
Generic arch bits in Kbuild.

Google-Bug-Id: 6980623

Signed-off-by David Sharp <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Acked-by Ingo Molnar <[email protected]>
---
 arch/alpha/include/asm/Kbuild      |    1 +
 arch/arm/include/asm/Kbuild        |    1 +
 arch/arm64/include/asm/Kbuild      |    1 +
 arch/avr32/include/asm/Kbuild      |    1 +
 arch/blackfin/include/asm/Kbuild   |    1 +
 arch/c6x/include/asm/Kbuild        |    1 +
 arch/cris/include/asm/Kbuild       |    1 +
 arch/frv/include/asm/Kbuild        |    1 +
 arch/h8300/include/asm/Kbuild      |    1 +
 arch/hexagon/include/asm/Kbuild    |    1 +
 arch/ia64/include/asm/Kbuild       |    1 +
 arch/m32r/include/asm/Kbuild       |    1 +
 arch/m68k/include/asm/Kbuild       |    1 +
 arch/microblaze/include/asm/Kbuild |    1 +
 arch/mips/include/asm/Kbuild       |    1 +
 arch/mn10300/include/asm/Kbuild    |    1 +
 arch/openrisc/include/asm/Kbuild   |    1 +
 arch/parisc/include/asm/Kbuild     |    1 +
 arch/powerpc/include/asm/Kbuild    |    1 +
 arch/s390/include/asm/Kbuild       |    1 +
 arch/score/include/asm/Kbuild      |    1 +
 arch/sh/include/asm/Kbuild         |    1 +
 arch/sparc/include/asm/Kbuild      |    1 +
 arch/tile/include/asm/Kbuild       |    1 +
 arch/um/include/asm/Kbuild         |    1 +
 arch/unicore32/include/asm/Kbuild  |    1 +
 arch/x86/include/asm/trace_clock.h |   16 ++++++++++++++++
 arch/x86/kernel/Makefile           |    1 +
 arch/x86/kernel/trace_clock.c      |   21 +++++++++++++++++++++
 arch/xtensa/include/asm/Kbuild     |    1 +
 include/asm-generic/trace_clock.h  |   16 ++++++++++++++++
 include/linux/trace_clock.h        |    2 ++
 kernel/trace/trace.c               |    1 +
 33 files changed, 84 insertions(+), 0 deletions(-)
 create mode 100644 arch/x86/include/asm/trace_clock.h
 create mode 100644 arch/x86/kernel/trace_clock.c
 create mode 100644 include/asm-generic/trace_clock.h
arch/alpha/include/asm/Kbuild +1 -0
index 64ffc9e..dcfabb9 100644
@@ -11,3 +11,4 @@ header-y += reg.h
 header-y += regdef.h
 header-y += sysinfo.h
 generic-y += exec.h
+generic-y += trace_clock.h
arch/arm/include/asm/Kbuild +1 -0
index f70ae17..514e398 100644
@@ -31,5 +31,6 @@ generic-y += sockios.h
 generic-y += termbits.h
 generic-y += termios.h
 generic-y += timex.h
+generic-y += trace_clock.h
 generic-y += types.h
 generic-y += unaligned.h
arch/arm64/include/asm/Kbuild +1 -0
index fe77e51..53a535a 100644
@@ -44,6 +44,7 @@ generic-y += swab.h
 generic-y += termbits.h
 generic-y += termios.h
 generic-y += topology.h
+generic-y += trace_clock.h
 generic-y += types.h
 generic-y += unaligned.h
 generic-y += user.h
arch/avr32/include/asm/Kbuild +1 -0
index 4807ded..4dd4f78 100644
@@ -1,3 +1,4 @@
 
 generic-y	+= clkdev.h
 generic-y	+= exec.h
+generic-y	+= trace_clock.h
arch/blackfin/include/asm/Kbuild +1 -0
index 5a0625a..27d7075 100644
@@ -38,6 +38,7 @@ generic-y += statfs.h
 generic-y += termbits.h
 generic-y += termios.h
 generic-y += topology.h
+generic-y += trace_clock.h
 generic-y += types.h
 generic-y += ucontext.h
 generic-y += unaligned.h
arch/c6x/include/asm/Kbuild +1 -0
index 112a496..eae7b59 100644
@@ -49,6 +49,7 @@ generic-y += termbits.h
 generic-y += termios.h
 generic-y += tlbflush.h
 generic-y += topology.h
+generic-y += trace_clock.h
 generic-y += types.h
 generic-y += ucontext.h
 generic-y += user.h
arch/cris/include/asm/Kbuild +1 -0
index 6d43a95..15a122c 100644
@@ -11,3 +11,4 @@ header-y += sync_serial.h
 generic-y += clkdev.h
 generic-y += exec.h
 generic-y += module.h
+generic-y += trace_clock.h
arch/frv/include/asm/Kbuild +1 -0
index 4a159da..c5d7670 100644
@@ -1,3 +1,4 @@
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += trace_clock.h
arch/h8300/include/asm/Kbuild +1 -0
index 50bbf38..4bc8ae7 100644
@@ -3,3 +3,4 @@ include include/asm-generic/Kbuild.asm
 generic-y += clkdev.h
 generic-y += exec.h
 generic-y += module.h
+generic-y += trace_clock.h
arch/hexagon/include/asm/Kbuild +1 -0
index 3364b696..c267595 100644
@@ -51,6 +51,7 @@ generic-y += stat.h
 generic-y += termbits.h
 generic-y += termios.h
 generic-y += topology.h
+generic-y += trace_clock.h
 generic-y += types.h
 generic-y += ucontext.h
 generic-y += unaligned.h
arch/ia64/include/asm/Kbuild +1 -0
index 4a159da..c5d7670 100644
@@ -1,3 +1,4 @@
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += trace_clock.h
arch/m32r/include/asm/Kbuild +1 -0
index 50bbf38..4bc8ae7 100644
@@ -3,3 +3,4 @@ include include/asm-generic/Kbuild.asm
 generic-y += clkdev.h
 generic-y += exec.h
 generic-y += module.h
+generic-y += trace_clock.h
arch/m68k/include/asm/Kbuild +1 -0
index ecb5408..fc347b6 100644
@@ -26,6 +26,7 @@ generic-y += sections.h
 generic-y += siginfo.h
 generic-y += statfs.h
 generic-y += topology.h
+generic-y += trace_clock.h
 generic-y += types.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
arch/microblaze/include/asm/Kbuild +1 -0
index 8653072..2957fcc 100644
@@ -3,3 +3,4 @@ include include/asm-generic/Kbuild.asm
 header-y  += elf.h
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += trace_clock.h
arch/mips/include/asm/Kbuild +1 -0
index e69de29..9596f39 100644
@@ -0,0 +1 @@
+generic-y += trace_clock.h
arch/mn10300/include/asm/Kbuild +1 -0
index 4a159da..c5d7670 100644
@@ -1,3 +1,4 @@
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += trace_clock.h
arch/openrisc/include/asm/Kbuild +1 -0
index 78de680..8971026 100644
@@ -60,6 +60,7 @@ generic-y += swab.h
 generic-y += termbits.h
 generic-y += termios.h
 generic-y += topology.h
+generic-y += trace_clock.h
 generic-y += types.h
 generic-y += ucontext.h
 generic-y += user.h
arch/parisc/include/asm/Kbuild +1 -0
index 458371a..77f41b2 100644
@@ -4,3 +4,4 @@ header-y += pdc.h
 generic-y += clkdev.h
 generic-y += word-at-a-time.h
 generic-y += exec.h
+generic-y += trace_clock.h
arch/powerpc/include/asm/Kbuild +1 -0
index a4fe15e..2d62b48 100644
@@ -2,3 +2,4 @@
 
 generic-y += clkdev.h
 generic-y += rwsem.h
+generic-y += trace_clock.h
arch/s390/include/asm/Kbuild +1 -0
index 0633dc6..f313f9c 100644
@@ -1,3 +1,4 @@
 
 
 generic-y += clkdev.h
+generic-y += trace_clock.h
arch/score/include/asm/Kbuild +1 -0
index ec697ae..16e41fe 100644
@@ -3,3 +3,4 @@ include include/asm-generic/Kbuild.asm
 header-y +=
 
 generic-y += clkdev.h
+generic-y += trace_clock.h
arch/sh/include/asm/Kbuild +1 -0
index 86eadce..a054a00 100644
@@ -32,6 +32,7 @@ generic-y += socket.h
 generic-y += statfs.h
 generic-y += termbits.h
 generic-y += termios.h
+generic-y += trace_clock.h
 generic-y += ucontext.h
 generic-y += xor.h
arch/sparc/include/asm/Kbuild +1 -0
index 645a58d..e26d430 100644
@@ -8,4 +8,5 @@ generic-y += local64.h
 generic-y += irq_regs.h
 generic-y += local.h
 generic-y += module.h
+generic-y += trace_clock.h
 generic-y += word-at-a-time.h
arch/tile/include/asm/Kbuild +1 -0
index c68808a..568a4ab 100644
@@ -36,6 +36,7 @@ generic-y += sockios.h
 generic-y += statfs.h
 generic-y += termbits.h
 generic-y += termios.h
+generic-y += trace_clock.h
 generic-y += types.h
 generic-y += ucontext.h
 generic-y += xor.h
arch/um/include/asm/Kbuild +1 -0
index 0f6e7b3..b30f34a 100644
@@ -2,3 +2,4 @@ generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
 generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
 generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h
 generic-y += switch_to.h clkdev.h
+generic-y += trace_clock.h
arch/unicore32/include/asm/Kbuild +1 -0
index c910c98..7be503e 100644
@@ -54,6 +54,7 @@ generic-y += syscalls.h
 generic-y += termbits.h
 generic-y += termios.h
 generic-y += topology.h
+generic-y += trace_clock.h
 generic-y += types.h
 generic-y += ucontext.h
 generic-y += unaligned.h
arch/x86/include/asm/trace_clock.h new file +16 -0
new file mode 100644
index 0000000..7ee0d8c
@@ -0,0 +1,16 @@
+#ifndef _ASM_X86_TRACE_CLOCK_H
+#define _ASM_X86_TRACE_CLOCK_H
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+#ifdef CONFIG_X86_TSC
+
+extern u64 notrace trace_clock_x86_tsc(void);
+
+# define ARCH_TRACE_CLOCKS \
+	{ trace_clock_x86_tsc,	"x86-tsc" },
+
+#endif
+
+#endif  /* _ASM_X86_TRACE_CLOCK_H */
arch/x86/kernel/Makefile +1 -0
index 91ce48f..b2bb37f 100644
@@ -62,6 +62,7 @@ obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups_32.o
 obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
 obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o
+obj-$(CONFIG_X86_TSC)		+= trace_clock.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o
 obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o
arch/x86/kernel/trace_clock.c new file +21 -0
new file mode 100644
index 0000000..25b9937
@@ -0,0 +1,21 @@
+/*
+ * X86 trace clocks
+ */
+#include <asm/trace_clock.h>
+#include <asm/barrier.h>
+#include <asm/msr.h>
+
+/*
+ * trace_clock_x86_tsc(): A clock that is just the cycle counter.
+ *
+ * Unlike the other clocks, this is not in nanoseconds.
+ */
+u64 notrace trace_clock_x86_tsc(void)
+{
+	u64 ret;
+
+	rdtsc_barrier();
+	rdtscll(ret);
+
+	return ret;
+}
arch/xtensa/include/asm/Kbuild +1 -0
index fccd81e..446ad46 100644
@@ -2,3 +2,4 @@ include include/asm-generic/Kbuild.asm
 
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += trace_clock.h
include/asm-generic/trace_clock.h new file +16 -0
new file mode 100644
index 0000000..6726f1b
@@ -0,0 +1,16 @@
+#ifndef _ASM_GENERIC_TRACE_CLOCK_H
+#define _ASM_GENERIC_TRACE_CLOCK_H
+/*
+ * Arch-specific trace clocks.
+ */
+
+/*
+ * Additional trace clocks added to the trace_clocks
+ * array in kernel/trace/trace.c
+ * None if the architecture has not defined it.
+ */
+#ifndef ARCH_TRACE_CLOCKS
+# define ARCH_TRACE_CLOCKS
+#endif
+
+#endif  /* _ASM_GENERIC_TRACE_CLOCK_H */
include/linux/trace_clock.h +2 -0
index 4eb4902..d563f37 100644
@@ -12,6 +12,8 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 
+#include <asm/trace_clock.h>
+
 extern u64 notrace trace_clock_local(void);
 extern u64 notrace trace_clock(void);
 extern u64 notrace trace_clock_global(void);
kernel/trace/trace.c +1 -0
index 31e4f55..9aed7f5 100644
@@ -481,6 +481,7 @@ static struct {
 	{ trace_clock_local,	"local" },
 	{ trace_clock_global,	"global" },
 	{ trace_clock_counter,	"counter" },
+	ARCH_TRACE_CLOCKS
 };
 
 int trace_clock_id;
Signature · 1 line
1.7.7.3
author
#6 lore raw

Re: [PATCH v6 1/6] tracing,x86: Add a TSC trace_clock

In reply to Geert Uytterhoeven
Quoted 6 lines · Geert Uytterhoeven
Quoted 1 line · David Sharp

+#include <asm-generic/trace_clock.h>

Please use the Kbuild infrastructure ("generic-y += ..." in arch/*/include/asm/Kbuild)
instead of adding wrappers around the asm-generic version.

mips apparently recencly got rid of arch/mips/include/asm/Kbuild. What should I do for mips?

Quoted 11 lines

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#7 lore raw

Re: [PATCH v6 1/6] tracing,x86: Add a TSC trace_clock

Quoted 5 lines · David Sharp
Quoted 3 lines

Please use the Kbuild infrastructure ("generic-y += ..." in arch/*/include/asm/Kbuild)
instead of adding wrappers around the asm-generic version.

mips apparently recencly got rid of arch/mips/include/asm/Kbuild.

It didn't. However, if you use patch to create your kernel tree, then patch may have removed it. If you're using GIT, it should still exist. Try:

git log -- arch/mips/include/asm/Kbuild

Quoted 1 line

What should I do for mips?

Just create the file with a single "generic-y += ..." line in it.

David

author
#8 lore raw

Re: [PATCH v6 1/6] tracing,x86: Add a TSC trace_clock

Quoted 10 lines · David Howells
Quoted 5 lines · David Sharp
Quoted 3 lines

Please use the Kbuild infrastructure ("generic-y += ..." in arch/*/include/asm/Kbuild)
instead of adding wrappers around the asm-generic version.

mips apparently recencly got rid of arch/mips/include/asm/Kbuild.

It didn't. However, if you use patch to create your kernel tree, then patch may have removed it. If you're using GIT, it should still exist. Try:

Ah, right. It's not missing, just empty.

Quoted 6 lines

git log -- arch/mips/include/asm/Kbuild

Quoted 1 line

What should I do for mips?

Just create the file with a single "generic-y += ..." line in it.

Okay. Thanks.

Quoted 2 lines

David

author
#9 lore raw

PATCH v6 2/6 tracing: Reset ring buffer when changing trace_clocks

In reply to David Sharp

Because the "tsc" clock isn't in nanoseconds, the ring buffer must be reset when changing clocks so that incomparable timestamps don't end up in the same trace.

Tested: Confirmed switching clocks resets the trace buffer.

Google-Bug-Id: 6980623

Signed-off-by David Sharp <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Masami Hiramatsu <[email protected]>
---
 kernel/trace/trace.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
kernel/trace/trace.c +8 -0
index 92fb08e..4e26df3 100644
@@ -4012,6 +4012,14 @@ static ssize_t tracing_clock_write(struct file *filp, const char __user *ubuf,
 	if (max_tr.buffer)
 		ring_buffer_set_clock(max_tr.buffer, trace_clocks[i].func);
 
+	/*
+	 * New clock may not be consistent with the previous clock.
+	 * Reset the buffer so that it doesn't have incomparable timestamps.
+	 */
+	tracing_reset_online_cpus(&global_trace);
+	if (max_tr.buffer)
+		tracing_reset_online_cpus(&max_tr);
+
 	mutex_unlock(&trace_types_lock);
 
 	*fpos += cnt;
Signature · 1 line
1.7.7.3
author
#10 lore raw

[tip:perf/core] tracing: Reset ring buffer when changing trace_clocks

Commit-ID:  60303ed3f4b9332b9aa9bc17c68bc174e7343e2d
Gitweb:     http://git.kernel.org/tip/60303ed3f4b9332b9aa9bc17c68bc174e7343e2d
Author:     David Sharp <[email protected]>
AuthorDate: Thu, 11 Oct 2012 16:27:52 -0700
Committer:  Steven Rostedt <[email protected]>
CommitDate: Fri, 2 Nov 2012 10:21:47 -0400

tracing: Reset ring buffer when changing trace_clocks

Because the "tsc" clock isn't in nanoseconds, the ring buffer must be reset when changing clocks so that incomparable timestamps don't end up in the same trace.

Tested: Confirmed switching clocks resets the trace buffer.

Google-Bug-Id: 6980623

Link http://lkml.kernel.org/r/[email protected] open here
Cc Masami Hiramatsu <[email protected]>
Signed-off-by David Sharp <[email protected]>
Signed-off-by Steven Rostedt <[email protected]>
---
 kernel/trace/trace.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
kernel/trace/trace.c +8 -0
index 88111b0..6ed6013 100644
@@ -4073,6 +4073,14 @@ static ssize_t tracing_clock_write(struct file *filp, const char __user *ubuf,
 	if (max_tr.buffer)
 		ring_buffer_set_clock(max_tr.buffer, trace_clocks[i].func);
 
+	/*
+	 * New clock may not be consistent with the previous clock.
+	 * Reset the buffer so that it doesn't have incomparable timestamps.
+	 */
+	tracing_reset_online_cpus(&global_trace);
+	if (max_tr.buffer)
+		tracing_reset_online_cpus(&max_tr);
+
 	mutex_unlock(&trace_types_lock);
 
 	*fpos += cnt;
author
#11 lore raw

PATCH v6 3/6 tracing: Format non-nanosec times from tsc clock without a decimal point.

In reply to David Sharp

With the addition of the "tsc" clock, formatting timestamps to look like fractional seconds is misleading. Mark clocks as either in nanoseconds or not, and format non-nanosecond timestamps as decimal integers.

Tested:

$ cd /sys/kernel/debug/tracing/
$ cat trace_clock
[local] global tsc
$ echo sched_switch > set_event
$ echo 1 > tracing_enabled ; sleep 0.0005 ; echo 0 > tracing_enabled
$ cat trace
          <idle>-0     [000]  6330.555552: sched_switch: prev_comm=swapper prev_pid=0 prev_prio=120 prev_state=R ==> next_comm=bash next_pid=29964 next_prio=120
           sleep-29964 [000]  6330.555628: sched_switch: prev_comm=bash prev_pid=29964 prev_prio=120 prev_state=S ==> next_comm=swapper next_pid=0 next_prio=120
  ...
$ echo 1 > options/latency-format
$ cat trace
  <idle>-0       0 4104553247us+: sched_switch: prev_comm=swapper prev_pid=0 prev_prio=120 prev_state=R ==> next_comm=bash next_pid=29964 next_prio=120
   sleep-29964   0 4104553322us+: sched_switch: prev_comm=bash prev_pid=29964 prev_prio=120 prev_state=S ==> next_comm=swapper next_pid=0 next_prio=120
  ...
$ echo tsc > trace_clock
$ cat trace
$ echo 1 > tracing_enabled ; sleep 0.0005 ; echo 0 > tracing_enabled
$ echo 0 > options/latency-format
$ cat trace
          <idle>-0     [000] 16490053398357: sched_switch: prev_comm=swapper prev_pid=0 prev_prio=120 prev_state=R ==> next_comm=bash next_pid=31128 next_prio=120
           sleep-31128 [000] 16490053588518: sched_switch: prev_comm=bash prev_pid=31128 prev_prio=120 prev_state=S ==> next_comm=swapper next_pid=0 next_prio=120
  ...
echo 1 > options/latency-format
$ cat trace
  <idle>-0       0 91557653238+: sched_switch: prev_comm=swapper prev_pid=0 prev_prio=120 prev_state=R ==> next_comm=bash next_pid=31128 next_prio=120
   sleep-31128   0 91557843399+: sched_switch: prev_comm=bash prev_pid=31128 prev_prio=120 prev_state=S ==> next_comm=swapper next_pid=0 next_prio=120
  ...

v2:
Move arch-specific bits out of generic code.
v4:
Fix x86_32 build due to 64-bit division.

Google-Bug-Id: 6980623

Signed-off-by David Sharp <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Masami Hiramatsu <[email protected]>
---
 arch/x86/include/asm/trace_clock.h |    2 +-
 include/linux/ftrace_event.h       |    6 +++
 kernel/trace/trace.c               |   15 +++++-
 kernel/trace/trace.h               |    4 --
 kernel/trace/trace_output.c        |   80 ++++++++++++++++++++++++-----------
 5 files changed, 74 insertions(+), 33 deletions(-)
arch/x86/include/asm/trace_clock.h +1 -1
index 7ee0d8c..45e17f5 100644
@@ -9,7 +9,7 @@
 extern u64 notrace trace_clock_x86_tsc(void);
 
 # define ARCH_TRACE_CLOCKS \
-	{ trace_clock_x86_tsc,	"x86-tsc" },
+	{ trace_clock_x86_tsc,	"x86-tsc",	.in_ns = 0 },
 
 #endif
include/linux/ftrace_event.h +6 -0
index 642928c..c760670 100644
@@ -86,6 +86,12 @@ struct trace_iterator {
 	cpumask_var_t		started;
 };
 
+enum trace_iter_flags {
+	TRACE_FILE_LAT_FMT	= 1,
+	TRACE_FILE_ANNOTATE	= 2,
+	TRACE_FILE_TIME_IN_NS	= 4,
+};
+
 
 struct trace_event;
kernel/trace/trace.c +12 -3
index 4e26df3..cff3427 100644
@@ -476,10 +476,11 @@ static const char *trace_options[] = {
 static struct {
 	u64 (*func)(void);
 	const char *name;
+	int in_ns;		/* is this clock in nanoseconds? */
 } trace_clocks[] = {
-	{ trace_clock_local,	"local" },
-	{ trace_clock_global,	"global" },
-	{ trace_clock_counter,	"counter" },
+	{ trace_clock_local,	"local",	1 },
+	{ trace_clock_global,	"global",	1 },
+	{ trace_clock_counter,	"counter",	0 },
 	ARCH_TRACE_CLOCKS
 };
 

@@ -2425,6 +2426,10 @@ __tracing_open(struct inode *inode, struct file *file)
 	if (ring_buffer_overruns(iter->tr->buffer))
 		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)
+		iter->iter_flags |= TRACE_FILE_TIME_IN_NS;
+
 	/* stop the trace while dumping */
 	tracing_stop();
 

@@ -3324,6 +3329,10 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp)
 	if (trace_flags & TRACE_ITER_LATENCY_FMT)
 		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)
+		iter->iter_flags |= TRACE_FILE_TIME_IN_NS;
+
 	iter->cpu_file = cpu_file;
 	iter->tr = &global_trace;
 	mutex_init(&iter->mutex);
kernel/trace/trace.h +0 -4
index 55e1f7f..84fefed 100644
@@ -409,10 +409,6 @@ void tracing_start_sched_switch_record(void);
 int register_tracer(struct tracer *type);
 void unregister_tracer(struct tracer *type);
 int is_tracing_stopped(void);
-enum trace_file_type {
-	TRACE_FILE_LAT_FMT	= 1,
-	TRACE_FILE_ANNOTATE	= 2,
-};
 
 extern cpumask_var_t __read_mostly tracing_buffer_mask;
kernel/trace/trace_output.c +55 -25

123 lines not on this page · raw message

Signature · 1 line
1.7.7.3
author
#12 lore raw

PATCH v6 4/6 ftrace: Change unsigned long type of ring_buffer_oldest_event_ts() to u64

In reply to David Sharp

From: Yoshihiro YUNOMAE <[email protected]>

ring_buffer_oldest_event_ts() should return a value of u64 type, because ring_buffer_per_cpu->buffer_page->buffer_data_page->time_stamp is u64 type.

Signed-off-by Yoshihiro YUNOMAE <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Vaibhav Nagarnaik <[email protected]>
Signed-off-by David Sharp <[email protected]>
---
 include/linux/ring_buffer.h |    2 +-
 kernel/trace/ring_buffer.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/ring_buffer.h +1 -1
index 6c8835f..c68a09a 100644
@@ -159,7 +159,7 @@ int ring_buffer_record_is_on(struct ring_buffer *buffer);
 void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu);
 void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu);
 
-unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);
+u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);
 unsigned long ring_buffer_bytes_cpu(struct ring_buffer *buffer, int cpu);
 unsigned long ring_buffer_entries(struct ring_buffer *buffer);
 unsigned long ring_buffer_overruns(struct ring_buffer *buffer);
kernel/trace/ring_buffer.c +2 -2
index 49491fa..db3806e 100644
@@ -2925,12 +2925,12 @@ rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
  * @buffer: The ring buffer
  * @cpu: The per CPU buffer to read from.
  */
-unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
+u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
 {
 	unsigned long flags;
 	struct ring_buffer_per_cpu *cpu_buffer;
 	struct buffer_page *bpage;
-	unsigned long ret;
+	u64 ret;
 
 	if (!cpumask_test_cpu(cpu, buffer->cpumask))
 		return 0;
Signature · 1 line
1.7.7.3
#13 lore raw

[tip:perf/core] ring-buffer: Change unsigned long type of ring_buffer_oldest_event_ts() to u64

Commit-ID:  50ecf2c3afead23a05227ab004e4212eca08c207
Gitweb:     http://git.kernel.org/tip/50ecf2c3afead23a05227ab004e4212eca08c207
Author:     Yoshihiro YUNOMAE <[email protected]>
AuthorDate: Thu, 11 Oct 2012 16:27:54 -0700
Committer:  Steven Rostedt <[email protected]>
CommitDate: Fri, 2 Nov 2012 10:21:48 -0400

ring-buffer: Change unsigned long type of ring_buffer_oldest_event_ts() to u64

ring_buffer_oldest_event_ts() should return a value of u64 type, because ring_buffer_per_cpu->buffer_page->buffer_data_page->time_stamp is u64 type.

Link http://lkml.kernel.org/r/[email protected] open here
Cc Frederic Weisbecker <[email protected]>
Cc Vaibhav Nagarnaik <[email protected]>
Signed-off-by Yoshihiro YUNOMAE <[email protected]>
Signed-off-by David Sharp <[email protected]>
Signed-off-by Steven Rostedt <[email protected]>
---
 include/linux/ring_buffer.h |    2 +-
 kernel/trace/ring_buffer.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/ring_buffer.h +1 -1
index 2007375..519777e 100644
@@ -159,7 +159,7 @@ int ring_buffer_record_is_on(struct ring_buffer *buffer);
 void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu);
 void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu);
 
-unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);
+u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);
 unsigned long ring_buffer_bytes_cpu(struct ring_buffer *buffer, int cpu);
 unsigned long ring_buffer_entries(struct ring_buffer *buffer);
 unsigned long ring_buffer_overruns(struct ring_buffer *buffer);
kernel/trace/ring_buffer.c +2 -2
index 23a384b..3c7834c 100644
@@ -2932,12 +2932,12 @@ rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
  * @buffer: The ring buffer
  * @cpu: The per CPU buffer to read from.
  */
-unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
+u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
 {
 	unsigned long flags;
 	struct ring_buffer_per_cpu *cpu_buffer;
 	struct buffer_page *bpage;
-	unsigned long ret;
+	u64 ret;
 
 	if (!cpumask_test_cpu(cpu, buffer->cpumask))
 		return 0;
author
#14 lore raw

PATCH v6 5/6 ftrace: Show raw time stamp on stats per cpu using counter or tsc mode for trace_clock

In reply to David Sharp

From: Yoshihiro YUNOMAE <[email protected]>

Show raw time stamp values for stats per cpu if you choose counter or tsc mode for trace_clock. Although a unit of tracing time stamp is nsec in local or global mode, the units in counter and TSC mode are tracing counter and cycles respectively.

Signed-off-by Yoshihiro YUNOMAE <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
Signed-off-by David Sharp <[email protected]>
---
 kernel/trace/trace.c |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)
kernel/trace/trace.c +17 -6
index cff3427..8bfa3b7 100644
@@ -4396,13 +4396,24 @@ tracing_stats_read(struct file *filp, char __user *ubuf,
 	cnt = ring_buffer_bytes_cpu(tr->buffer, cpu);
 	trace_seq_printf(s, "bytes: %ld\n", cnt);
 
-	t = ns2usecs(ring_buffer_oldest_event_ts(tr->buffer, cpu));
-	usec_rem = do_div(t, USEC_PER_SEC);
-	trace_seq_printf(s, "oldest event ts: %5llu.%06lu\n", t, usec_rem);
+	if (trace_clocks[trace_clock_id].in_ns) {
+		/* local or global for trace_clock */
+		t = ns2usecs(ring_buffer_oldest_event_ts(tr->buffer, cpu));
+		usec_rem = do_div(t, USEC_PER_SEC);
+		trace_seq_printf(s, "oldest event ts: %5llu.%06lu\n",
+								t, usec_rem);
+
+		t = ns2usecs(ring_buffer_time_stamp(tr->buffer, cpu));
+		usec_rem = do_div(t, USEC_PER_SEC);
+		trace_seq_printf(s, "now ts: %5llu.%06lu\n", t, usec_rem);
+	} else {
+		/* counter or tsc mode for trace_clock */
+		trace_seq_printf(s, "oldest event ts: %llu\n",
+				ring_buffer_oldest_event_ts(tr->buffer, cpu));
 
-	t = ns2usecs(ring_buffer_time_stamp(tr->buffer, cpu));
-	usec_rem = do_div(t, USEC_PER_SEC);
-	trace_seq_printf(s, "now ts: %5llu.%06lu\n", t, usec_rem);
+		trace_seq_printf(s, "now ts: %llu\n",
+				ring_buffer_time_stamp(tr->buffer, cpu));
+	}
 
 	count = simple_read_from_buffer(ubuf, count, ppos, s->buffer, s->len);
Signature · 1 line
1.7.7.3
author
#15 lore raw

PATCH v6 6/6 tracing: Fix maybe-uninitialized warning in ftrace_function_set_regexp

In reply to David Sharp

Compiler warning:

kernel/trace/trace_events_filter.c: In function 'ftrace_function_set_filter_cb':
kernel/trace/trace_events_filter.c:2074:8: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Signed-off-by David Sharp <[email protected]>
Cc Steven Rostedt <[email protected]>
---
 kernel/trace/trace_events_filter.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
kernel/trace/trace_events_filter.c +2 -1
index 431dba8..ef36953 100644
@@ -2002,9 +2002,10 @@ static int ftrace_function_set_regexp(struct ftrace_ops *ops, int filter,
 static int __ftrace_function_set_filter(int filter, char *buf, int len,
 					struct function_filter_data *data)
 {
-	int i, re_cnt, ret;
+	int i, re_cnt;
 	int *reset;
 	char **re;
+	int ret = 0;
 
 	reset = filter ? &data->first_filter : &data->first_notrace;
Signature · 1 line
1.7.7.3
maintainer
#16 lore raw

Re: [PATCH v6 6/6] tracing: Fix maybe-uninitialized warning in ftrace_function_set_regexp

Quoted 17 lines · David Sharp

Compiler warning:

kernel/trace/trace_events_filter.c: In function 'ftrace_function_set_filter_cb':
kernel/trace/trace_events_filter.c:2074:8: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Signed-off-by David Sharp <[email protected]>
Cc Steven Rostedt <[email protected]>
---
 kernel/trace/trace_events_filter.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
kernel/trace/trace_events_filter.c +0 -0
index 431dba8..ef36953 100644
@@ -2002,9 +2002,10 @@ static int ftrace_function_set_regexp(struct ftrace_ops *ops, int filter,
 static int __ftrace_function_set_filter(int filter, char *buf, int len,

kernel/trace/trace_events_filter.c static int ftrace_function_set_regexp(struct ftrace_ops *ops, int filter, · line 2011

Quoted 10 lines
kernel/trace/trace_events_filter.c +2 -1
 					struct function_filter_data *data)
 {
-	int i, re_cnt, ret;
+	int i, re_cnt;
 	int *reset;
 	char **re;
+	int ret = 0;
 
 	reset = filter ? &data->first_filter : &data->first_notrace;

It has already been fixed in mainline:

92d8d4a8b0f4c6eba70f6e62b48e38bd005a56e6

http://marc.info/?l=linux-kernel&m=134012157512078

-- Steve

author
#17 lore raw

Re: [PATCH v6 6/6] tracing: Fix maybe-uninitialized warning in ftrace_function_set_regexp

Quoted 26 lines · Steven Rostedt
Quoted 25 lines · David Sharp

Compiler warning:

kernel/trace/trace_events_filter.c: In function 'ftrace_function_set_filter_cb':
kernel/trace/trace_events_filter.c:2074:8: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Signed-off-by David Sharp <[email protected]>
Cc Steven Rostedt <[email protected]>
---
 kernel/trace/trace_events_filter.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
kernel/trace/trace_events_filter.c +2 -1
index 431dba8..ef36953 100644
@@ -2002,9 +2002,10 @@ static int ftrace_function_set_regexp(struct ftrace_ops *ops, int filter,
 static int __ftrace_function_set_filter(int filter, char *buf, int len,
                                      struct function_filter_data *data)
 {
-     int i, re_cnt, ret;
+     int i, re_cnt;
      int *reset;
      char **re;
+     int ret = 0;
Quoted 8 lines

kernel/trace/trace_events_filter.c static int ftrace_function_set_regexp(struct ftrace_ops *ops, int filter, · line 2011

Quoted 2 lines
kernel/trace/trace_events_filter.c +0 -0
      reset = filter ? &data->first_filter : &data->first_notrace;

It has already been fixed in mainline:

92d8d4a8b0f4c6eba70f6e62b48e38bd005a56e6

http://marc.info/?l=linux-kernel&m=134012157512078

Okay, drop this one then. I haven't been rebasing.