Commit f3903c91 authored by Ingo Molnar's avatar Ingo Molnar

Merge tag 'perf-urgent-for-mingo-4.17-20180514' of...

Merge tag 'perf-urgent-for-mingo-4.17-20180514' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Fix segfault when processing unknown threads in cs-etm (Leo Yan)

- Fix "perf test inet_pton" on s390 failing due to missing inline (Thomas Richter)

- Display all available events on 'perf annotate --stdio' (Jin Yao)

- Add missing newline when parsing empty BPF proggie (Arnaldo Carvalho de Melo)
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 67b8d5c7 c23080a6
...@@ -16,7 +16,7 @@ nm -g $libc 2>/dev/null | fgrep -q inet_pton || exit 254 ...@@ -16,7 +16,7 @@ nm -g $libc 2>/dev/null | fgrep -q inet_pton || exit 254
trace_libc_inet_pton_backtrace() { trace_libc_inet_pton_backtrace() {
idx=0 idx=0
expected[0]="ping[][0-9 \.:]+probe_libc:inet_pton: \([[:xdigit:]]+\)" expected[0]="ping[][0-9 \.:]+probe_libc:inet_pton: \([[:xdigit:]]+\)"
expected[1]=".*inet_pton[[:space:]]\($libc\)$" expected[1]=".*inet_pton[[:space:]]\($libc|inlined\)$"
case "$(uname -m)" in case "$(uname -m)" in
s390x) s390x)
eventattr='call-graph=dwarf,max-stack=4' eventattr='call-graph=dwarf,max-stack=4'
......
...@@ -1263,6 +1263,9 @@ annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 start ...@@ -1263,6 +1263,9 @@ annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 start
max_percent = sample->percent; max_percent = sample->percent;
} }
if (al->samples_nr > nr_percent)
nr_percent = al->samples_nr;
if (max_percent < min_pcnt) if (max_percent < min_pcnt)
return -1; return -1;
......
...@@ -239,6 +239,7 @@ static void cs_etm__free(struct perf_session *session) ...@@ -239,6 +239,7 @@ static void cs_etm__free(struct perf_session *session)
for (i = 0; i < aux->num_cpu; i++) for (i = 0; i < aux->num_cpu; i++)
zfree(&aux->metadata[i]); zfree(&aux->metadata[i]);
thread__zput(aux->unknown_thread);
zfree(&aux->metadata); zfree(&aux->metadata);
zfree(&aux); zfree(&aux);
} }
...@@ -1357,6 +1358,23 @@ int cs_etm__process_auxtrace_info(union perf_event *event, ...@@ -1357,6 +1358,23 @@ int cs_etm__process_auxtrace_info(union perf_event *event,
etm->auxtrace.free = cs_etm__free; etm->auxtrace.free = cs_etm__free;
session->auxtrace = &etm->auxtrace; session->auxtrace = &etm->auxtrace;
etm->unknown_thread = thread__new(999999999, 999999999);
if (!etm->unknown_thread)
goto err_free_queues;
/*
* Initialize list node so that at thread__zput() we can avoid
* segmentation fault at list_del_init().
*/
INIT_LIST_HEAD(&etm->unknown_thread->node);
err = thread__set_comm(etm->unknown_thread, "unknown", 0);
if (err)
goto err_delete_thread;
if (thread__init_map_groups(etm->unknown_thread, etm->machine))
goto err_delete_thread;
if (dump_trace) { if (dump_trace) {
cs_etm__print_auxtrace_info(auxtrace_info->priv, num_cpu); cs_etm__print_auxtrace_info(auxtrace_info->priv, num_cpu);
return 0; return 0;
...@@ -1371,16 +1389,18 @@ int cs_etm__process_auxtrace_info(union perf_event *event, ...@@ -1371,16 +1389,18 @@ int cs_etm__process_auxtrace_info(union perf_event *event,
err = cs_etm__synth_events(etm, session); err = cs_etm__synth_events(etm, session);
if (err) if (err)
goto err_free_queues; goto err_delete_thread;
err = auxtrace_queues__process_index(&etm->queues, session); err = auxtrace_queues__process_index(&etm->queues, session);
if (err) if (err)
goto err_free_queues; goto err_delete_thread;
etm->data_queued = etm->queues.populated; etm->data_queued = etm->queues.populated;
return 0; return 0;
err_delete_thread:
thread__zput(etm->unknown_thread);
err_free_queues: err_free_queues:
auxtrace_queues__free(&etm->queues); auxtrace_queues__free(&etm->queues);
session->auxtrace = NULL; session->auxtrace = NULL;
......
...@@ -1715,7 +1715,7 @@ int parse_events(struct perf_evlist *evlist, const char *str, ...@@ -1715,7 +1715,7 @@ int parse_events(struct perf_evlist *evlist, const char *str,
struct perf_evsel *last; struct perf_evsel *last;
if (list_empty(&parse_state.list)) { if (list_empty(&parse_state.list)) {
WARN_ONCE(true, "WARNING: event parser found nothing"); WARN_ONCE(true, "WARNING: event parser found nothing\n");
return -1; return -1;
} }
......
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