perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: af76815a31adc75dd9526230affdd678e65ac59f Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Misc fixes, most of them on the tooling side.
Thanks,
Ingo
------------------>
Andi Kleen (1):
perf tools: fix BFD detection on opensuse
Jiri Olsa (1):
perf tools: Fix strict alias issue for find_first_bit
Namhyung Kim (2):
perf annotate: Check availability of annotate when processing samples perf symbols: Destroy unused symsrcs
Peter Zijlstra (2):
perf/x86: Fix event scheduling
perf: Fix hotplug splat
arch/x86/kernel/cpu/perf_event.c | 3 +++ kernel/events/core.c | 12 +++++----- tools/perf/builtin-report.c | 40 ++++++++++++++++++------------- tools/perf/builtin-top.c | 6 +++-- tools/perf/config/Makefile | 2 +- tools/perf/config/feature-checks/Makefile | 2 +- tools/perf/util/annotate.c | 9 ++++++- tools/perf/util/annotate.h | 2 ++ tools/perf/util/include/linux/bitops.h | 4 +++- tools/perf/util/symbol.c | 2 ++ 10 files changed, 54 insertions(+), 28 deletions(-)
arch/x86/kernel/cpu/perf_event.c +3 -0
@@ -1192,6 +1192,9 @@ static void x86_pmu_del(struct perf_event *event, int flags)for (i =0 ; i < cpuc->n_events; i++) {if (event == cpuc->event_list[i]) { +if (i >= cpuc->n_events - cpuc->n_added) + --cpuc->n_added; +if (x86_pmu.put_event_constraints) x86_pmu.put_event_constraints (cpuc, event);
kernel/events/core.c +6 -6
@@ -7856,14 +7856,14 @@ static void perf_pmu_rotate_stop(struct pmu *pmu)static void __perf_event_exit_context (void *__info) {struct perf_event_context *ctx = __info; -struct perf_event *event, *tmp; +struct perf_event *event;perf_pmu_rotate_stop (ctx->pmu); -list_for_each_entry_safe (event, tmp, &ctx->pinned_groups, group_entry) -__perf_remove_from_context (event); -list_for_each_entry_safe (event, tmp, &ctx->flexible_groups, group_entry) +rcu_read_lock (); +list_for_each_entry_rcu (event, &ctx->event_list, event_entry)__perf_remove_from_context (event); +rcu_read_unlock (); }static void perf_event_exit_cpu_context (int cpu)
@@ -7887,11 +7887,11 @@ static void perf_event_exit_cpu(int cpu) {struct swevent_htable *swhash = &per_cpu (swevent_htable, cpu); +perf_event_exit_cpu_context (cpu); +mutex_lock (&swhash->hlist_mutex);swevent_hlist_release (swhash);mutex_unlock (&swhash->hlist_mutex); - -perf_event_exit_cpu_context (cpu); }#else static inline void perf_event_exit_cpu (int cpu) { }
tools/perf/builtin-report.c +24 -16
@@ -113,14 +113,16 @@ static int report__add_mem_hist_entry(struct perf_tool *tool, struct addr_locatiif (!he)return -ENOMEM ; - err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); -if (err) - goto out; +if (ui__has_annotation ()) { + err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); +if (err) + goto out; - mx = he->mem_info; - err =addr_map_symbol__inc_samples (&mx->daddr, evsel->idx); -if (err) - goto out; + mx = he->mem_info; + err =addr_map_symbol__inc_samples (&mx->daddr, evsel->idx); +if (err) + goto out; + } evsel->hists.stats.total_period += cost;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE );
@@ -164,14 +166,18 @@ static int report__add_branch_hist_entry(struct perf_tool *tool, struct addr_loc he =__hists__add_entry (&evsel->hists, al, parent, &bi[i],NULL ,1 ,1 ,0 );if (he) { - bx = he->branch_info; - err =addr_map_symbol__inc_samples (&bx->from, evsel->idx); -if (err) - goto out; - - err =addr_map_symbol__inc_samples (&bx->to, evsel->idx); -if (err) - goto out; +if (ui__has_annotation ()) { + bx = he->branch_info; + err =addr_map_symbol__inc_samples (&bx->from, + evsel->idx); +if (err) + goto out; + + err =addr_map_symbol__inc_samples (&bx->to, + evsel->idx); +if (err) + goto out; + } evsel->hists.stats.total_period +=1 ;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE );
@@ -205,7 +211,9 @@ static int report__add_hist_entry(struct perf_tool *tool, struct perf_evsel *evsif (err) goto out; - err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); +if (ui__has_annotation ()) + err =hist_entry__inc_addr_samples (he, evsel->idx, al->addr); + evsel->hists.stats.total_period += sample->period;hists__inc_nr_events (&evsel->hists,PERF_RECORD_SAMPLE ); out:
tools/perf/builtin-top.c +4 -2
@@ -176,7 +176,7 @@ static void perf_top__record_precise_ip(struct perf_top *top, {struct annotation *notes;struct symbol *sym; -int err; +int err =0 ; if (he == NULL || he->ms.sym == NULL || ((top->sym_filter_entry == NULL ||
@@ -190,7 +190,9 @@ static void perf_top__record_precise_ip(struct perf_top *top,return ; ip = he->ms.map->map_ip (he->ms.map, ip); - err =hist_entry__inc_addr_samples (he, counter, ip); + +if (ui__has_annotation ()) + err =hist_entry__inc_addr_samples (he, counter, ip);pthread_mutex_unlock (¬es->lock);
tools/perf/config/Makefile +1 -1
@@ -478,7 +478,7 @@ else endif ifeq ($(feature-libbfd), 1) - EXTLIBS += -lbfd + EXTLIBS += -lbfd -lz -liberty endif ifdef NO_DEMANGLE
tools/perf/config/feature-checks/Makefile +1 -1
@@ -121,7 +121,7 @@ test-libpython-version.bin: $(BUILD) $(FLAGS_PYTHON_EMBED) test-libbfd.bin: - $(BUILD) -DPACKAGE='"perf"' -lbfd -ldl + $(BUILD) -DPACKAGE='"perf"' -lbfd -lz -liberty -ldl test-liberty.bin: $(CC) -o $(OUTPUT)$@ test-libbfd.c -DPACKAGE='"perf"' -lbfd -ldl -liberty
tools/perf/util/annotate.c +8 -1
@@ -8,6 +8,8 @@*/ #include "util.h" +#include "ui/ui.h" +#include "sort.h" #include "build-id.h" #include "color.h" #include "cache.h"
@@ -489,7 +491,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map, {struct annotation *notes; -if (sym ==NULL || use_browser !=1 || !sort__has_sym) +if (sym ==NULL )return 0 ; notes =symbol__annotation (sym);
@@ -1399,3 +1401,8 @@ int hist_entry__annotate(struct hist_entry *he, size_t privsize) {return symbol__annotate (he->ms.sym, he->ms.map, privsize); } + +bool ui__has_annotation (void ) +{ +return use_browser ==1 && sort__has_sym; +}
tools/perf/util/annotate.h +2 -0
@@ -151,6 +151,8 @@ void symbol__annotate_zero_histogram(struct symbol *sym, int evidx);void symbol__annotate_decay_histogram (struct symbol *sym,int evidx);void disasm__purge (struct list_head *head); +bool ui__has_annotation (void ); +int symbol__tty_annotate (struct symbol *sym,struct map *map,struct perf_evsel *evsel,bool print_lines,bool full_paths,int min_pcnt,int max_lines);
tools/perf/util/include/linux/bitops.h +3 -1
@@ -87,13 +87,15 @@ static __always_inline unsigned long __ffs(unsigned long word)return num; } +typedef const unsigned long __attribute__((__may_alias__)) long_alias_t; +/* * Find the first set bit in a memory region. */ static inline unsigned long find_first_bit (const unsigned long *addr,unsigned long size) { -const unsigned long *p = addr; +long_alias_t *p = (long_alias_t *) addr;unsigned long result =0 ;unsigned long tmp;
tools/perf/util/symbol.c +2 -0
@@ -1336,6 +1336,8 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)if (syms_ss && runtime_ss)break ; + }else { +symsrc__destroy (ss); } }