Skip to contentSkip to conversation

tracing cleanups

GIT PULL New Frederic Weisbecker 2 participants 5 messages Jul 15, 2010 – Jul 17, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Ingo,

Please pull the perf/core branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/core

Thanks,
Frederic
---

Frederic Weisbecker (3):
tracing: Update tracing branch url
tracing: Remove ksym tracer
tracing: Remove letfover markers section

 MAINTAINERS                       |    2 +-
 include/asm-generic/vmlinux.lds.h |    4 -
 kernel/trace/Kconfig              |   22 --
 kernel/trace/Makefile             |    1 -
 kernel/trace/trace.h              |    6 -
 kernel/trace/trace_entries.h      |   15 -
 kernel/trace/trace_ksym.c         |  508 -------------------------------------
 kernel/trace/trace_selftest.c     |   54 ----
 8 files changed, 1 insertions(+), 611 deletions(-)
#1 lore raw

PATCH 1/3 tracing: Update tracing branch url

ftrace and perf events now use the same development branch. Don't show a stale branch to developers.

Cc Steven Rostedt <[email protected]>
Cc Ingo Molnar <[email protected]>
---
 MAINTAINERS |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
MAINTAINERS +1 -1
index 9f90de2..99e9b20 100644
@@ -5644,7 +5644,7 @@ TRACING
 M:	Steven Rostedt <[email protected]>
 M:	Frederic Weisbecker <[email protected]>
 M:	Ingo Molnar <[email protected]>
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core
 S:	Maintained
 F:	Documentation/trace/ftrace.txt
 F:	arch/*/*/*/ftrace.h
Signature · 1 line
1.6.2.3
#2 lore raw

PATCH 2/3 tracing: Remove ksym tracer

In reply to Frederic Weisbecker

The ksym (breakpoint) ftrace plugin has been superseded by perf tools that are much more poweful to use the cpu breakpoints. This tracer doesn't bring more feature. It has been deprecated for a while now, lets remove it.

Cc Steven Rostedt <[email protected]>
Cc Prasad <[email protected]>
Cc Ingo Molnar <[email protected]>
---
 kernel/trace/Kconfig          |   22 --
 kernel/trace/Makefile         |    1 -
 kernel/trace/trace.h          |    6 -
 kernel/trace/trace_entries.h  |   15 --
 kernel/trace/trace_ksym.c     |  508 -----------------------------------------
 kernel/trace/trace_selftest.c |   54 -----
 6 files changed, 0 insertions(+), 606 deletions(-)
 delete mode 100644 kernel/trace/trace_ksym.c
kernel/trace/Kconfig +0 -22
index f669092..f5306cb 100644
@@ -308,28 +308,6 @@ config BRANCH_TRACER
 
 	  Say N if unsure.
 
-config KSYM_TRACER
-	bool "Trace read and write access on kernel memory locations"
-	depends on HAVE_HW_BREAKPOINT
-	select TRACING
-	help
-	  This tracer helps find read and write operations on any given kernel
-	  symbol i.e. /proc/kallsyms.
-
-config PROFILE_KSYM_TRACER
-	bool "Profile all kernel memory accesses on 'watched' variables"
-	depends on KSYM_TRACER
-	help
-	  This tracer profiles kernel accesses on variables watched through the
-	  ksym tracer ftrace plugin. Depending upon the hardware, all read
-	  and write operations on kernel variables can be monitored for
-	  accesses.
-
-	  The results will be displayed in:
-	  /debugfs/tracing/profile_ksym
-
-	  Say N if unsure.
-
 config STACK_TRACER
 	bool "Trace max stack"
 	depends on HAVE_FUNCTION_TRACER
kernel/trace/Makefile +0 -1
index 469a1c7..84b2c99 100644
@@ -53,7 +53,6 @@ obj-$(CONFIG_EVENT_TRACING) += trace_event_perf.o
 endif
 obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
 obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
-obj-$(CONFIG_KSYM_TRACER) += trace_ksym.o
 obj-$(CONFIG_EVENT_TRACING) += power-traces.o
 
 libftrace-y := ftrace.o
kernel/trace/trace.h +0 -6
index cc90ccd..84d3f12 100644
@@ -30,7 +30,6 @@ enum trace_type {
 	TRACE_GRAPH_ENT,
 	TRACE_USER_STACK,
 	TRACE_BLK,
-	TRACE_KSYM,
 
 	__TRACE_LAST_TYPE,
 };
@@ -200,7 +199,6 @@ extern void __ftrace_bad_type(void);
 			  TRACE_GRAPH_ENT);		\
 		IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry,	\
 			  TRACE_GRAPH_RET);		\
-		IF_ASSIGN(var, ent, struct ksym_trace_entry, TRACE_KSYM);\
 		__ftrace_bad_type();					\
 	} while (0)
 
@@ -361,8 +359,6 @@ int register_tracer(struct tracer *type);
 void unregister_tracer(struct tracer *type);
 int is_tracing_stopped(void);
 
-extern int process_new_ksym_entry(char *ksymname, int op, unsigned long addr);
-
 extern unsigned long nsecs_to_usecs(unsigned long nsecs);
 
 extern unsigned long tracing_thresh;
@@ -436,8 +432,6 @@ extern int trace_selftest_startup_sysprof(struct tracer *trace,
 					       struct trace_array *tr);
 extern int trace_selftest_startup_branch(struct tracer *trace,
 					 struct trace_array *tr);
-extern int trace_selftest_startup_ksym(struct tracer *trace,
-					 struct trace_array *tr);
 #endif /* CONFIG_FTRACE_STARTUP_TEST */
 
 extern void *head_page(struct trace_array_cpu *data);
kernel/trace/trace_entries.h +0 -15
index 13abc15..8412837 100644
@@ -291,18 +291,3 @@ FTRACE_ENTRY(branch, trace_branch,
 		 __entry->func, __entry->file, __entry->correct)
 );
 
-FTRACE_ENTRY(ksym_trace, ksym_trace_entry,
-
-	TRACE_KSYM,
-
-	F_STRUCT(
-		__field(	unsigned long,	ip			  )
-		__field(	unsigned char,	type			  )
-		__array(	char	     ,	cmd,	   TASK_COMM_LEN  )
-		__field(	unsigned long,  addr			  )
-	),
-
-	F_printk("ip: %pF type: %d ksym_name: %pS cmd: %s",
-		(void *)__entry->ip, (unsigned int)__entry->type,
-		(void *)__entry->addr,  __entry->cmd)
-);
kernel/trace/trace_ksym.c deleted +0 -508

508 lines not on this page · raw message

kernel/trace/trace_selftest.c +0 -54

63 lines not on this page · raw message

Signature · 1 line
1.6.2.3
#3 lore raw

PATCH 3/3 tracing: Remove letfover markers section

In reply to Frederic Weisbecker

Markers have been removed, but we forgot to remove their section.

Cc Steven Rostedt <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
---
 include/asm-generic/vmlinux.lds.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
include/asm-generic/vmlinux.lds.h +0 -4
index 48c5299..415b1a9 100644
@@ -150,10 +150,6 @@
 	CPU_KEEP(exit.data)						\
 	MEM_KEEP(init.data)						\
 	MEM_KEEP(exit.data)						\
-	. = ALIGN(8);							\
-	VMLINUX_SYMBOL(__start___markers) = .;				\
-	*(__markers)							\
-	VMLINUX_SYMBOL(__stop___markers) = .;				\
 	. = ALIGN(32);							\
 	VMLINUX_SYMBOL(__start___tracepoints) = .;			\
 	*(__tracepoints)						\
Signature · 1 line
1.6.2.3
#4 lore raw
In reply to Frederic Weisbecker
Quoted 17 lines · Frederic Weisbecker

Ingo,

Please pull the perf/core branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/core

Thanks,
Frederic
---

Frederic Weisbecker (3):
tracing: Update tracing branch url
tracing: Remove ksym tracer
tracing: Remove letfover markers section

Quoted 9 lines
 MAINTAINERS                       |    2 +-
 include/asm-generic/vmlinux.lds.h |    4 -
 kernel/trace/Kconfig              |   22 --
 kernel/trace/Makefile             |    1 -
 kernel/trace/trace.h              |    6 -
 kernel/trace/trace_entries.h      |   15 -
 kernel/trace/trace_ksym.c         |  508 -------------------------------------
 kernel/trace/trace_selftest.c     |   54 ----
 8 files changed, 1 insertions(+), 611 deletions(-)

Pulled, thanks Frederic!

Ingo