perf fixes
Subsystems (4)
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
The trace_events.c seqfile conversion makes up for the bulk of the diffstat - this was needed for a fix.
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (1):
perf annotate tui: Fix exit and RIGHT keys handling
Bernd Petrovitsch (1):
perf tools: Fix build on POSIX shells
Huang Ying (1):
tracing: Fix ring_buffer_read_page reading out of page boundary
Marcin Slusarz (1):
tracing: Sanitize value returned from write(trace_marker, "...", len)
Mike Frysinger (1):
tracing: Extend recordmcount to better support Blackfin mcount
Randy Dunlap (1):
latencytop: Fix kconfig dependency warnings
Shaohua Li (1):
tracing: Fix an unallocated memory access in function_graph
Steven Rostedt (1):
tracing/events: Convert format output to seq_file
kernel/trace/ring_buffer.c | 3 + kernel/trace/trace.c | 11 ++- kernel/trace/trace_events.c | 207 ++++++++++++++++++++++---------- kernel/trace/trace_functions_graph.c | 10 ++- lib/Kconfig.debug | 5 +- scripts/recordmcount.pl | 7 +- tools/perf/Makefile | 16 ++- tools/perf/util/ui/browsers/annotate.c | 3 +- 8 files changed, 185 insertions(+), 77 deletions(-)
kernel/trace/ring_buffer.c +3 -0
@@ -3846,6 +3846,9 @@ int ring_buffer_read_page(struct ring_buffer *buffer, rpos = reader->read; pos += size; +if (rpos >= commit) +break ; + event =rb_reader_event (cpu_buffer); size =rb_event_length (event); }while (len > size);
kernel/trace/trace.c +8 -3
@@ -3463,6 +3463,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *fpos) { char *buf; +size_t written;if (tracing_disabled)return -EINVAL ;
@@ -3484,11 +3485,15 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, }else buf[cnt] ='\0' ; - cnt =mark_printk ("%s" , buf); + written =mark_printk ("%s" , buf);kfree (buf); - *fpos += cnt; + *fpos += written; -return cnt; +/* don't tell userspace we wrote more - it might confuse them */ +if (written > cnt) + written = cnt; + +return written; }static int tracing_clock_show (struct seq_file *m,void *v)
kernel/trace/trace_events.c +143 -64
239 lines not on this page · raw message
kernel/trace/trace_functions_graph.c +9 -1
@@ -507,7 +507,15 @@ get_return_for_leaf(struct trace_iterator *iter,* if the output fails. */ data->ent = *curr; - data->ret = *next; +/* +* If the next event is not a return type, then +* we only care about what type it is. Otherwise we can +* safely copy the entire event. +*/ +if (next->ent.type ==TRACE_GRAPH_RET ) + data->ret = *next; +else + data->ret.ent.type = next->ent.type; } }
lib/Kconfig.debug +4 -1
@@ -994,13 +994,16 @@ config FAULT_INJECTION_STACKTRACE_FILTER config LATENCYTOP bool "Latency measuring infrastructure" + depends on HAVE_LATENCYTOP_SUPPORT + depends on DEBUG_KERNEL + depends on STACKTRACE_SUPPORT + depends on PROC_FS select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE select KALLSYMS select KALLSYMS_ALL select STACKTRACE select SCHEDSTATS select SCHED_DEBUG - depends on HAVE_LATENCYTOP_SUPPORT help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations.
scripts/recordmcount.pl +6 -1
@@ -159,6 +159,7 @@ my $section_regex; # Find the start of a section my $function_regex; # Find the name of a function # (return offset and func name) my $mcount_regex; # Find the call site to mcount (return offset) +my $mcount_adjust; # Address adjustment to mcount offset my $alignment; # The .align value to use for $mcount_section my $section_type; # Section header plus possible alignment command my $can_use_local = 0; # If we can use local function references
@@ -213,6 +214,7 @@ $section_regex = "Disassembly of section\\s+(\\S+):"; $function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:"; $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$"; $section_type = '@progbits'; +$mcount_adjust = 0; $type = ".long"; if ($arch eq "x86_64") {
@@ -351,6 +353,9 @@ if ($arch eq "x86_64") { } elsif ($arch eq "microblaze") { # Microblaze calls '_mcount' instead of plain 'mcount'. $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; +} elsif ($arch eq "blackfin") { + $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$"; + $mcount_adjust = -4; } else { die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD"; }
@@ -511,7 +516,7 @@ while (<IN>) { } # is this a call site to mcount? If so, record it to print later if ($text_found && /$mcount_regex/) { - push(@offsets, hex $1); + push(@offsets, (hex $1) + $mcount_adjust); } }
tools/perf/Makefile +10 -6
@@ -157,10 +157,6 @@ all:: # # Define NO_DWARF if you do not want debug-info analysis feature at all. -$(shell sh -c 'mkdir -p $(OUTPUT)scripts/{perl,python}/Perf-Trace-Util/' 2> /dev/null) -$(shell sh -c 'mkdir -p $(OUTPUT)util/{ui/browsers,scripting-engines}/' 2> /dev/null) -$(shell sh -c 'mkdir $(OUTPUT)bench' 2> /dev/null) - $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE @$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT) -include $(OUTPUT)PERF-VERSION-FILE
@@ -186,8 +182,6 @@ ifeq ($(ARCH),x86_64) ARCH := x86 endif -$(shell sh -c 'mkdir -p $(OUTPUT)arch/$(ARCH)/util/' 2> /dev/null) - # CFLAGS and LDFLAGS are for the users to override from the command line. #
@@ -268,6 +262,7 @@ export prefix bindir sharedir sysconfdir CC = $(CROSS_COMPILE)gcc AR = $(CROSS_COMPILE)ar RM = rm -f +MKDIR = mkdir TAR = tar FIND = find INSTALL = install
@@ -838,6 +833,7 @@ ifndef V QUIET_CC = @echo ' ' CC $@; QUIET_AR = @echo ' ' AR $@; QUIET_LINK = @echo ' ' LINK $@; + QUIET_MKDIR = @echo ' ' MKDIR $@; QUIET_BUILT_IN = @echo ' ' BUILTIN $@; QUIET_GEN = @echo ' ' GEN $@; QUIET_SUBDIR0 = +@subdir=
@@ -1012,6 +1008,14 @@ $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) $(patsubst perf-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) builtin-revert.o wt-status.o: wt-status.h +# we compile into subdirectories. if the target directory is not the source directory, they might not exists. So +# we depend the various files onto their directories. +DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h +$(DIRECTORY_DEPS): $(sort $(dir $(DIRECTORY_DEPS))) +# In the second step, we make a rule to actually create these directories +$(sort $(dir $(DIRECTORY_DEPS))): + $(QUIET_MKDIR)$(MKDIR) -p $@ 2>/dev/null + $(LIB_FILE): $(LIB_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
tools/perf/util/ui/browsers/annotate.c +2 -1
@@ -146,6 +146,7 @@ static int annotate_browser__run(struct annotate_browser *self,return -1 ;newtFormAddHotKey (self->b.form,NEWT_KEY_LEFT ); +newtFormAddHotKey (self->b.form,NEWT_KEY_RIGHT ); nd = self->curr_hot;if (nd) {
@@ -178,7 +179,7 @@ static int annotate_browser__run(struct annotate_browser *self, } out:ui_browser__hide (&self->b); -return 0 ; +return es->u.key; }int hist_entry__tui_annotate (struct hist_entry *self)