lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 18 Dec 2013 14:21:17 +0900 From: Namhyung Kim <namhyung@...nel.org> To: Arnaldo Carvalho de Melo <acme@...stprotocols.net> Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>, Paul Mackerras <paulus@...ba.org>, Ingo Molnar <mingo@...nel.org>, Namhyung Kim <namhyung.kim@....com>, LKML <linux-kernel@...r.kernel.org>, Frederic Weisbecker <fweisbec@...il.com>, Arun Sharma <asharma@...com>, Jiri Olsa <jolsa@...hat.com>, Rodrigo Campos <rodrigo@...g.com.ar> Subject: [PATCH 09/18] perf tools: Update cpumode for each cumulative entry From: Namhyung Kim <namhyung.kim@....com> The cpumode and level in struct addr_localtion was set for a sample and but updated as cumulative callchains were added. This led to have non-matching symbol and cpumode in the output. Update it accordingly based on the fact whether the map is a part of the kernel or not. This is a reverse of what thread__find_addr_map() does. Cc: Arun Sharma <asharma@...com> Cc: Frederic Weisbecker <fweisbec@...il.com> Signed-off-by: Namhyung Kim <namhyung@...nel.org> --- tools/perf/builtin-report.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 3bc48e410d06..80c774615287 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -82,6 +82,7 @@ struct add_entry_iter { struct perf_report *rep; struct perf_evsel *evsel; struct perf_sample *sample; + struct machine *machine; struct hist_entry *he; struct symbol *parent; void *priv; @@ -400,7 +401,7 @@ iter_finish_normal_entry(struct add_entry_iter *iter, struct addr_location *al) static int iter_prepare_cumulative_entry(struct add_entry_iter *iter, - struct machine *machine __maybe_unused, + struct machine *machine, struct perf_evsel *evsel, struct addr_location *al __maybe_unused, struct perf_sample *sample) @@ -409,6 +410,7 @@ iter_prepare_cumulative_entry(struct add_entry_iter *iter, iter->evsel = evsel; iter->sample = sample; + iter->machine = machine; return 0; } @@ -469,9 +471,35 @@ iter_next_cumulative_entry(struct add_entry_iter *iter, else al->addr = node->ip; - if (iter->rep->hide_unresolved && al->sym == NULL) - return 0; + if (al->sym == NULL) { + if (iter->rep->hide_unresolved) + return 0; + if (al->map == NULL) + goto out; + } + if (al->map->groups == &iter->machine->kmaps) { + if (machine__is_host(iter->machine)) { + al->cpumode = PERF_RECORD_MISC_KERNEL; + al->level = 'k'; + } else { + al->cpumode = PERF_RECORD_MISC_GUEST_KERNEL; + al->level = 'g'; + } + } else { + if (machine__is_host(iter->machine)) { + al->cpumode = PERF_RECORD_MISC_USER; + al->level = '.'; + } else if (perf_guest) { + al->cpumode = PERF_RECORD_MISC_GUEST_USER; + al->level = 'u'; + } else { + al->cpumode = PERF_RECORD_MISC_HYPERVISOR; + al->level = 'H'; + } + } + +out: callchain_cursor_advance(&callchain_cursor); return 1; } -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists