History

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar. * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Fix perf_event_for_each() to use sibling perf symbols: Read plt symbols from proper symtab_type binary tracing: Fix stacktrace of latency tracers (irqsoff and friends) perf tools: Add 'G' and 'H' modifiers to event parsing tracing: Fix regression with tracing_on perf tools: Drop CROSS_COMPILE from flex and bison calls perf report: Fix crash showing warning related to kernel maps tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)

Linus Torvalds committed 14 years ago

Commit 06fc5d32 parents f607245 724b6da9 files · +64 −21Browse files

Unified · Split

9 files
  1. kernel/events/core.c +1 −1
  2. kernel/trace/trace.c +5 −3
  3. kernel/trace/trace.h +2 −2
  4. kernel/trace/trace_output.c +5 −0
  5. tools/perf/Makefile +2 −2
  6. tools/perf/builtin-report.c +12 −5
  7. tools/perf/builtin-test.c +30 −0
  8. tools/perf/util/parse-events.l +1 −1
  9. tools/perf/util/symbol.c +6 −7
kernel/events/core.c+1−1
@@ -3183,7 +3183,7 @@ static void perf_event_for_each(struct perf_event *event, · 3182 unmodified lines
31833183 perf_event_for_each_child(event, func);
31843184 func(event);
31853185 list_for_each_entry(sibling, &event->sibling_list, group_entry)
3186− perf_event_for_each_child(event, func);
3186+ perf_event_for_each_child(sibling, func);
31873187 mutex_unlock(&ctx->mutex);
31883188 }
31893189
kernel/trace/trace.c+5−3
@@ -4629,7 +4629,8 @@ static ssize_t · 4628 unmodified lines
46294629 rb_simple_read(struct file *filp, char __user *ubuf,
46304630 size_t cnt, loff_t *ppos)
46314631 {
4632− struct ring_buffer *buffer = filp->private_data;
4632+ struct trace_array *tr = filp->private_data;
4633+ struct ring_buffer *buffer = tr->buffer;
46334634 char buf[64];
46344635 int r;
46354636
@@ -4647,7 +4648,8 @@ static ssize_t · 11 unmodified lines
46474648 rb_simple_write(struct file *filp, const char __user *ubuf,
46484649 size_t cnt, loff_t *ppos)
46494650 {
4650− struct ring_buffer *buffer = filp->private_data;
4651+ struct trace_array *tr = filp->private_data;
4652+ struct ring_buffer *buffer = tr->buffer;
46514653 unsigned long val;
46524654 int ret;
46534655
@@ -4734,7 +4736,7 @@ static __init int tracer_init_debugfs(void) · 80 unmodified lines
47344736 &trace_clock_fops);
47354737
47364738 trace_create_file("tracing_on", 0644, d_tracer,
4737− global_trace.buffer, &rb_simple_fops);
4739+ &global_trace, &rb_simple_fops);
47384740
47394741 #ifdef CONFIG_DYNAMIC_FTRACE
47404742 trace_create_file("dyn_ftrace_total_info", 0444, d_tracer,
kernel/trace/trace.h+2−2
@@ -836,11 +836,11 @@ extern const char *__stop___trace_bprintk_fmt[]; · 835 unmodified lines
836836 filter)
837837 #include "trace_entries.h"
838838
839−#ifdef CONFIG_FUNCTION_TRACER
839+#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_FUNCTION_TRACER)
840840 int perf_ftrace_event_register(struct ftrace_event_call *call,
841841 enum trace_reg type, void *data);
842842 #else
843843 #define perf_ftrace_event_register NULL
844−#endif /* CONFIG_FUNCTION_TRACER */
844+#endif
845845
846846 #endif /* _LINUX_KERNEL_TRACE_H */
kernel/trace/trace_output.c+5−0
@@ -652,6 +652,8 @@ int trace_print_lat_context(struct trace_iterator *iter) · 651 unmodified lines
652652 {
653653 u64 next_ts;
654654 int ret;
655+ /* trace_find_next_entry will reset ent_size */
656+ int ent_size = iter->ent_size;
655657 struct trace_seq *s = &iter->seq;
656658 struct trace_entry *entry = iter->ent,
657659 *next_entry = trace_find_next_entry(iter, NULL,
@@ -660,6 +662,9 @@ int trace_print_lat_context(struct trace_iterator *iter) · 2 unmodified lines
660662 unsigned long abs_usecs = ns2usecs(iter->ts - iter->tr->time_start);
661663 unsigned long rel_usecs;
662664
665+ /* Restore the original ent_size */
666+ iter->ent_size = ent_size;
667+
663668 if (!next_entry)
664669 next_ts = iter->ts;
665670 rel_usecs = ns2usecs(next_ts - iter->ts);
tools/perf/Makefile+2−2
@@ -234,8 +234,8 @@ endif · 233 unmodified lines
234234
235235 export PERL_PATH
236236
237−FLEX = $(CROSS_COMPILE)flex
238−BISON= $(CROSS_COMPILE)bison
237+FLEX = flex
238+BISON= bison
239239
240240 $(OUTPUT)util/parse-events-flex.c: util/parse-events.l
241241 $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c
tools/perf/builtin-report.c+12−5
@@ -374,16 +374,23 @@ static int __cmd_report(struct perf_report *rep) · 373 unmodified lines
374374 (kernel_map->dso->hit &&
375375 (kernel_kmap->ref_reloc_sym == NULL ||
376376 kernel_kmap->ref_reloc_sym->addr == 0))) {
377− const struct dso *kdso = kernel_map->dso;
377+ const char *desc =
378+ "As no suitable kallsyms nor vmlinux was found, kernel samples\n"
379+ "can't be resolved.";
380+
381+ if (kernel_map) {
382+ const struct dso *kdso = kernel_map->dso;
383+ if (!RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION])) {
384+ desc = "If some relocation was applied (e.g. "
385+ "kexec) symbols may be misresolved.";
386+ }
387+ }
378388
379389 ui__warning(
380390 "Kernel address maps (/proc/{kallsyms,modules}) were restricted.\n\n"
381391 "Check /proc/sys/kernel/kptr_restrict before running 'perf record'.\n\n%s\n\n"
382392 "Samples in kernel modules can't be resolved as well.\n\n",
383− RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION]) ?
384−"As no suitable kallsyms nor vmlinux was found, kernel samples\n"
385−"can't be resolved." :
386−"If some relocation was applied (e.g. kexec) symbols may be misresolved.");
393+ desc);
387394 }
388395
389396 if (dump_trace) {
tools/perf/builtin-test.c+30−0
@@ -851,6 +851,28 @@ static int test__checkevent_symbolic_name_modifier(struct perf_evlist *evlist) · 850 unmodified lines
851851 return test__checkevent_symbolic_name(evlist);
852852 }
853853
854+static int test__checkevent_exclude_host_modifier(struct perf_evlist *evlist)
855+{
856+ struct perf_evsel *evsel = list_entry(evlist->entries.next,
857+ struct perf_evsel, node);
858+
859+ TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
860+ TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
861+
862+ return test__checkevent_symbolic_name(evlist);
863+}
864+
865+static int test__checkevent_exclude_guest_modifier(struct perf_evlist *evlist)
866+{
867+ struct perf_evsel *evsel = list_entry(evlist->entries.next,
868+ struct perf_evsel, node);
869+
870+ TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
871+ TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
872+
873+ return test__checkevent_symbolic_name(evlist);
874+}
875+
854876 static int test__checkevent_symbolic_alias_modifier(struct perf_evlist *evlist)
855877 {
856878 struct perf_evsel *evsel = list_entry(evlist->entries.next,
@@ -1091,6 +1113,14 @@ static struct test__event_st { · 234 unmodified lines
10911113 .name = "r1,syscalls:sys_enter_open:k,1:1:hp",
10921114 .check = test__checkevent_list,
10931115 },
1116+ {
1117+ .name = "instructions:G",
1118+ .check = test__checkevent_exclude_host_modifier,
1119+ },
1120+ {
1121+ .name = "instructions:H",
1122+ .check = test__checkevent_exclude_guest_modifier,
1123+ },
10941124 };
10951125
10961126 #define TEST__EVENTS_CNT (sizeof(test__events) / sizeof(struct test__event_st))
tools/perf/util/parse-events.l+1−1
@@ -54,7 +54,7 @@ num_dec [0-9]+ · 53 unmodified lines
5454 num_hex 0x[a-fA-F0-9]+
5555 num_raw_hex [a-fA-F0-9]+
5656 name [a-zA-Z_*?][a-zA-Z0-9_*?]*
57−modifier_event [ukhp]{1,5}
57+modifier_event [ukhpGH]{1,8}
5858 modifier_bp [rwx]
5959
6060 %%
tools/perf/util/symbol.c+6−7
@@ -977,8 +977,9 @@ static Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep, · 976 unmodified lines
977977 * And always look at the original dso, not at debuginfo packages, that
978978 * have the PLT data stripped out (shdr_rel_plt.sh_type == SHT_NOBITS).
979979 */
980−static int dso__synthesize_plt_symbols(struct dso *dso, struct map *map,
981− symbol_filter_t filter)
980+static int
981+dso__synthesize_plt_symbols(struct dso *dso, char *name, struct map *map,
982+ symbol_filter_t filter)
982983 {
983984 uint32_t nr_rel_entries, idx;
984985 GElf_Sym sym;
@@ -993,10 +994,7 @@ static int dso__synthesize_plt_symbols(struct dso *dso, struct map *map, · 8 unmodified lines
993994 char sympltname[1024];
994995 Elf *elf;
995996 int nr = 0, symidx, fd, err = 0;
996− char name[PATH_MAX];
997997
998− snprintf(name, sizeof(name), "%s%s",
999− symbol_conf.symfs, dso->long_name);
1000998 fd = open(name, O_RDONLY);
1001999 if (fd < 0)
10021000 goto out;
@@ -1703,8 +1701,9 @@ restart: · 700 unmodified lines
17031701 continue;
17041702
17051703 if (ret > 0) {
1706− int nr_plt = dso__synthesize_plt_symbols(dso, map,
1707− filter);
1704+ int nr_plt;
1705+
1706+ nr_plt = dso__synthesize_plt_symbols(dso, name, map, filter);
17081707 if (nr_plt > 0)
17091708 ret += nr_plt;
17101709 break;