From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, Robert Richter <rric@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Mike Galbraith <efault@gmx.de>, Paul Mackerras <paulus@samba.org>,
Stephane Eranian <eranian@google.com>,
Andi Kleen <ak@linux.intel.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [RFC v2 5/7] perf: add a pmu capability for "exclusive" events
Date: Wed, 11 Jun 2014 18:41:48 +0300 [thread overview]
Message-ID: <1402501310-31940-6-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1402501310-31940-1-git-send-email-alexander.shishkin@linux.intel.com>
Usually, pmus that do, for example, instruction tracing, would only ever
be able to have one event per task per cpu (or per perf_context). For such
pmus it makes sense to disallow creating conflicting events early on, so
as to provide consistent behavior for the user.
This patch adds a pmu capability that indicates such constraint on event
creation.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
include/linux/perf_event.h | 1 +
kernel/events/core.c | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3d68411..b6f7408 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -277,6 +277,7 @@ struct pmu {
#define PERF_PMU_CAP_NO_INTERRUPT 1
#define PERF_PMU_CAP_AUX_NO_SG 2
#define PERF_PMU_CAP_AUX_SW_DOUBLEBUF 4
+#define PERF_PMU_CAP_EXCLUSIVE 8
/**
* enum perf_event_active_state - the states of a event
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 48ad31b..9783c60 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7113,6 +7113,32 @@ out:
return ret;
}
+static bool exclusive_event_match(struct perf_event *e1, struct perf_event *e2)
+{
+ if ((e1->pmu->capabilities & PERF_PMU_CAP_EXCLUSIVE) &&
+ (e1->cpu == e2->cpu ||
+ e1->cpu == -1 ||
+ e2->cpu == -1))
+ return true;
+ return false;
+}
+
+static bool exclusive_event_ok(struct perf_event *event,
+ struct perf_event_context *ctx)
+{
+ struct perf_event *iter_event;
+
+ if (!(event->pmu->capabilities & PERF_PMU_CAP_EXCLUSIVE))
+ return true;
+
+ list_for_each_entry(iter_event, &ctx->event_list, event_entry) {
+ if (exclusive_event_match(iter_event, event))
+ return false;
+ }
+
+ return true;
+}
+
/**
* sys_perf_event_open - open a performance event, associate it to a task/cpu
*
@@ -7261,6 +7287,11 @@ SYSCALL_DEFINE5(perf_event_open,
goto err_alloc;
}
+ if (!exclusive_event_ok(event, ctx)) {
+ err = -EBUSY;
+ goto err_context;
+ }
+
if (task) {
put_task_struct(task);
task = NULL;
@@ -7427,6 +7458,13 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu,
goto err_free;
}
+ if (!exclusive_event_ok(event, ctx)) {
+ perf_unpin_context(ctx);
+ put_ctx(ctx);
+ err = -EBUSY;
+ goto err_free;
+ }
+
WARN_ON_ONCE(ctx->parent_ctx);
mutex_lock(&ctx->mutex);
perf_install_in_context(ctx, event, cpu);
--
2.0.0
next prev parent reply other threads:[~2014-06-11 15:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-11 15:41 [RFC v2 0/7] perf: perf: add AUX space to ring_buffer Alexander Shishkin
2014-06-11 15:41 ` [RFC v2 1/7] perf: add data_{offset,size} to user_page Alexander Shishkin
2014-06-13 13:51 ` Robert Richter
2014-06-11 15:41 ` [RFC v2 2/7] perf: add AUX area to ring buffer for raw data streams Alexander Shishkin
2014-06-24 17:19 ` Peter Zijlstra
2014-06-25 11:09 ` Alexander Shishkin
2014-06-25 12:11 ` Peter Zijlstra
2014-06-11 15:41 ` [RFC v2 3/7] perf: support high-order allocations for AUX space Alexander Shishkin
2014-06-11 15:41 ` [RFC v2 4/7] perf: add a capability for AUX_NO_SG pmus to do software double buffering Alexander Shishkin
2014-06-11 15:41 ` Alexander Shishkin [this message]
2014-06-24 17:18 ` [RFC v2 5/7] perf: add a pmu capability for "exclusive" events Peter Zijlstra
2014-06-25 11:12 ` Alexander Shishkin
2014-06-11 15:41 ` [RFC v2 6/7] perf: add api for pmus to write to AUX space Alexander Shishkin
2014-06-24 17:27 ` Peter Zijlstra
2014-06-25 11:24 ` Alexander Shishkin
2014-06-25 12:12 ` Peter Zijlstra
2014-06-11 15:41 ` [RFC v2 7/7] perf: add AUX record 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=1402501310-31940-6-git-send-email-alexander.shishkin@linux.intel.com \
--to=alexander.shishkin@linux.intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=ak@linux.intel.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=rric@kernel.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
Powered by JetHome