From: tip-bot for Wang Nan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, lizefan@huawei.com, tglx@linutronix.de,
wangnan0@huawei.com, hpa@zytor.com, mingo@kernel.org,
linux-kernel@vger.kernel.org
Subject: [tip:perf/urgent] perf record: Fix crash when kptr is restricted
Date: Sun, 29 May 2016 11:19:40 -0700 [thread overview]
Message-ID: <tip-3dc6c1d54ff4cc9ce7e8513c286c970304cde20b@git.kernel.org> (raw)
In-Reply-To: <1464081688-167940-2-git-send-email-wangnan0@huawei.com>
Commit-ID: 3dc6c1d54ff4cc9ce7e8513c286c970304cde20b
Gitweb: http://git.kernel.org/tip/3dc6c1d54ff4cc9ce7e8513c286c970304cde20b
Author: Wang Nan <wangnan0@huawei.com>
AuthorDate: Tue, 24 May 2016 09:21:28 +0000
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 27 May 2016 09:41:39 -0300
perf record: Fix crash when kptr is restricted
Before this patch, a simple 'perf record' could fail if kptr_restrict is
set to 1 (for normal user) or 2 (for root):
# perf record ls
WARNING: Kernel address maps (/proc/{kallsyms,modules}) are restricted,
check /proc/sys/kernel/kptr_restrict.
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.
Samples in kernel modules won't be resolved at all.
If some relocation was applied (e.g. kexec) symbols may be misresolved
even with a suitable vmlinux or kallsyms file.
Segmentation fault (core dumped)
This patch skips perf_event__synthesize_kernel_mmap() when kptr is not
available.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Fixes: 45e90056904b ("perf machine: Do not bail out if not managing to read ref reloc symbol")
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1464081688-167940-2-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/event.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index f6fcc68..9b141f1 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -673,6 +673,8 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
int err;
union perf_event *event;
+ if (symbol_conf.kptr_restrict)
+ return -1;
if (map == NULL)
return -1;
next prev parent reply other threads:[~2016-05-29 18:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 9:21 [PATCH 1/2] perf tools: Check kptr_restrict for root Wang Nan
2016-05-24 9:21 ` [PATCH 2/2] perf record: Fix crash when kptr is restricted Wang Nan
2016-05-24 12:26 ` Arnaldo Carvalho de Melo
2016-05-24 12:41 ` Arnaldo Carvalho de Melo
2016-05-29 18:19 ` tip-bot for Wang Nan [this message]
2016-05-24 12:25 ` [PATCH 1/2] perf tools: Check kptr_restrict for root Arnaldo Carvalho de Melo
2016-05-29 18:19 ` [tip:perf/urgent] perf symbols: " tip-bot for Wang Nan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-3dc6c1d54ff4cc9ce7e8513c286c970304cde20b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox