ftrace: updates for tip
Steven Rostedt
maintainercover ftrace: updates for tip
The following patches are in:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
branch: tip/devel
Frederic Weisbecker (2):
tracing/ftrace: separate events tracing and stats tracing engine
tracing: add a new workqueue tracer
Shaohua Li (6):
ftrace, ia64: make recordmcount destinct module compile ftrace, ia64: explictly ignore a file in recordmcount.pl ftrace, ia64: Add macro for ftrace_caller ftrace, ia64: Add recordmcount for ia64 ftrace, ia64: IA64 static ftrace support ftrace, ia64: IA64 dynamic ftrace support
Uwe Kleine-K?nig (1):
ftrace, trivial: fix typo "resgister" -> "register"
----
arch/ia64/Kconfig | 3 + arch/ia64/include/asm/ftrace.h | 28 ++++ arch/ia64/kernel/Makefile | 5 + arch/ia64/kernel/entry.S | 100 ++++++++++++++ arch/ia64/kernel/ftrace.c | 206 ++++++++++++++++++++++++++++ arch/ia64/kernel/ia64_ksyms.c | 6 + include/linux/ftrace.h | 4 + include/trace/workqueue.h | 25 ++++ kernel/trace/Kconfig | 11 ++ kernel/trace/Makefile | 1 + kernel/trace/ftrace.c | 14 +-- kernel/trace/trace.c | 2 - kernel/trace/trace.h | 20 --- kernel/trace/trace_branch.c | 108 +++++++++------- kernel/trace/trace_stat.c | 191 +++++++++++--------------- kernel/trace/trace_stat.h | 31 +++++ kernel/trace/trace_workqueue.c | 287 ++++++++++++++++++++++++++++++++++++++++ kernel/workqueue.c | 16 ++- scripts/Makefile.build | 13 +- scripts/recordmcount.pl | 18 ++- 20 files changed, 888 insertions(+), 201 deletions(-)
Steven Rostedt
maintainerPATCH 1/9 ftrace, ia64: make recordmcount destinct module compile
From: Shaohua Li <[email protected]>
In IA64, module build and kernel build use different option. Make recordmcount.pl differentiate the two cases.
--- scripts/Makefile.build | 13 +++++++------ scripts/recordmcount.pl | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-)
scripts/Makefile.build +7 -6
@@ -112,13 +112,13 @@ endif # --------------------------------------------------------------------------- # Default is built-in, unless we know otherwise -modkern_cflags := $(CFLAGS_KERNEL) +modkern_cflags = $(if $(part-of-module), $(CFLAGS_MODULE), $(CFLAGS_KERNEL)) quiet_modtag := $(empty) $(empty) -$(real-objs-m) : modkern_cflags := $(CFLAGS_MODULE) -$(real-objs-m:.o=.i) : modkern_cflags := $(CFLAGS_MODULE) -$(real-objs-m:.o=.s) : modkern_cflags := $(CFLAGS_MODULE) -$(real-objs-m:.o=.lst): modkern_cflags := $(CFLAGS_MODULE) +$(real-objs-m) : part-of-module := y +$(real-objs-m:.o=.i) : part-of-module := y +$(real-objs-m:.o=.s) : part-of-module := y +$(real-objs-m:.o=.lst): part-of-module := y $(real-objs-m) : quiet_modtag := [M] $(real-objs-m:.o=.i) : quiet_modtag := [M]
@@ -215,7 +215,8 @@ endif ifdef CONFIG_FTRACE_MCOUNT_RECORD cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ "$(if $(CONFIG_64BIT),64,32)" \ - "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" "$(@)"; + "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \ + "$(if $(part-of-module),1,0)" "$(@)"; endif define rule_cc_o_c
scripts/recordmcount.pl +3 -3
@@ -100,14 +100,14 @@ $P =~ s@.*/@@g; my $V = '0.1'; -if ($#ARGV < 6) { - print "usage: $P arch objdump objcopy cc ld nm rm mv inputfile\n"; +if ($#ARGV < 7) { + print "usage: $P arch objdump objcopy cc ld nm rm mv is_module inputfile\n"; print "version: $V\n"; exit(1); } my ($arch, $bits, $objdump, $objcopy, $cc, - $ld, $nm, $rm, $mv, $inputfile) = @ARGV; + $ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV; # Acceptable sections to record. my %text_sections = (
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 2/9 ftrace, ia64: explictly ignore a file in recordmcount.pl
In reply to Steven RostedtFrom: Shaohua Li <[email protected]>
In IA64, a function pointer isn't a 'unsigned long' but a 'struct {unsigned long ip, unsigned long gp}'. MCOUNT_ADDR is determined at link time not compile time, so explictly ignore kernel/trace/ftrace.o in recordmcount.pl.
--- kernel/trace/ftrace.c | 10 +--------- scripts/recordmcount.pl | 5 +++++ 2 files changed, 6 insertions(+), 9 deletions(-)
kernel/trace/ftrace.c +1 -9
@@ -263,14 +263,6 @@ static void ftrace_update_pid_func(void)# error Dynamic ftrace depends on MCOUNT_RECORD#endif -/* -* Since MCOUNT_ADDR may point to mcount itself, we do not want -* to get it confused by reading a reference in the code as we -* are parsing on objcopy output of text. Use a variable for -* it instead. -*/ -static unsigned long mcount_addr =MCOUNT_ADDR ; -enum {FTRACE_ENABLE_CALLS = (1 <<0 ),FTRACE_DISABLE_CALLS = (1 <<1 ),
@@ -575,7 +567,7 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec) ip = rec->ip; - ret =ftrace_make_nop (mod, rec, mcount_addr); + ret =ftrace_make_nop (mod, rec,MCOUNT_ADDR );if (ret) {ftrace_bug (ret, ip); rec->flags |=FTRACE_FL_FAILED ;
scripts/recordmcount.pl +5 -0
@@ -109,6 +109,11 @@ if ($#ARGV < 7) { my ($arch, $bits, $objdump, $objcopy, $cc, $ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV; +# This file refers to mcount and shouldn't be ftraced, so lets' ignore it +if ($inputfile eq "kernel/trace/ftrace.o") { + exit(0); +} + # Acceptable sections to record. my %text_sections = ( ".text" => 1,
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 3/9 ftrace, ia64: Add macro for ftrace_caller
In reply to Steven RostedtFrom: Shaohua Li <[email protected]>
Define FTRACE_ADDR. In IA64, a function pointer isn't a 'unsigned long' but a 'struct {unsigned long ip, unsigned long gp}'.
--- include/linux/ftrace.h | 4 ++++ kernel/trace/ftrace.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)
include/linux/ftrace.h +4 -0
@@ -126,6 +126,10 @@ extern int ftrace_update_ftrace_func(ftrace_func_t func);extern void ftrace_caller (void );extern void ftrace_call (void );extern void mcount_call (void ); + +#ifndef FTRACE_ADDR +#define FTRACE_ADDR ((unsigned long)ftrace_caller) +#endif #ifdef CONFIG_FUNCTION_GRAPH_TRACER extern void ftrace_graph_caller (void );extern int ftrace_enable_ftrace_graph_caller (void );
kernel/trace/ftrace.c +1 -1
@@ -455,7 +455,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)unsigned long ip, fl;unsigned long ftrace_addr; - ftrace_addr = (unsigned long )ftrace_caller; + ftrace_addr = (unsigned long )FTRACE_ADDR ; ip = rec->ip;
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 4/9 ftrace, ia64: Add recordmcount for ia64
In reply to Steven RostedtFrom: Shaohua Li <[email protected]>
Add recordmcount for ia64.
--- scripts/recordmcount.pl | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
scripts/recordmcount.pl +7 -0
@@ -206,6 +206,13 @@ if ($arch eq "x86_64") { $alignment = 2; $section_type = '%progbits'; +} elsif ($arch eq "ia64") { + $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; + $type = "data8"; + + if ($is_module eq "0") { + $cc .= " -mconstant-gp"; + } } else { die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD"; }
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 5/9 ftrace, ia64: IA64 static ftrace support
In reply to Steven RostedtFrom: Shaohua Li <[email protected]>
IA64 ftrace suppport. In IA64, below code will be added in each function if -pg is enabled.
alloc r40=ar.pfs,12,8,0
mov r43=r0;;
mov r42°
mov r41=r1
nop.i 0x0
br.call.sptk.many b0 = _mcount;;
--- arch/ia64/Kconfig | 1 + arch/ia64/include/asm/ftrace.h | 15 ++++++++++++ arch/ia64/kernel/entry.S | 49 ++++++++++++++++++++++++++++++++++++++++ arch/ia64/kernel/ia64_ksyms.c | 6 +++++ 4 files changed, 71 insertions(+), 0 deletions(-) create mode 100644 arch/ia64/include/asm/ftrace.h
arch/ia64/Kconfig +1 -0
@@ -21,6 +21,7 @@ config IA64 select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_FUNCTION_TRACER select HAVE_DMA_ATTRS select HAVE_KVM select HAVE_ARCH_TRACEHOOK
arch/ia64/include/asm/ftrace.h new file +15 -0
@@ -0,0 +1,15 @@ +#ifndef _ASM_IA64_FTRACE_H +#define _ASM_IA64_FTRACE_H + +#ifdef CONFIG_FUNCTION_TRACER +#define MCOUNT_INSN_SIZE 32/* sizeof mcount call */ + +#ifndef __ASSEMBLY__ +extern void _mcount (unsigned long pfs,unsigned long r1,unsigned long b0,unsigned long r0); +#define mcount _mcount + +#endif + +#endif /* CONFIG_FUNCTION_TRACER */ + +#endif /* _ASM_IA64_FTRACE_H */
arch/ia64/kernel/entry.S +49 -0
61 lines not on this page · raw message
arch/ia64/kernel/ia64_ksyms.c +6 -0
@@ -112,3 +112,9 @@ EXPORT_SYMBOL_GPL(esi_call_phys);#endif extern char ia64_ivt[];EXPORT_SYMBOL (ia64_ivt); + +#include <asm/ftrace.h> +#ifdef CONFIG_FUNCTION_TRACER +/* mcount is defined in assembly */ +EXPORT_SYMBOL (_mcount); +#endif
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 6/9 ftrace, ia64: IA64 dynamic ftrace support
In reply to Steven RostedtFrom: Shaohua Li <[email protected]>
IA64 dynamic ftrace support.
The original _mcount stub for each function is like:
alloc r40=ar.pfs,12,8,0 mov r43=r0;; mov r42° mov r41=r1 nop.i 0x0 br.call.sptk.many b0 = _mcount;;
The patch convert it to below for nop:
[MII] nop.m 0x0 mov r3=ip nop.i 0x0 [MLX] nop.m 0x0 nop.x 0x0;;
This isn't completely nop, as there is one instuction 'mov r3=ip', but it should be light and harmless for code follow it.
And below is for call
[MII] nop.m 0x0 mov r3=ip nop.i 0x0 [MLX] nop.m 0x0 brl.many .;;
In this way, only one instruction is changed to convert code between nop and call. This should meet dyn-ftrace's requirement.
But this requires CPU support brl instruction, so dyn-ftrace isn't supported for old Itanium system. Assume there are quite few such old system running.
--- arch/ia64/Kconfig | 2 + arch/ia64/include/asm/ftrace.h | 13 +++ arch/ia64/kernel/Makefile | 5 + arch/ia64/kernel/entry.S | 51 ++++++++++ arch/ia64/kernel/ftrace.c | 206 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 277 insertions(+), 0 deletions(-) create mode 100644 arch/ia64/kernel/ftrace.c
arch/ia64/Kconfig +2 -0
@@ -21,6 +21,8 @@ config IA64 select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_FTRACE_MCOUNT_RECORD + select HAVE_DYNAMIC_FTRACE if (!ITANIUM) select HAVE_FUNCTION_TRACER select HAVE_DMA_ATTRS select HAVE_KVM
arch/ia64/include/asm/ftrace.h +13 -0
@@ -8,6 +8,19 @@extern void _mcount (unsigned long pfs,unsigned long r1,unsigned long b0,unsigned long r0);#define mcount _mcount +#include <asm/kprobes.h> +/* In IA64, MCOUNT_ADDR is set in link time, so it's not a constant at compile time */ +#define MCOUNT_ADDR (((struct fnptr *)mcount)->ip) +#define FTRACE_ADDR (((struct fnptr *)ftrace_caller)->ip) + +static inline unsigned long ftrace_call_adjust (unsigned long addr) +{ +/* second bundle, insn 2 */ +return addr -0x12 ; +} + +struct dyn_arch_ftrace { +};#endif #endif /* CONFIG_FUNCTION_TRACER */
arch/ia64/kernel/Makefile +5 -0
@@ -2,6 +2,10 @@ # Makefile for the linux kernel. # +ifdef CONFIG_DYNAMIC_FTRACE +CFLAGS_REMOVE_ftrace.o = -pg +endif + extra-y := head.o init_task.o vmlinux.lds obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \
@@ -28,6 +32,7 @@ obj-$(CONFIG_IA64_CYCLONE) += cyclone.o obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o +obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o
arch/ia64/kernel/entry.S +51 -0
63 lines not on this page · raw message
arch/ia64/kernel/ftrace.c new file +206 -0
206 lines not on this page · raw message
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 7/9 tracing/ftrace: separate events tracing and stats tracing engine
In reply to Steven RostedtFrom: Frederic Weisbecker <[email protected]>
Impact: tracing's Api change
Currently, the stat tracing depends on the events tracing. When you switch to a new tracer, the stats files of the previous tracer will disappear. But it's more scalable to separate those two engines. This way, we can keep the stat files of one or several tracers when we want, without bothering of multiple tracer stat files or tracer switching.
To build/destroys its stats files, a tracer just have to call register_stat_tracer/unregister_stat_tracer everytimes it wants to.
--- kernel/trace/trace.c | 2 - kernel/trace/trace.h | 20 ----- kernel/trace/trace_branch.c | 108 ++++++++++++++----------- kernel/trace/trace_stat.c | 191 ++++++++++++++++++------------------------- kernel/trace/trace_stat.h | 31 +++++++ 5 files changed, 172 insertions(+), 180 deletions(-) create mode 100644 kernel/trace/trace_stat.h
kernel/trace/trace.c +0 -2
@@ -2353,7 +2353,6 @@ static int tracing_set_tracer(char *buf)if (ret) goto out; } -init_tracer_stat (t);trace_branch_enable (tr); out:
@@ -3218,7 +3217,6 @@ __init static int tracer_alloc_buffers(void)#else current_trace = &nop_trace;#endif -init_tracer_stat (current_trace);/* All seems OK, enable tracing */ tracing_disabled =0 ;
kernel/trace/trace.h +0 -20
@@ -334,24 +334,6 @@ struct tracer_flags {/* Makes more easy to define a tracer opt */ #define TRACER_OPT (s, b) .name = #s, .bit = b -/* -* If you want to provide a stat file (one-shot statistics), fill -* an iterator with stat_start/stat_next and a stat_show callbacks. -* The others callbacks are optional. -*/ -struct tracer_stat { -/* The name of your stat file */ -const char *name; -/* Iteration over statistic entries */ -void *(*stat_start)(void ); -void *(*stat_next)(void *prev,int idx); -/* Compare two entries for sorting (optional) for stats */ -int (*stat_cmp)(void *p1,void *p2); -/* Print a stat entry */ -int (*stat_show)(struct seq_file *s,void *p); -/* Print the headers of your stat entries */ -int (*stat_headers)(struct seq_file *s); -};/* * A specific tracer, represented by methods that operate on a trace array:
@@ -466,8 +448,6 @@ void tracing_start_sched_switch_record(void);int register_tracer (struct tracer *type);void unregister_tracer (struct tracer *type); -void init_tracer_stat (struct tracer *trace); -extern unsigned long nsecs_to_usecs (unsigned long nsecs);extern unsigned long tracing_max_latency;
kernel/trace/trace_branch.c +58 -48
142 lines not on this page · raw message
kernel/trace/trace_stat.c +81 -110
242 lines not on this page · raw message
kernel/trace/trace_stat.h new file +31 -0
@@ -0,0 +1,31 @@ +#ifndef __TRACE_STAT_H +#define __TRACE_STAT_H + +#include <linux/seq_file.h> + +/* +* If you want to provide a stat file (one-shot statistics), fill +* an iterator with stat_start/stat_next and a stat_show callbacks. +* The others callbacks are optional. +*/ +struct tracer_stat { +/* The name of your stat file */ +const char *name; +/* Iteration over statistic entries */ +void *(*stat_start)(void ); +void *(*stat_next)(void *prev,int idx); +/* Compare two entries for stats sorting */ +int (*stat_cmp)(void *p1,void *p2); +/* Print a stat entry */ +int (*stat_show)(struct seq_file *s,void *p); +/* Print the headers of your stat entries */ +int (*stat_headers)(struct seq_file *s); +}; + +/* +* Destroy or create a stat file +*/ +extern int register_stat_tracer (struct tracer_stat *trace); +extern void unregister_stat_tracer (struct tracer_stat *trace); + +#endif /* __TRACE_STAT_H */
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 8/9 tracing: add a new workqueue tracer
In reply to Steven RostedtFrom: Frederic Weisbecker <[email protected]>
Impact: new tracer
The workqueue tracer provides some statistical informations about each cpu workqueue thread such as the number of the works inserted and executed since their creation. It can help to evaluate the amount of work each of them have to perform. For example it can help a developer to decide whether he should choose a per cpu workqueue instead of a singlethreaded one.
It only traces statistical informations for now but it will probably later provide event tracing too.
Such a tracer could help too, and be improved, to help rt priority sorted workqueue development.
To have a snapshot of the workqueues state at any time, just do
cat /debugfs/tracing/trace_stat/workqueues
Ie:
1 125 125 reiserfs/1 1 0 0 scsi_tgtd/1 1 0 0 aio/1 1 0 0 ata/1 1 114 114 kblockd/1 1 0 0 kintegrityd/1 1 2147 2147 events/1
0 0 0 kpsmoused 0 105 105 reiserfs/0 0 0 0 scsi_tgtd/0 0 0 0 aio/0 0 0 0 ata_aux 0 0 0 ata/0 0 0 0 cqueue 0 0 0 kacpi_notify 0 0 0 kacpid 0 149 149 kblockd/0 0 0 0 kintegrityd/0 0 1000 1000 khelper 0 2270 2270 events/0
Changes in V2:
_ Drop the static array based on NR_CPU and dynamically allocate the stat array
with num_possible_cpus() and other cpu mask facilities....
_ Trace workqueue insertion at a bit lower level (insert_work instead of queue_work) to handle
even the workqueue barriers.
--- include/trace/workqueue.h | 25 ++++ kernel/trace/Kconfig | 11 ++ kernel/trace/Makefile | 1 + kernel/trace/trace_workqueue.c | 287 ++++++++++++++++++++++++++++++++++++++++ kernel/workqueue.c | 16 ++- 5 files changed, 339 insertions(+), 1 deletions(-) create mode 100644 include/trace/workqueue.h create mode 100644 kernel/trace/trace_workqueue.c
include/trace/workqueue.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef __TRACE_WORKQUEUE_H +#define __TRACE_WORKQUEUE_H + +#include <linux/tracepoint.h> +#include <linux/workqueue.h> +#include <linux/sched.h> + +DECLARE_TRACE (workqueue_insertion, + TPPROTO(struct task_struct *wq_thread, struct work_struct *work), +TPARGS (wq_thread, work)); + +DECLARE_TRACE (workqueue_execution, + TPPROTO(struct task_struct *wq_thread, struct work_struct *work), +TPARGS (wq_thread, work)); + +/* Trace the creation of one workqueue thread on a cpu */ +DECLARE_TRACE (workqueue_creation, + TPPROTO(struct task_struct *wq_thread, int cpu), +TPARGS (wq_thread, cpu)); + +DECLARE_TRACE (workqueue_destruction, + TPPROTO(struct task_struct *wq_thread), +TPARGS (wq_thread)); + +#endif /* __TRACE_WORKQUEUE_H */
kernel/trace/Kconfig +11 -0
@@ -284,6 +284,17 @@ config KMEMTRACE If unsure, say N. +config WORKQUEUE_TRACER + bool "Trace workqueues" + select TRACING + help + The workqueue tracer provides some statistical informations + about each cpu workqueue thread such as the number of the + works inserted and executed since their creation. It can help + to evaluate the amount of work each of them have to perform. + For example it can help a developer to decide whether he should + choose a per cpu workqueue instead of a singlethreaded one. + config DYNAMIC_FTRACE bool "enable/disable ftrace tracepoints dynamically"
kernel/trace/Makefile +1 -0
@@ -36,5 +36,6 @@ obj-$(CONFIG_TRACE_BRANCH_PROFILING) += trace_branch.o obj-$(CONFIG_HW_BRANCH_TRACER) += trace_hw_branches.o obj-$(CONFIG_POWER_TRACER) += trace_power.o obj-$(CONFIG_KMEMTRACE) += kmemtrace.o +obj-$(CONFIG_WORKQUEUE_TRACER) += trace_workqueue.o libftrace-y := ftrace.o
kernel/trace/trace_workqueue.c new file +287 -0
287 lines not on this page · raw message
kernel/workqueue.c +15 -1
@@ -33,6 +33,7 @@#include <linux/kallsyms.h> #include <linux/debug_locks.h> #include <linux/lockdep.h> +#include <trace/workqueue.h> /* * The per-CPU workqueue (if single thread, we always use the first
@@ -125,9 +126,13 @@ struct cpu_workqueue_struct *get_wq_data(struct work_struct *work)return (void *) (atomic_long_read (&work->data) &WORK_STRUCT_WQ_DATA_MASK ); } +DEFINE_TRACE (workqueue_insertion); +static void insert_work (struct cpu_workqueue_struct *cwq,struct work_struct *work,struct list_head *head) { +trace_workqueue_insertion (cwq->thread, work); +set_wq_data (work, cwq);/* * Ensure that we get the right work->data if we see the
@@ -259,6 +264,8 @@ int queue_delayed_work_on(int cpu, struct workqueue_struct *wq, }EXPORT_SYMBOL_GPL (queue_delayed_work_on); +DEFINE_TRACE (workqueue_execution); +static void run_workqueue (struct cpu_workqueue_struct *cwq) {spin_lock_irq (&cwq->lock);
@@ -284,7 +291,7 @@ static void run_workqueue(struct cpu_workqueue_struct *cwq)*/ struct lockdep_map lockdep_map = work->lockdep_map;#endif - +trace_workqueue_execution (cwq->thread, work); cwq->current_work = work;list_del_init (cwq->worklist.next);spin_unlock_irq (&cwq->lock);
@@ -765,6 +772,8 @@ init_cpu_workqueue(struct workqueue_struct *wq, int cpu)return cwq; } +DEFINE_TRACE (workqueue_creation); +static int create_workqueue_thread (struct cpu_workqueue_struct *cwq,int cpu) {struct sched_param param = { .sched_priority =MAX_RT_PRIO -1 };
@@ -787,6 +796,8 @@ static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu)sched_setscheduler_nocheck (p,SCHED_FIFO , ¶m); cwq->thread = p; +trace_workqueue_creation (cwq->thread, cpu); +return 0 ; }
@@ -868,6 +879,8 @@ struct workqueue_struct *__create_workqueue_key(const char *name, }EXPORT_SYMBOL_GPL (__create_workqueue_key); +DEFINE_TRACE (workqueue_destruction); +static void cleanup_workqueue_thread (struct cpu_workqueue_struct *cwq) {/*
@@ -891,6 +904,7 @@ static void cleanup_workqueue_thread(struct cpu_workqueue_struct *cwq)* checks list_empty(), and a "normal" queue_work() can't use * a dead CPU. */ +trace_workqueue_destruction (cwq->thread);kthread_stop (cwq->thread); cwq->thread =NULL ; }
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 9/9 ftrace, trivial: fix typo "resgister" -> "register"
In reply to Steven RostedtFrom: Uwe Kleine-K?nig <[email protected]>
--- kernel/trace/ftrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/ftrace.c +1 -1
@@ -1894,7 +1894,7 @@ int register_ftrace_function(struct ftrace_ops *ops) }/** -* unregister_ftrace_function - unresgister a function for profiling. +* unregister_ftrace_function - unregister a function for profiling. * @ops - ops structure that holds the function to unregister * * Unregister a function that was added to be called by ftrace profiling.
Signature · 3 lines
1.5.6.5 --
Re: [PATCH 9/9] ftrace, trivial: fix typo "resgister" -> "register"
Quoted 3 lines · Steven Rostedt
From: Uwe Kleine-K?nig <[email protected]>
Signed-off-by Uwe Kleine-K?nig <[email protected]>
who ever will apply this patch, can you please take care that the '?' is substituted by 'ö' or if that is too hard, by 'oe'?
Thanks
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |
Steven Rostedt
maintainerRe: [PATCH 9/9] ftrace, trivial: fix typo "resgister" -> "register"
Quoted 6 lines · Uwe Kleine-K?nig
Quoted 3 lines · Steven Rostedt
From: Uwe Kleine-K?nig <[email protected]>
Signed-off-by Uwe Kleine-K?nig <[email protected]>who ever will apply this patch, can you please take care that the '?' is substituted by '?' or if that is too hard, by 'oe'?
Ouch, that looks bad. I just used git am to apply it and ran it through a compile and boot up (never know when a comment change will break the build ;-)
I did not look at how git checked it in.
Ingo, if you did not pull this, and since it is the last patch, I'll fix it in my tree.
-- Steve
Steven Rostedt
maintainerQuoted 6 lines · Steven Rostedt
The following patches are in:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.gitbranch: tip/devel
Ingo,
Don't pull any of this yet please. I'm going to rebase some of the patches to fix the change logs (typos). I'll let you know when that's finished.
Thanks,
-- Steve
Quoted 42 lines
Frederic Weisbecker (2):
tracing/ftrace: separate events tracing and stats tracing engine
tracing: add a new workqueue tracerShaohua Li (6):
ftrace, ia64: make recordmcount destinct module compile ftrace, ia64: explictly ignore a file in recordmcount.pl ftrace, ia64: Add macro forftrace_callerftrace, ia64: Add recordmcount for ia64 ftrace, ia64: IA64 static ftrace support ftrace, ia64: IA64 dynamic ftrace supportUwe Kleine-K?nig (1):
ftrace, trivial: fix typo "resgister" -> "register"----
arch/ia64/Kconfig | 3 + arch/ia64/include/asm/ftrace.h | 28 ++++ arch/ia64/kernel/Makefile | 5 + arch/ia64/kernel/entry.S | 100 ++++++++++++++ arch/ia64/kernel/ftrace.c | 206 ++++++++++++++++++++++++++++ arch/ia64/kernel/ia64_ksyms.c | 6 + include/linux/ftrace.h | 4 + include/trace/workqueue.h | 25 ++++ kernel/trace/Kconfig | 11 ++ kernel/trace/Makefile | 1 + kernel/trace/ftrace.c | 14 +-- kernel/trace/trace.c | 2 - kernel/trace/trace.h | 20 --- kernel/trace/trace_branch.c | 108 +++++++++------- kernel/trace/trace_stat.c | 191 +++++++++++--------------- kernel/trace/trace_stat.h | 31 +++++ kernel/trace/trace_workqueue.c | 287 ++++++++++++++++++++++++++++++++++++++++ kernel/workqueue.c | 16 ++- scripts/Makefile.build | 13 +- scripts/recordmcount.pl | 18 ++- 20 files changed, 888 insertions(+), 201 deletions(-)
Steven Rostedt
maintainerQuoted 7 lines · Steven Rostedt
Quoted 3 lines · Steven Rostedt
The following patches are in:
Quoted 9 lines
Quoted 3 lines
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.gitbranch: tip/devel
Ingo,
Don't pull any of this yet please. I'm going to rebase some of the patches to fix the change logs (typos). I'll let you know when that's finished.
OK, I rebased in changing the change logs. Here's what I did:
s/destinct/distinct/
s/K?nig/Koenig/
Here's the changes:
The following patches are in:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
branch: tip/devel
Frederic Weisbecker (2):
tracing/ftrace: separate events tracing and stats tracing engine
tracing: add a new workqueue tracer
Shaohua Li (6):
ftrace, ia64: make recordmcount distinct module compile ftrace, ia64: explictly ignore a file in recordmcount.pl ftrace, ia64: Add macro for ftrace_caller ftrace, ia64: Add recordmcount for ia64 ftrace, ia64: IA64 static ftrace support ftrace, ia64: IA64 dynamic ftrace support
Uwe Kleine-Koenig (1):
ftrace, trivial: fix typo "resgister" -> "register"
----
arch/ia64/Kconfig | 3 + arch/ia64/include/asm/ftrace.h | 28 ++++ arch/ia64/kernel/Makefile | 5 + arch/ia64/kernel/entry.S | 100 ++++++++++++++ arch/ia64/kernel/ftrace.c | 206 ++++++++++++++++++++++++++++ arch/ia64/kernel/ia64_ksyms.c | 6 + include/linux/ftrace.h | 4 + include/trace/workqueue.h | 25 ++++ kernel/trace/Kconfig | 11 ++ kernel/trace/Makefile | 1 + kernel/trace/ftrace.c | 14 +-- kernel/trace/trace.c | 2 - kernel/trace/trace.h | 20 --- kernel/trace/trace_branch.c | 108 +++++++++------- kernel/trace/trace_stat.c | 191 +++++++++++--------------- kernel/trace/trace_stat.h | 31 +++++ kernel/trace/trace_workqueue.c | 287 ++++++++++++++++++++++++++++++++++++++++ kernel/workqueue.c | 16 ++- scripts/Makefile.build | 13 +- scripts/recordmcount.pl | 18 ++- 20 files changed, 888 insertions(+), 201 deletions(-)
arch/ia64/Kconfig +3 -0
@@ -21,6 +21,9 @@ config IA64 select HAVE_OPROFILE select HAVE_KPROBES select HAVE_KRETPROBES + select HAVE_FTRACE_MCOUNT_RECORD + select HAVE_DYNAMIC_FTRACE if (!ITANIUM) + select HAVE_FUNCTION_TRACER select HAVE_DMA_ATTRS select HAVE_KVM select HAVE_ARCH_TRACEHOOK
arch/ia64/include/asm/ftrace.h new file +28 -0
@@ -0,0 +1,28 @@ +#ifndef _ASM_IA64_FTRACE_H +#define _ASM_IA64_FTRACE_H + +#ifdef CONFIG_FUNCTION_TRACER +#define MCOUNT_INSN_SIZE 32/* sizeof mcount call */ + +#ifndef __ASSEMBLY__ +extern void _mcount (unsigned long pfs,unsigned long r1,unsigned long b0,unsigned long r0); +#define mcount _mcount + +#include <asm/kprobes.h> +/* In IA64, MCOUNT_ADDR is set in link time, so it's not a constant at compile time */ +#define MCOUNT_ADDR (((struct fnptr *)mcount)->ip) +#define FTRACE_ADDR (((struct fnptr *)ftrace_caller)->ip) + +static inline unsigned long ftrace_call_adjust (unsigned long addr) +{ +/* second bundle, insn 2 */ +return addr -0x12 ; +} + +struct dyn_arch_ftrace { +}; +#endif + +#endif /* CONFIG_FUNCTION_TRACER */ + +#endif /* _ASM_IA64_FTRACE_H */
arch/ia64/kernel/Makefile +5 -0
@@ -2,6 +2,10 @@ # Makefile for the linux kernel. # +ifdef CONFIG_DYNAMIC_FTRACE +CFLAGS_REMOVE_ftrace.o = -pg +endif + extra-y := head.o init_task.o vmlinux.lds obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \
@@ -28,6 +32,7 @@ obj-$(CONFIG_IA64_CYCLONE) += cyclone.o obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o +obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o
arch/ia64/kernel/entry.S +100 -0
112 lines not on this page · raw message
arch/ia64/kernel/ftrace.c new file +206 -0
206 lines not on this page · raw message
arch/ia64/kernel/ia64_ksyms.c +6 -0
@@ -112,3 +112,9 @@ EXPORT_SYMBOL_GPL(esi_call_phys);#endif extern char ia64_ivt[];EXPORT_SYMBOL (ia64_ivt); + +#include <asm/ftrace.h> +#ifdef CONFIG_FUNCTION_TRACER +/* mcount is defined in assembly */ +EXPORT_SYMBOL (_mcount); +#endif
include/linux/ftrace.h +4 -0
@@ -126,6 +126,10 @@ extern int ftrace_update_ftrace_func(ftrace_func_t func);extern void ftrace_caller (void );extern void ftrace_call (void );extern void mcount_call (void ); + +#ifndef FTRACE_ADDR +#define FTRACE_ADDR ((unsigned long)ftrace_caller) +#endif #ifdef CONFIG_FUNCTION_GRAPH_TRACER extern void ftrace_graph_caller (void );extern int ftrace_enable_ftrace_graph_caller (void );
include/trace/workqueue.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef __TRACE_WORKQUEUE_H +#define __TRACE_WORKQUEUE_H + +#include <linux/tracepoint.h> +#include <linux/workqueue.h> +#include <linux/sched.h> + +DECLARE_TRACE (workqueue_insertion, + TPPROTO(struct task_struct *wq_thread, struct work_struct *work), +TPARGS (wq_thread, work)); + +DECLARE_TRACE (workqueue_execution, + TPPROTO(struct task_struct *wq_thread, struct work_struct *work), +TPARGS (wq_thread, work)); + +/* Trace the creation of one workqueue thread on a cpu */ +DECLARE_TRACE (workqueue_creation, + TPPROTO(struct task_struct *wq_thread, int cpu), +TPARGS (wq_thread, cpu)); + +DECLARE_TRACE (workqueue_destruction, + TPPROTO(struct task_struct *wq_thread), +TPARGS (wq_thread)); + +#endif /* __TRACE_WORKQUEUE_H */
kernel/trace/Kconfig +11 -0
@@ -284,6 +284,17 @@ config KMEMTRACE If unsure, say N. +config WORKQUEUE_TRACER + bool "Trace workqueues" + select TRACING + help + The workqueue tracer provides some statistical informations + about each cpu workqueue thread such as the number of the + works inserted and executed since their creation. It can help + to evaluate the amount of work each of them have to perform. + For example it can help a developer to decide whether he should + choose a per cpu workqueue instead of a singlethreaded one. + config DYNAMIC_FTRACE bool "enable/disable ftrace tracepoints dynamically"
kernel/trace/Makefile +1 -0
@@ -36,5 +36,6 @@ obj-$(CONFIG_TRACE_BRANCH_PROFILING) += trace_branch.o obj-$(CONFIG_HW_BRANCH_TRACER) += trace_hw_branches.o obj-$(CONFIG_POWER_TRACER) += trace_power.o obj-$(CONFIG_KMEMTRACE) += kmemtrace.o +obj-$(CONFIG_WORKQUEUE_TRACER) += trace_workqueue.o libftrace-y := ftrace.o
kernel/trace/ftrace.c +3 -11
@@ -263,14 +263,6 @@ static void ftrace_update_pid_func(void)# error Dynamic ftrace depends on MCOUNT_RECORD#endif -/* -* Since MCOUNT_ADDR may point to mcount itself, we do not want -* to get it confused by reading a reference in the code as we -* are parsing on objcopy output of text. Use a variable for -* it instead. -*/ -static unsigned long mcount_addr =MCOUNT_ADDR ; -enum {FTRACE_ENABLE_CALLS = (1 <<0 ),FTRACE_DISABLE_CALLS = (1 <<1 ),
@@ -463,7 +455,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)unsigned long ip, fl;unsigned long ftrace_addr; - ftrace_addr = (unsigned long )ftrace_caller; + ftrace_addr = (unsigned long )FTRACE_ADDR ; ip = rec->ip;
@@ -575,7 +567,7 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec) ip = rec->ip; - ret =ftrace_make_nop (mod, rec, mcount_addr); + ret =ftrace_make_nop (mod, rec,MCOUNT_ADDR );if (ret) {ftrace_bug (ret, ip); rec->flags |=FTRACE_FL_FAILED ;
@@ -1902,7 +1894,7 @@ int register_ftrace_function(struct ftrace_ops *ops) }/** -* unregister_ftrace_function - unresgister a function for profiling. +* unregister_ftrace_function - unregister a function for profiling. * @ops - ops structure that holds the function to unregister * * Unregister a function that was added to be called by ftrace profiling.
kernel/trace/trace.c +0 -2
@@ -2353,7 +2353,6 @@ static int tracing_set_tracer(char *buf)if (ret) goto out; } -init_tracer_stat (t);trace_branch_enable (tr); out:
@@ -3218,7 +3217,6 @@ __init static int tracer_alloc_buffers(void)#else current_trace = &nop_trace;#endif -init_tracer_stat (current_trace);/* All seems OK, enable tracing */ tracing_disabled =0 ;
kernel/trace/trace.h +0 -20
@@ -334,24 +334,6 @@ struct tracer_flags {/* Makes more easy to define a tracer opt */ #define TRACER_OPT (s, b) .name = #s, .bit = b -/* -* If you want to provide a stat file (one-shot statistics), fill -* an iterator with stat_start/stat_next and a stat_show callbacks. -* The others callbacks are optional. -*/ -struct tracer_stat { -/* The name of your stat file */ -const char *name; -/* Iteration over statistic entries */ -void *(*stat_start)(void ); -void *(*stat_next)(void *prev,int idx); -/* Compare two entries for sorting (optional) for stats */ -int (*stat_cmp)(void *p1,void *p2); -/* Print a stat entry */ -int (*stat_show)(struct seq_file *s,void *p); -/* Print the headers of your stat entries */ -int (*stat_headers)(struct seq_file *s); -};/* * A specific tracer, represented by methods that operate on a trace array:
@@ -466,8 +448,6 @@ void tracing_start_sched_switch_record(void);int register_tracer (struct tracer *type);void unregister_tracer (struct tracer *type); -void init_tracer_stat (struct tracer *trace); -extern unsigned long nsecs_to_usecs (unsigned long nsecs);extern unsigned long tracing_max_latency;
kernel/trace/trace_branch.c +58 -48
142 lines not on this page · raw message
kernel/trace/trace_stat.c +81 -110
242 lines not on this page · raw message
kernel/trace/trace_stat.h new file +31 -0
@@ -0,0 +1,31 @@ +#ifndef __TRACE_STAT_H +#define __TRACE_STAT_H + +#include <linux/seq_file.h> + +/* +* If you want to provide a stat file (one-shot statistics), fill +* an iterator with stat_start/stat_next and a stat_show callbacks. +* The others callbacks are optional. +*/ +struct tracer_stat { +/* The name of your stat file */ +const char *name; +/* Iteration over statistic entries */ +void *(*stat_start)(void ); +void *(*stat_next)(void *prev,int idx); +/* Compare two entries for stats sorting */ +int (*stat_cmp)(void *p1,void *p2); +/* Print a stat entry */ +int (*stat_show)(struct seq_file *s,void *p); +/* Print the headers of your stat entries */ +int (*stat_headers)(struct seq_file *s); +}; + +/* +* Destroy or create a stat file +*/ +extern int register_stat_tracer (struct tracer_stat *trace); +extern void unregister_stat_tracer (struct tracer_stat *trace); + +#endif /* __TRACE_STAT_H */
kernel/trace/trace_workqueue.c new file +287 -0
287 lines not on this page · raw message
kernel/workqueue.c +15 -1
@@ -33,6 +33,7 @@#include <linux/kallsyms.h> #include <linux/debug_locks.h> #include <linux/lockdep.h> +#include <trace/workqueue.h> /* * The per-CPU workqueue (if single thread, we always use the first
@@ -125,9 +126,13 @@ struct cpu_workqueue_struct *get_wq_data(struct work_struct *work)return (void *) (atomic_long_read (&work->data) &WORK_STRUCT_WQ_DATA_MASK ); } +DEFINE_TRACE (workqueue_insertion); +static void insert_work (struct cpu_workqueue_struct *cwq,struct work_struct *work,struct list_head *head) { +trace_workqueue_insertion (cwq->thread, work); +set_wq_data (work, cwq);/* * Ensure that we get the right work->data if we see the
@@ -259,6 +264,8 @@ int queue_delayed_work_on(int cpu, struct workqueue_struct *wq, }EXPORT_SYMBOL_GPL (queue_delayed_work_on); +DEFINE_TRACE (workqueue_execution); +static void run_workqueue (struct cpu_workqueue_struct *cwq) {spin_lock_irq (&cwq->lock);
@@ -284,7 +291,7 @@ static void run_workqueue(struct cpu_workqueue_struct *cwq)*/ struct lockdep_map lockdep_map = work->lockdep_map;#endif - +trace_workqueue_execution (cwq->thread, work); cwq->current_work = work;list_del_init (cwq->worklist.next);spin_unlock_irq (&cwq->lock);
@@ -765,6 +772,8 @@ init_cpu_workqueue(struct workqueue_struct *wq, int cpu)return cwq; } +DEFINE_TRACE (workqueue_creation); +static int create_workqueue_thread (struct cpu_workqueue_struct *cwq,int cpu) {struct sched_param param = { .sched_priority =MAX_RT_PRIO -1 };
@@ -787,6 +796,8 @@ static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu)sched_setscheduler_nocheck (p,SCHED_FIFO , ¶m); cwq->thread = p; +trace_workqueue_creation (cwq->thread, cpu); +return 0 ; }
@@ -868,6 +879,8 @@ struct workqueue_struct *__create_workqueue_key(const char *name, }EXPORT_SYMBOL_GPL (__create_workqueue_key); +DEFINE_TRACE (workqueue_destruction); +static void cleanup_workqueue_thread (struct cpu_workqueue_struct *cwq) {/*
@@ -891,6 +904,7 @@ static void cleanup_workqueue_thread(struct cpu_workqueue_struct *cwq)* checks list_empty(), and a "normal" queue_work() can't use * a dead CPU. */ +trace_workqueue_destruction (cwq->thread);kthread_stop (cwq->thread); cwq->thread =NULL ; }
scripts/Makefile.build +7 -6
@@ -112,13 +112,13 @@ endif # --------------------------------------------------------------------------- # Default is built-in, unless we know otherwise -modkern_cflags := $(CFLAGS_KERNEL) +modkern_cflags = $(if $(part-of-module), $(CFLAGS_MODULE), $(CFLAGS_KERNEL)) quiet_modtag := $(empty) $(empty) -$(real-objs-m) : modkern_cflags := $(CFLAGS_MODULE) -$(real-objs-m:.o=.i) : modkern_cflags := $(CFLAGS_MODULE) -$(real-objs-m:.o=.s) : modkern_cflags := $(CFLAGS_MODULE) -$(real-objs-m:.o=.lst): modkern_cflags := $(CFLAGS_MODULE) +$(real-objs-m) : part-of-module := y +$(real-objs-m:.o=.i) : part-of-module := y +$(real-objs-m:.o=.s) : part-of-module := y +$(real-objs-m:.o=.lst): part-of-module := y $(real-objs-m) : quiet_modtag := [M] $(real-objs-m:.o=.i) : quiet_modtag := [M]
@@ -215,7 +215,8 @@ endif ifdef CONFIG_FTRACE_MCOUNT_RECORD cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ "$(if $(CONFIG_64BIT),64,32)" \ - "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" "$(@)"; + "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \ + "$(if $(part-of-module),1,0)" "$(@)"; endif define rule_cc_o_c
scripts/recordmcount.pl +15 -3
@@ -100,14 +100,19 @@ $P =~ s@.*/@@g; my $V = '0.1'; -if ($#ARGV < 6) { - print "usage: $P arch objdump objcopy cc ld nm rm mv inputfile\n"; +if ($#ARGV < 7) { + print "usage: $P arch objdump objcopy cc ld nm rm mv is_module inputfile\n"; print "version: $V\n"; exit(1); } my ($arch, $bits, $objdump, $objcopy, $cc, - $ld, $nm, $rm, $mv, $inputfile) = @ARGV; + $ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV; + +# This file refers to mcount and shouldn't be ftraced, so lets' ignore it +if ($inputfile eq "kernel/trace/ftrace.o") { + exit(0); +} # Acceptable sections to record. my %text_sections = (
@@ -201,6 +206,13 @@ if ($arch eq "x86_64") { $alignment = 2; $section_type = '%progbits'; +} elsif ($arch eq "ia64") { + $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; + $type = "data8"; + + if ($is_module eq "0") { + $cc .= " -mconstant-gp"; + } } else { die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD"; }
Quoted 64 lines · Steven Rostedt
Quoted 7 lines · Steven Rostedt
Quoted 3 lines · Steven Rostedt
The following patches are in:
Quoted 9 lines
Quoted 3 lines
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.gitbranch: tip/devel
Ingo,
Don't pull any of this yet please. I'm going to rebase some of the patches to fix the change logs (typos). I'll let you know when that's finished.
OK, I rebased in changing the change logs. Here's what I did:
s/destinct/distinct/
s/K?nig/Koenig/Here's the changes:
The following patches are in:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.gitbranch: tip/devel
Frederic Weisbecker (2):
tracing/ftrace: separate events tracing and stats tracing engine
tracing: add a new workqueue tracerShaohua Li (6):
ftrace, ia64: make recordmcount distinct module compile ftrace, ia64: explictly ignore a file in recordmcount.pl ftrace, ia64: Add macro forftrace_callerftrace, ia64: Add recordmcount for ia64 ftrace, ia64: IA64 static ftrace support ftrace, ia64: IA64 dynamic ftrace supportUwe Kleine-Koenig (1):
ftrace, trivial: fix typo "resgister" -> "register"----
arch/ia64/Kconfig | 3 + arch/ia64/include/asm/ftrace.h | 28 ++++ arch/ia64/kernel/Makefile | 5 + arch/ia64/kernel/entry.S | 100 ++++++++++++++ arch/ia64/kernel/ftrace.c | 206 ++++++++++++++++++++++++++++ arch/ia64/kernel/ia64_ksyms.c | 6 + include/linux/ftrace.h | 4 + include/trace/workqueue.h | 25 ++++ kernel/trace/Kconfig | 11 ++ kernel/trace/Makefile | 1 + kernel/trace/ftrace.c | 14 +-- kernel/trace/trace.c | 2 - kernel/trace/trace.h | 20 ---
Quoted 8 lines
kernel/trace/trace_branch.c | 108 +++++++++------- kernel/trace/trace_stat.c | 191 +++++++++++--------------- kernel/trace/trace_stat.h | 31 +++++ kernel/trace/trace_workqueue.c | 287 ++++++++++++++++++++++++++++++++++++++++ kernel/workqueue.c | 16 ++- scripts/Makefile.build | 13 +- scripts/recordmcount.pl | 18 ++- 20 files changed, 888 insertions(+), 201 deletions(-)
pulled into tip/tracing/ftrace, thanks Steve!
Ingo