Commit 9c7d619b authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'perf-tools-fixes-for-v5.9-2020-09-01' of...

Merge tag 'perf-tools-fixes-for-v5.9-2020-09-01' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix infinite loop in the TUI for grouped events in 'perf top/record',
   eg when using "perf top -e '{cycles,instructions,cache-misses}'".

 - Fix segfault by skipping side-band event setup if HAVE_LIBBPF_SUPPORT
   is not set.

 - Fix synthesized branch stacks generated from CoreSight ETM trace and
   Intel PT hardware traces.

 - Fix error when synthesizing events from ARM SPE hardware trace.

 - The SNOOPX and REMOTE offsets in the data_src bitmask in perf records
   were were both 37, SNOOPX is 38, fix it.

 - Fix use of CPU list with summary option in 'perf sched timehist'.

 - Avoid an uninitialized read when using fake PMUs.

 - Set perf_event_attr.exclude_guest=1 for user-space counting.

 - Don't order events when doing a 'perf report -D' raw dump of
   perf.data records.

 - Set NULL sentinel in pmu_events table in "Parse and process metrics"
   'perf test'

 - Fix basic bpf filtering 'perf test' on s390x.

 - Fix out of bounds array access in the 'perf stat' print_counters()
   evlist method.

 - Add mwait_idle_with_hints.constprop.0 to the list of idle symbols.

 - Use %zd for size_t printf formats on 32-bit.

 - Correct the help info of "perf record --no-bpf-event" option.

 - Add entries for CoreSight and Arm SPE tooling to MAINTAINERS.

* tag 'perf-tools-fixes-for-v5.9-2020-09-01' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf report: Disable ordered_events for raw dump
  perf tools: Correct SNOOPX field offset
  perf intel-pt: Fix corrupt data after perf inject from
  perf cs-etm: Fix corrupt data after perf inject from
  perf top/report: Fix infinite loop in the TUI for grouped events
  perf parse-events: Avoid an uninitialized read when using fake PMUs
  perf stat: Fix out of bounds array access in the print_counters() evlist method
  perf test: Set NULL sentinel in pmu_events table in "Parse and process metrics" test
  perf parse-events: Set exclude_guest=1 for user-space counting
  perf record: Correct the help info of option "--no-bpf-event"
  perf tools: Use %zd for size_t printf formats on 32-bit
  MAINTAINERS: Add entries for CoreSight and Arm SPE tooling
  perf: arm-spe: Fix check error when synthesizing events
  perf symbols: Add mwait_idle_with_hints.constprop.0 to the list of idle symbols
  perf top: Skip side-band event setup if HAVE_LIBBPF_SUPPORT is not set
  perf sched timehist: Fix use of CPU list with summary option
  perf test: Fix basic bpf filtering test
parents dcdfd9cc 977f739b
...@@ -13571,12 +13571,18 @@ F: kernel/events/* ...@@ -13571,12 +13571,18 @@ F: kernel/events/*
F: tools/lib/perf/ F: tools/lib/perf/
F: tools/perf/ F: tools/perf/
PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS PERFORMANCE EVENTS TOOLING ARM64
R: John Garry <john.garry@huawei.com> R: John Garry <john.garry@huawei.com>
R: Will Deacon <will@kernel.org> R: Will Deacon <will@kernel.org>
R: Mathieu Poirier <mathieu.poirier@linaro.org>
R: Leo Yan <leo.yan@linaro.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Supported S: Supported
F: tools/build/feature/test-libopencsd.c
F: tools/perf/arch/arm*/
F: tools/perf/pmu-events/arch/arm64/ F: tools/perf/pmu-events/arch/arm64/
F: tools/perf/util/arm-spe*
F: tools/perf/util/cs-etm*
PERSONALITY HANDLING PERSONALITY HANDLING
M: Christoph Hellwig <hch@infradead.org> M: Christoph Hellwig <hch@infradead.org>
......
...@@ -1196,7 +1196,7 @@ union perf_mem_data_src { ...@@ -1196,7 +1196,7 @@ union perf_mem_data_src {
#define PERF_MEM_SNOOPX_FWD 0x01 /* forward */ #define PERF_MEM_SNOOPX_FWD 0x01 /* forward */
/* 1 free */ /* 1 free */
#define PERF_MEM_SNOOPX_SHIFT 37 #define PERF_MEM_SNOOPX_SHIFT 38
/* locked instruction */ /* locked instruction */
#define PERF_MEM_LOCK_NA 0x01 /* not available */ #define PERF_MEM_LOCK_NA 0x01 /* not available */
......
...@@ -2452,7 +2452,7 @@ static struct option __record_options[] = { ...@@ -2452,7 +2452,7 @@ static struct option __record_options[] = {
OPT_BOOLEAN(0, "tail-synthesize", &record.opts.tail_synthesize, OPT_BOOLEAN(0, "tail-synthesize", &record.opts.tail_synthesize,
"synthesize non-sample events at the end of output"), "synthesize non-sample events at the end of output"),
OPT_BOOLEAN(0, "overwrite", &record.opts.overwrite, "use overwrite mode"), OPT_BOOLEAN(0, "overwrite", &record.opts.overwrite, "use overwrite mode"),
OPT_BOOLEAN(0, "no-bpf-event", &record.opts.no_bpf_event, "record bpf events"), OPT_BOOLEAN(0, "no-bpf-event", &record.opts.no_bpf_event, "do not record bpf events"),
OPT_BOOLEAN(0, "strict-freq", &record.opts.strict_freq, OPT_BOOLEAN(0, "strict-freq", &record.opts.strict_freq,
"Fail if the specified frequency can't be used"), "Fail if the specified frequency can't be used"),
OPT_CALLBACK('F', "freq", &record.opts, "freq or 'max'", OPT_CALLBACK('F', "freq", &record.opts, "freq or 'max'",
......
...@@ -1332,6 +1332,9 @@ int cmd_report(int argc, const char **argv) ...@@ -1332,6 +1332,9 @@ int cmd_report(int argc, const char **argv)
if (report.mmaps_mode) if (report.mmaps_mode)
report.tasks_mode = true; report.tasks_mode = true;
if (dump_trace)
report.tool.ordered_events = false;
if (quiet) if (quiet)
perf_quiet_option(); perf_quiet_option();
......
...@@ -2584,6 +2584,7 @@ static int timehist_sched_change_event(struct perf_tool *tool, ...@@ -2584,6 +2584,7 @@ static int timehist_sched_change_event(struct perf_tool *tool,
} }
if (!sched->idle_hist || thread->tid == 0) { if (!sched->idle_hist || thread->tid == 0) {
if (!cpu_list || test_bit(sample->cpu, cpu_bitmap))
timehist_update_runtime_stats(tr, t, tprev); timehist_update_runtime_stats(tr, t, tprev);
if (sched->idle_hist) { if (sched->idle_hist) {
...@@ -2857,6 +2858,9 @@ static void timehist_print_summary(struct perf_sched *sched, ...@@ -2857,6 +2858,9 @@ static void timehist_print_summary(struct perf_sched *sched,
printf("\nIdle stats:\n"); printf("\nIdle stats:\n");
for (i = 0; i < idle_max_cpu; ++i) { for (i = 0; i < idle_max_cpu; ++i) {
if (cpu_list && !test_bit(i, cpu_bitmap))
continue;
t = idle_threads[i]; t = idle_threads[i];
if (!t) if (!t)
continue; continue;
......
...@@ -1746,6 +1746,7 @@ int cmd_top(int argc, const char **argv) ...@@ -1746,6 +1746,7 @@ int cmd_top(int argc, const char **argv)
goto out_delete_evlist; goto out_delete_evlist;
} }
#ifdef HAVE_LIBBPF_SUPPORT
if (!top.record_opts.no_bpf_event) { if (!top.record_opts.no_bpf_event) {
top.sb_evlist = evlist__new(); top.sb_evlist = evlist__new();
...@@ -1759,6 +1760,7 @@ int cmd_top(int argc, const char **argv) ...@@ -1759,6 +1760,7 @@ int cmd_top(int argc, const char **argv)
goto out_delete_evlist; goto out_delete_evlist;
} }
} }
#endif
if (perf_evlist__start_sb_thread(top.sb_evlist, target)) { if (perf_evlist__start_sb_thread(top.sb_evlist, target)) {
pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n"); pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n");
......
...@@ -197,7 +197,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void), ...@@ -197,7 +197,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
perf_mmap__read_done(&md->core); perf_mmap__read_done(&md->core);
} }
if (count != expect) { if (count != expect * evlist->core.nr_entries) {
pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect, count); pr_debug("BPF filter result incorrect, expected %d, got %d samples\n", expect, count);
goto out_delete_evlist; goto out_delete_evlist;
} }
......
...@@ -719,7 +719,7 @@ static int test__group2(struct evlist *evlist) ...@@ -719,7 +719,7 @@ static int test__group2(struct evlist *evlist)
TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->core.attr.exclude_kernel); TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->core.attr.exclude_kernel);
TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv); TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv);
TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude guest", evsel->core.attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
...@@ -842,7 +842,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) ...@@ -842,7 +842,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)
TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel); TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel);
TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv); TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv);
TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude guest", evsel->core.attr.exclude_guest);
TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);
TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip); TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);
TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel)); TEST_ASSERT_VAL("wrong leader", evsel__is_group_leader(evsel));
......
...@@ -70,6 +70,9 @@ static struct pmu_event pme_test[] = { ...@@ -70,6 +70,9 @@ static struct pmu_event pme_test[] = {
{ {
.metric_expr = "1/m3", .metric_expr = "1/m3",
.metric_name = "M3", .metric_name = "M3",
},
{
.name = NULL,
} }
}; };
......
...@@ -3629,8 +3629,8 @@ int perf_evlist__tui_browse_hists(struct evlist *evlist, const char *help, ...@@ -3629,8 +3629,8 @@ int perf_evlist__tui_browse_hists(struct evlist *evlist, const char *help,
{ {
int nr_entries = evlist->core.nr_entries; int nr_entries = evlist->core.nr_entries;
single_entry:
if (perf_evlist__single_entry(evlist)) { if (perf_evlist__single_entry(evlist)) {
single_entry: {
struct evsel *first = evlist__first(evlist); struct evsel *first = evlist__first(evlist);
return perf_evsel__hists_browse(first, nr_entries, help, return perf_evsel__hists_browse(first, nr_entries, help,
...@@ -3638,6 +3638,7 @@ int perf_evlist__tui_browse_hists(struct evlist *evlist, const char *help, ...@@ -3638,6 +3638,7 @@ int perf_evlist__tui_browse_hists(struct evlist *evlist, const char *help,
env, warn_lost_event, env, warn_lost_event,
annotation_opts); annotation_opts);
} }
}
if (symbol_conf.event_group) { if (symbol_conf.event_group) {
struct evsel *pos; struct evsel *pos;
......
...@@ -182,15 +182,15 @@ static int arm_spe_read_record(struct arm_spe_decoder *decoder) ...@@ -182,15 +182,15 @@ static int arm_spe_read_record(struct arm_spe_decoder *decoder)
if (payload & BIT(EV_TLB_ACCESS)) if (payload & BIT(EV_TLB_ACCESS))
decoder->record.type |= ARM_SPE_TLB_ACCESS; decoder->record.type |= ARM_SPE_TLB_ACCESS;
if ((idx == 1 || idx == 2 || idx == 3) && if ((idx == 2 || idx == 4 || idx == 8) &&
(payload & BIT(EV_LLC_MISS))) (payload & BIT(EV_LLC_MISS)))
decoder->record.type |= ARM_SPE_LLC_MISS; decoder->record.type |= ARM_SPE_LLC_MISS;
if ((idx == 1 || idx == 2 || idx == 3) && if ((idx == 2 || idx == 4 || idx == 8) &&
(payload & BIT(EV_LLC_ACCESS))) (payload & BIT(EV_LLC_ACCESS)))
decoder->record.type |= ARM_SPE_LLC_ACCESS; decoder->record.type |= ARM_SPE_LLC_ACCESS;
if ((idx == 1 || idx == 2 || idx == 3) && if ((idx == 2 || idx == 4 || idx == 8) &&
(payload & BIT(EV_REMOTE_ACCESS))) (payload & BIT(EV_REMOTE_ACCESS)))
decoder->record.type |= ARM_SPE_REMOTE_ACCESS; decoder->record.type |= ARM_SPE_REMOTE_ACCESS;
......
...@@ -1344,8 +1344,15 @@ static int cs_etm__synth_events(struct cs_etm_auxtrace *etm, ...@@ -1344,8 +1344,15 @@ static int cs_etm__synth_events(struct cs_etm_auxtrace *etm,
attr.sample_type &= ~(u64)PERF_SAMPLE_ADDR; attr.sample_type &= ~(u64)PERF_SAMPLE_ADDR;
} }
if (etm->synth_opts.last_branch) if (etm->synth_opts.last_branch) {
attr.sample_type |= PERF_SAMPLE_BRANCH_STACK; attr.sample_type |= PERF_SAMPLE_BRANCH_STACK;
/*
* We don't use the hardware index, but the sample generation
* code uses the new format branch_stack with this field,
* so the event attributes must indicate that it's present.
*/
attr.branch_sample_type |= PERF_SAMPLE_BRANCH_HW_INDEX;
}
if (etm->synth_opts.instructions) { if (etm->synth_opts.instructions) {
attr.config = PERF_COUNT_HW_INSTRUCTIONS; attr.config = PERF_COUNT_HW_INSTRUCTIONS;
......
...@@ -3017,8 +3017,15 @@ static int intel_pt_synth_events(struct intel_pt *pt, ...@@ -3017,8 +3017,15 @@ static int intel_pt_synth_events(struct intel_pt *pt,
if (pt->synth_opts.callchain) if (pt->synth_opts.callchain)
attr.sample_type |= PERF_SAMPLE_CALLCHAIN; attr.sample_type |= PERF_SAMPLE_CALLCHAIN;
if (pt->synth_opts.last_branch) if (pt->synth_opts.last_branch) {
attr.sample_type |= PERF_SAMPLE_BRANCH_STACK; attr.sample_type |= PERF_SAMPLE_BRANCH_STACK;
/*
* We don't use the hardware index, but the sample generation
* code uses the new format branch_stack with this field,
* so the event attributes must indicate that it's present.
*/
attr.branch_sample_type |= PERF_SAMPLE_BRANCH_HW_INDEX;
}
if (pt->synth_opts.instructions) { if (pt->synth_opts.instructions) {
attr.config = PERF_COUNT_HW_INSTRUCTIONS; attr.config = PERF_COUNT_HW_INSTRUCTIONS;
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "util/evsel_config.h" #include "util/evsel_config.h"
#include "util/event.h" #include "util/event.h"
#include "util/pfm.h" #include "util/pfm.h"
#include "perf.h"
#define MAX_NAME_LEN 100 #define MAX_NAME_LEN 100
...@@ -1533,19 +1534,23 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, ...@@ -1533,19 +1534,23 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
evsel = __add_event(list, &parse_state->idx, &attr, true, evsel = __add_event(list, &parse_state->idx, &attr, true,
get_config_name(head_config), pmu, get_config_name(head_config), pmu,
&config_terms, auto_merge_stats, NULL); &config_terms, auto_merge_stats, NULL);
if (evsel) { if (!evsel)
return -ENOMEM;
evsel->pmu_name = name ? strdup(name) : NULL;
evsel->use_uncore_alias = use_uncore_alias;
evsel->percore = config_term_percore(&evsel->config_terms);
if (parse_state->fake_pmu)
return 0;
evsel->unit = info.unit; evsel->unit = info.unit;
evsel->scale = info.scale; evsel->scale = info.scale;
evsel->per_pkg = info.per_pkg; evsel->per_pkg = info.per_pkg;
evsel->snapshot = info.snapshot; evsel->snapshot = info.snapshot;
evsel->metric_expr = info.metric_expr; evsel->metric_expr = info.metric_expr;
evsel->metric_name = info.metric_name; evsel->metric_name = info.metric_name;
evsel->pmu_name = name ? strdup(name) : NULL; return 0;
evsel->use_uncore_alias = use_uncore_alias;
evsel->percore = config_term_percore(&evsel->config_terms);
}
return evsel ? 0 : -ENOMEM;
} }
int parse_events_multi_pmu_add(struct parse_events_state *parse_state, int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
...@@ -1794,6 +1799,8 @@ static int get_event_modifier(struct event_modifier *mod, char *str, ...@@ -1794,6 +1799,8 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
if (*str == 'u') { if (*str == 'u') {
if (!exclude) if (!exclude)
exclude = eu = ek = eh = 1; exclude = eu = ek = eh = 1;
if (!exclude_GH && !perf_guest)
eG = 1;
eu = 0; eu = 0;
} else if (*str == 'k') { } else if (*str == 'k') {
if (!exclude) if (!exclude)
......
...@@ -87,7 +87,7 @@ static int perf_session__process_compressed_event(struct perf_session *session, ...@@ -87,7 +87,7 @@ static int perf_session__process_compressed_event(struct perf_session *session,
session->decomp_last = decomp; session->decomp_last = decomp;
} }
pr_debug("decomp (B): %ld to %ld\n", src_size, decomp_size); pr_debug("decomp (B): %zd to %zd\n", src_size, decomp_size);
return 0; return 0;
} }
......
...@@ -117,7 +117,7 @@ static void aggr_printout(struct perf_stat_config *config, ...@@ -117,7 +117,7 @@ static void aggr_printout(struct perf_stat_config *config,
cpu_map__id_to_die(id), cpu_map__id_to_die(id),
config->csv_output ? 0 : -3, config->csv_output ? 0 : -3,
cpu_map__id_to_cpu(id), config->csv_sep); cpu_map__id_to_cpu(id), config->csv_sep);
} else { } else if (id > -1) {
fprintf(config->output, "CPU%*d%s", fprintf(config->output, "CPU%*d%s",
config->csv_output ? 0 : -7, config->csv_output ? 0 : -7,
evsel__cpus(evsel)->map[id], evsel__cpus(evsel)->map[id],
......
...@@ -663,6 +663,7 @@ static bool symbol__is_idle(const char *name) ...@@ -663,6 +663,7 @@ static bool symbol__is_idle(const char *name)
"exit_idle", "exit_idle",
"mwait_idle", "mwait_idle",
"mwait_idle_with_hints", "mwait_idle_with_hints",
"mwait_idle_with_hints.constprop.0",
"poll_idle", "poll_idle",
"ppc64_runlatch_off", "ppc64_runlatch_off",
"pseries_dedicated_idle_sleep", "pseries_dedicated_idle_sleep",
......
...@@ -99,7 +99,7 @@ size_t zstd_decompress_stream(struct zstd_data *data, void *src, size_t src_size ...@@ -99,7 +99,7 @@ size_t zstd_decompress_stream(struct zstd_data *data, void *src, size_t src_size
while (input.pos < input.size) { while (input.pos < input.size) {
ret = ZSTD_decompressStream(data->dstream, &output, &input); ret = ZSTD_decompressStream(data->dstream, &output, &input);
if (ZSTD_isError(ret)) { if (ZSTD_isError(ret)) {
pr_err("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n", pr_err("failed to decompress (B): %zd -> %zd, dst_size %zd : %s\n",
src_size, output.size, dst_size, ZSTD_getErrorName(ret)); src_size, output.size, dst_size, ZSTD_getErrorName(ret));
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment