Skip to content

Commit

Permalink
perf tools: Make sure kptr_restrict warnings fit 80 col terms
Browse files Browse the repository at this point in the history
Suggested-by: Ingo Molnar <mingo@elte.hu>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
Link: http://lkml.kernel.org/n/tip-i1p8vrhq7xveyui6t1sc914e@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed May 27, 2011
1 parent d6a72fe commit 646aaea
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 21 deletions.
19 changes: 8 additions & 11 deletions tools/perf/builtin-record.c
Original file line number Diff line number Diff line change
Expand Up @@ -824,17 +824,14 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
symbol__init();

if (symbol_conf.kptr_restrict)
pr_warning("WARNING: Kernel address maps "
"(/proc/{kallsyms,modules}) are restricted, "
"check /proc/sys/kernel/kptr_restrict.\n\n"
"Samples in kernel functions may not be resolved "
"if a suitable vmlinux file is not found in the "
"buildid cache or in the vmlinux path.\n\n"
"Samples in kernel modules won't be resolved "
"at all.\n\n"
"If some relocation was applied (e.g. kexec) "
"symbols may be misresolved even with a suitable "
"vmlinux or kallsyms file.\n\n");
pr_warning(
"WARNING: Kernel address maps (/proc/{kallsyms,modules}) are restricted,\n"
"check /proc/sys/kernel/kptr_restrict.\n\n"
"Samples in kernel functions may not be resolved if a suitable vmlinux\n"
"file is not found in the buildid cache or in the vmlinux path.\n\n"
"Samples in kernel modules won't be resolved at all.\n\n"
"If some relocation was applied (e.g. kexec) symbols may be misresolved\n"
"even with a suitable vmlinux or kallsyms file.\n\n");

if (no_buildid_cache || no_buildid)
disable_buildid_cache();
Expand Down
17 changes: 7 additions & 10 deletions tools/perf/builtin-report.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,17 +281,14 @@ static int __cmd_report(void)
kernel_kmap->ref_reloc_sym->addr == 0))) {
const struct dso *kdso = kernel_map->dso;

ui__warning("Kernel address maps "
"(/proc/{kallsyms,modules}) were restricted, "
"check /proc/sys/kernel/kptr_restrict before "
"running 'perf record'.\n\n%s\n\n"
"Samples in kernel modules can't be resolved "
"as well.\n\n",
ui__warning(
"Kernel address maps (/proc/{kallsyms,modules}) were restricted.\n\n"
"Check /proc/sys/kernel/kptr_restrict before running 'perf record'.\n\n%s\n\n"
"Samples in kernel modules can't be resolved as well.\n\n",
RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION]) ?
"As no suitable kallsyms nor vmlinux was found, "
"kernel samples can't be resolved." :
"If some relocation was applied (e.g. kexec) "
"symbols may be misresolved.");
"As no suitable kallsyms nor vmlinux was found, kernel samples\n"
"can't be resolved." :
"If some relocation was applied (e.g. kexec) symbols may be misresolved.");
}

if (dump_trace) {
Expand Down

0 comments on commit 646aaea

Please sign in to comment.