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: 1f9a7268c67f0290837aada443d28fd953ddca90 perf: Do not allow optimized switch for non-cloned events
Tooling fixes and an Intel PMU driver fixlet.
Thanks,
Ingo
------------------>
HATAYAMA Daisuke (1):
perf/x86/intel: ignore CondChgd bit to avoid false NMI handling
Jiri Olsa (2):
perf tools: Fix segfault in cumulative.callchain report
perf: Do not allow optimized switch for non-cloned events
Simon Que (1):
perf symbols: Get kernel start address by symbol name
arch/x86/kernel/cpu/perf_event_intel.c | 9 ++++++ kernel/events/core.c | 2 +- tools/perf/ui/browsers/hists.c | 21 +++++++++---- tools/perf/util/machine.c | 54 ++++++++++++++-------------------- 4 files changed, 48 insertions(+), 38 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +9 -0
@@ -1382,6 +1382,15 @@ again:intel_pmu_lbr_read ();/* +* CondChgd bit 63 doesn't mean any overflow status. Ignore +* and clear the bit. +*/ +if (__test_and_clear_bit (63 , (unsigned long *)&status)) { +if (!status) + goto done; + } + +/* * PEBS overflow sets bit 62 in the global status register */ if (__test_and_clear_bit (62 , (unsigned long *)&status)) {
kernel/events/core.c +1 -1
@@ -2320,7 +2320,7 @@ static void perf_event_context_sched_out(struct task_struct *task, int ctxn, next_parent =rcu_dereference (next_ctx->parent_ctx);/* If neither context have a parent context; they cannot be clones. */ -if (!parent && !next_parent) +if (!parent || !next_parent) goto unlock;if (next_parent == ctx || next_ctx == parent || next_parent == parent) {
tools/perf/ui/browsers/hists.c +16 -5
@@ -17,6 +17,7 @@#include "../util.h" #include "../ui.h" #include "map.h" +#include "annotate.h" struct hist_browser {struct ui_browser b;
@@ -1593,13 +1594,18 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, bi->to.sym->name) > 0) annotate_t = nr_options++; }else { -if (browser->selection !=NULL && browser->selection->sym !=NULL && - !browser->selection->map->dso->annotate_warned && -asprintf (&options[nr_options],"Annotate %s" , - browser->selection->sym->name) >0 ) - annotate = nr_options++; + !browser->selection->map->dso->annotate_warned) { +struct annotation *notes; + + notes =symbol__annotation (browser->selection->sym); + +if (notes->src && +asprintf (&options[nr_options],"Annotate %s" , + browser->selection->sym->name) >0 ) + annotate = nr_options++; + } } if (thread != NULL &&
@@ -1656,6 +1662,7 @@ retry_popup_menu:if (choice == annotate || choice == annotate_t || choice == annotate_f) {struct hist_entry *he; +struct annotation *notes;int err; do_annotate:if (!objdump_path &&perf_session_env__lookup_objdump (env))
@@ -1679,6 +1686,10 @@ do_annotate: he->ms.map = he->branch_info->to.map; } + notes =symbol__annotation (he->ms.sym); +if (!notes->src) +continue ; +/* * Don't let this be freed, say, by hists__decay_entry. */
tools/perf/util/machine.c +22 -32
90 lines not on this page · raw message