From: tip-bot for Hendrik Brueckner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: brueckner@linux.vnet.ibm.com, bjhoupu@linux.vnet.ibm.com,
mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org,
alexander.shishkin@linux.intel.com,
torvalds@linux-foundation.org, tmricht@linux.vnet.ibm.com,
peterz@infradead.org, tglx@linutronix.de
Subject: [tip:perf/urgent] perf/aux: Correct return code of rb_alloc_aux() if !has_aux(ev)
Date: Wed, 21 Jun 2017 09:46:02 -0700 [thread overview]
Message-ID: <tip-8a1898db51a3390241cd5fae267dc8aaa9db0f8b@git.kernel.org> (raw)
In-Reply-To: <1497954399-6355-1-git-send-email-brueckner@linux.vnet.ibm.com>
Commit-ID: 8a1898db51a3390241cd5fae267dc8aaa9db0f8b
Gitweb: http://git.kernel.org/tip/8a1898db51a3390241cd5fae267dc8aaa9db0f8b
Author: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
AuthorDate: Tue, 20 Jun 2017 12:26:39 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 21 Jun 2017 11:58:30 +0200
perf/aux: Correct return code of rb_alloc_aux() if !has_aux(ev)
If the event for which an AUX area is about to be allocated, does
not support setting up an AUX area, rb_alloc_aux() return -ENOTSUPP.
This error condition is being returned unfiltered to the user space,
and, for example, the perf tools fails with:
failed to mmap with 524 (INTERNAL ERROR: strerror_r(524, 0x3fff497a1c8, 512)=22)
This error can be easily seen with "perf record -m 128,256 -e cpu-clock".
The 524 error code maps to -ENOTSUPP (in rb_alloc_aux()). The -ENOTSUPP
error code shall be only used within the kernel. So the correct error
code would then be -EOPNOTSUPP.
With this commit, the perf tool then reports:
failed to mmap with 95 (Operation not supported)
which is more clear.
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Acked-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Pu Hou <bjhoupu@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Cc: acme@kernel.org
Cc: linux-s390@vger.kernel.org
Link: http://lkml.kernel.org/r/1497954399-6355-1-git-send-email-brueckner@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/events/ring_buffer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 2831480..ee97196 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -580,7 +580,7 @@ int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event,
int ret = -ENOMEM, max_order = 0;
if (!has_aux(event))
- return -ENOTSUPP;
+ return -EOPNOTSUPP;
if (event->pmu->capabilities & PERF_PMU_CAP_AUX_NO_SG) {
/*
prev parent reply other threads:[~2017-06-21 16:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-20 10:26 [PATCH] kernel/perf: correct return code of rb_alloc_aux() if !has_aux(ev) Hendrik Brueckner
2017-06-20 12:26 ` Alexander Shishkin
2017-06-21 16:46 ` tip-bot for Hendrik Brueckner [this message]
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-8a1898db51a3390241cd5fae267dc8aaa9db0f8b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bjhoupu@linux.vnet.ibm.com \
--cc=brueckner@linux.vnet.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tmricht@linux.vnet.ibm.com \
--cc=torvalds@linux-foundation.org \
/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