From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>, Ingo Molnar <mingo@redhat.com>
Cc: linux-kernel@vger.kernel.org, adrian.hunter@intel.com,
Arnaldo Carvalho de Melo <acme@infradead.org>,
Vince Weaver <vince@deater.net>,
Stephane Eranian <eranian@google.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [PATCH RFC v1 4/4] perf/x86: Annotate some of the error codes with perf_err()
Date: Fri, 24 Jul 2015 14:45:59 +0300 [thread overview]
Message-ID: <1437738359-23920-5-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1437738359-23920-1-git-send-email-alexander.shishkin@linux.intel.com>
This patch annotates a few x86-specific error paths with perf's extended
error reporting facility.
NYet-Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
arch/x86/kernel/cpu/perf_event.c | 8 ++++++--
arch/x86/kernel/cpu/perf_event_intel_lbr.c | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 3658de4790..2b22e57100 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -12,6 +12,8 @@
* For licencing details see kernel-base/COPYING
*/
+#define PERF_MODNAME "perf/x86"
+
#include <linux/perf_event.h>
#include <linux/capability.h>
#include <linux/notifier.h>
@@ -426,11 +428,13 @@ int x86_setup_perfctr(struct perf_event *event)
/* BTS is currently only allowed for user-mode. */
if (!attr->exclude_kernel)
- return -EOPNOTSUPP;
+ return perf_err(-EOPNOTSUPP,
+ "BTS sampling not allowed for kernel space");
/* disallow bts if conflicting events are present */
if (x86_add_exclusive(x86_lbr_exclusive_lbr))
- return -EBUSY;
+ return perf_err(-EBUSY,
+ "LBR conflicts with active events");
event->destroy = hw_perf_lbr_event_destroy;
}
diff --git a/arch/x86/kernel/cpu/perf_event_intel_lbr.c b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
index 452a7bd2de..b004fb310f 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
@@ -577,7 +577,7 @@ int intel_pmu_setup_lbr_filter(struct perf_event *event)
* no LBR on this PMU
*/
if (!x86_pmu.lbr_nr)
- return -EOPNOTSUPP;
+ return perf_err(-EOPNOTSUPP, "LBR is not supported by this cpu");
/*
* setup SW LBR filter
--
2.1.4
next prev parent reply other threads:[~2015-07-24 11:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-24 11:45 [PATCH RFC v1 0/4] perf: Introduce extended syscall error reporting Alexander Shishkin
2015-07-24 11:45 ` [PATCH RFC v1 1/4] " Alexander Shishkin
2015-07-30 12:09 ` Alexander Shishkin
2015-08-05 15:18 ` Peter Zijlstra
2015-08-05 15:35 ` Peter Zijlstra
2015-08-05 15:45 ` Peter Zijlstra
2015-08-17 12:51 ` Alexander Shishkin
2015-08-05 16:10 ` Peter Zijlstra
2015-07-24 11:45 ` [PATCH RFC v1 2/4] perf: Add file name and line number to perf extended error reports Alexander Shishkin
2015-07-24 11:45 ` [PATCH RFC v1 3/4] perf: Annotate some of the error codes with perf_err() Alexander Shishkin
2015-07-24 11:45 ` Alexander Shishkin [this message]
2015-08-05 17:01 ` [PATCH RFC v1 0/4] perf: Introduce extended syscall error reporting Peter Zijlstra
2015-08-22 13:51 ` Ingo Molnar
2015-08-24 13:52 ` Alexander Shishkin
2015-08-25 8:48 ` Ingo Molnar
2015-08-27 11:12 ` Alexander Shishkin
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=1437738359-23920-5-git-send-email-alexander.shishkin@linux.intel.com \
--to=alexander.shishkin@linux.intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@infradead.org \
--cc=adrian.hunter@intel.com \
--cc=eranian@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=vince@deater.net \
/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
all inboxes | Powered by JetHome®