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>,
kan.liang@intel.com,
Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [PATCH v3 05/23] perf: Add a pmu capability for "exclusive" events
Date: Mon, 11 Aug 2014 08:19:34 +0300 [thread overview]
Message-ID: <1407734392-31097-6-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1407734392-31097-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 | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 71be27169c..b8902ebcb7 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -172,6 +172,7 @@ struct perf_event;
#define PERF_PMU_CAP_NO_INTERRUPT 0x01
#define PERF_PMU_CAP_AUX_NO_SG 0x02
#define PERF_PMU_CAP_AUX_SW_DOUBLEBUF 0x04
+#define PERF_PMU_CAP_EXCLUSIVE 0x08
/**
* struct pmu - generic performance monitoring unit
diff --git a/kernel/events/core.c b/kernel/events/core.c
index c07768d0a0..361a45eee2 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7149,6 +7149,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
*
@@ -7300,6 +7326,11 @@ SYSCALL_DEFINE5(perf_event_open,
goto err_alloc;
}
+ if ((pmu->capabilities & PERF_PMU_CAP_EXCLUSIVE) && group_leader) {
+ err = -EBUSY;
+ goto err_context;
+ }
+
if (task) {
put_task_struct(task);
task = NULL;
@@ -7385,6 +7416,12 @@ SYSCALL_DEFINE5(perf_event_open,
}
}
+ if (!exclusive_event_ok(event, ctx)) {
+ mutex_unlock(&ctx->mutex);
+ fput(event_file);
+ goto err_context;
+ }
+
perf_install_in_context(ctx, event, event->cpu);
perf_unpin_context(ctx);
mutex_unlock(&ctx->mutex);
@@ -7468,6 +7505,14 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu,
WARN_ON_ONCE(ctx->parent_ctx);
mutex_lock(&ctx->mutex);
+ if (!exclusive_event_ok(event, ctx)) {
+ mutex_unlock(&ctx->mutex);
+ perf_unpin_context(ctx);
+ put_ctx(ctx);
+ err = -EBUSY;
+ goto err_free;
+ }
+
perf_install_in_context(ctx, event, cpu);
perf_unpin_context(ctx);
mutex_unlock(&ctx->mutex);
--
2.1.0.rc1
next prev parent reply other threads:[~2014-08-11 5:27 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-11 5:19 [PATCH v3 00/23] perf: Add infrastructure and support for Intel PT Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 01/23] perf: Add data_{offset,size} to user_page Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 02/23] perf: Add AUX area to ring buffer for raw data streams Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 03/23] perf: Support high-order allocations for AUX space Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 04/23] perf: Add a capability for AUX_NO_SG pmus to do software double buffering Alexander Shishkin
2014-08-11 5:19 ` Alexander Shishkin [this message]
2014-08-11 5:19 ` [PATCH v3 06/23] perf: Redirect output from inherited events to parents Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 07/23] perf: Add api for pmus to write to AUX space Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 08/23] perf: Add AUX record Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 09/23] perf: Support overwrite mode for AUX area Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 10/23] perf: Add wakeup watermark control to " Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 11/23] perf: Add itrace_config to the event attribute Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 12/23] perf: add ITRACE_START record to indicate that tracing has started Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 13/23] x86: Add Intel Processor Trace (INTEL_PT) cpu feature detection Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 14/23] x86: perf: Intel PT and LBR/BTS are mutually exclusive Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 15/23] x86: perf: intel_pt: Intel PT PMU driver Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 16/23] x86: perf: intel_bts: Add BTS " Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 17/23] perf: Add rb_{alloc,free}_kernel api Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 18/23] perf: Add a helper to copy AUX data in the kernel Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 19/23] perf: Add a helper for looking up pmus by type Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 20/23] perf: itrace: Infrastructure for sampling instruction flow traces Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 21/23] perf: Allocate ring buffers for inherited per-task kernel events Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 22/23] perf: itrace: Allow itrace sampling for multiple events Alexander Shishkin
2014-08-11 5:19 ` [PATCH v3 23/23] perf: itrace: Allow sampling of inherited events Alexander Shishkin
2014-08-11 5:46 ` [PATCH v3 00/23] perf: Add infrastructure and support for Intel PT Ingo Molnar
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=1407734392-31097-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=kan.liang@intel.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