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>,
Johannes Berg <johannes@sipsolutions.net>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [PATCH v2 3/6] perf: Annotate some of the error codes with perf_err()
Date: Mon, 24 Aug 2015 17:32:57 +0300 [thread overview]
Message-ID: <1440426780-27227-4-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1440426780-27227-1-git-send-email-alexander.shishkin@linux.intel.com>
This patch annotates a few semi-random error paths in perf core to
illustrate the extended error reporting facility. Most of them can
be triggered from perf tools.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
kernel/events/core.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 3ff28fc8bd..7beab37ea6 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3382,10 +3382,10 @@ find_lively_task_by_vpid(pid_t vpid)
rcu_read_unlock();
if (!task)
- return ERR_PTR(-ESRCH);
+ return PERF_ERR_PTR(-ESRCH, "task not found");
/* Reuse ptrace permission checks for now. */
- err = -EACCES;
+ err = perf_err(-EACCES, "insufficient permissions for tracing this task");
if (!ptrace_may_access(task, PTRACE_MODE_READ))
goto errout;
@@ -3413,7 +3413,8 @@ find_get_context(struct pmu *pmu, struct task_struct *task,
if (!task) {
/* Must be root to operate on a CPU event: */
if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))
- return ERR_PTR(-EACCES);
+ return PERF_ERR_PTR(-EACCES,
+ "must be root to operate on a CPU event");
/*
* We could be clever and allow to attach a event to an
@@ -3421,7 +3422,7 @@ find_get_context(struct pmu *pmu, struct task_struct *task,
* that's for later.
*/
if (!cpu_online(cpu))
- return ERR_PTR(-ENODEV);
+ return PERF_ERR_PTR(-ENODEV, "cpu is offline");
cpuctx = per_cpu_ptr(pmu->pmu_cpu_context, cpu);
ctx = &cpuctx->ctx;
@@ -8134,15 +8135,16 @@ SYSCALL_DEFINE5(perf_event_open,
if (!attr.exclude_kernel) {
if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN))
- return -EACCES;
+ return perf_err_sync(&attr, -EACCES,
+ "kernel tracing forbidden for the unprivileged");
}
if (attr.freq) {
if (attr.sample_freq > sysctl_perf_event_sample_rate)
- return -EINVAL;
+ return perf_err_sync(&attr, -EINVAL, "sample_freq too high");
} else {
if (attr.sample_period & (1ULL << 63))
- return -EINVAL;
+ return perf_err_sync(&attr, -EINVAL, "sample_period too high");
}
/*
@@ -8152,14 +8154,14 @@ SYSCALL_DEFINE5(perf_event_open,
* cgroup.
*/
if ((flags & PERF_FLAG_PID_CGROUP) && (pid == -1 || cpu == -1))
- return -EINVAL;
+ return perf_err_sync(&attr, -EINVAL, "pid and cpu need to be set in cgroup mode");
if (flags & PERF_FLAG_FD_CLOEXEC)
f_flags |= O_CLOEXEC;
event_fd = get_unused_fd_flags(f_flags);
if (event_fd < 0)
- return event_fd;
+ return perf_err_sync(&attr, event_fd, "can't obtain a file descriptor");
if (group_fd != -1) {
err = perf_fget_light(group_fd, &group);
--
2.5.0
next prev parent reply other threads:[~2015-08-24 14:35 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 14:32 [PATCH v2 0/6] perf: Introduce extended syscall error reporting Alexander Shishkin
2015-08-24 14:32 ` [PATCH v2 1/6] " Alexander Shishkin
2015-08-31 18:47 ` Andy Shevchenko
2015-09-01 6:38 ` Alexander Shishkin
2015-08-24 14:32 ` [PATCH v2 2/6] perf: Add file name and line number to perf extended error reports Alexander Shishkin
2015-08-24 14:32 ` Alexander Shishkin [this message]
2015-08-24 14:32 ` [PATCH v2 4/6] perf/x86: Annotate some of the error codes with perf_err() Alexander Shishkin
2015-08-24 14:32 ` [PATCH v2 5/6] perf/x86/intel/pt: Use extended error reporting in event initialization Alexander Shishkin
2015-08-24 14:33 ` [PATCH v2 6/6] perf/x86/intel/bts: " Alexander Shishkin
2015-08-25 8:22 ` [PATCH v2 0/6] perf: Introduce extended syscall error reporting Ingo Molnar
2015-08-25 8:52 ` Johannes Berg
2015-08-25 9:02 ` Ingo Molnar
2015-08-25 9:17 ` Ingo Molnar
2015-08-25 9:34 ` Johannes Berg
2015-08-25 10:07 ` Ingo Molnar
2015-08-25 10:19 ` Johannes Berg
2015-08-26 4:49 ` Ingo Molnar
[not found] ` <CA+55aFw--OFczoY=v17+e2-Q3O0GXnMKRuwzpYpB2qKBpZo=fw@mail.gmail.com>
2015-08-26 7:02 ` Ingo Molnar
2015-08-26 7:06 ` Johannes Berg
2015-08-26 7:20 ` Ingo Molnar
2015-08-26 7:26 ` Ingo Molnar
2015-08-26 16:56 ` Alexander Shishkin
2015-08-26 20:58 ` Arnaldo Carvalho de Melo
2015-09-11 16:11 ` Alexander Shishkin
2015-08-26 18:41 ` Andrew Morton
2015-08-26 20:05 ` Peter Zijlstra
2015-08-26 20:22 ` Andrew Morton
2015-08-26 20:50 ` Vince Weaver
2015-08-26 20:56 ` Andrew Morton
2015-08-26 21:14 ` Vince Weaver
2015-08-28 10:07 ` Ingo Molnar
2015-08-26 21:04 ` Arnaldo Carvalho de Melo
2015-08-26 7:36 ` Johannes Berg
2015-08-26 11:37 ` 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=1440426780-27227-4-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=johannes@sipsolutions.net \
--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
Powered by JetHome