All of lore.kernel.org
 help / color / mirror / Atom feed
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 v4 05/22] perf: Add a pmu capability for "exclusive" events
Date: Wed, 20 Aug 2014 15:36:02 +0300	[thread overview]
Message-ID: <1408538179-792-6-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1408538179-792-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 1e7b659b49..6bd3e743b1 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -173,6 +173,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 63d98d6998..67f857ab56 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7248,6 +7248,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
  *
@@ -7399,6 +7425,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;
@@ -7484,6 +7515,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);
@@ -7570,6 +7607,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


  parent reply	other threads:[~2014-08-20 12:42 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-20 12:35 [PATCH v4 00/22] perf: Add infrastructure and support for Intel PT Alexander Shishkin
2014-08-20 12:35 ` [PATCH v4 01/22] perf: Add data_{offset,size} to user_page Alexander Shishkin
2014-08-20 12:35 ` [PATCH v4 02/22] perf: Add AUX area to ring buffer for raw data streams Alexander Shishkin
2014-09-08  7:02   ` Peter Zijlstra
2014-09-08 11:16     ` Alexander Shishkin
2014-09-08 11:34       ` Peter Zijlstra
2014-09-08 12:55         ` Alexander Shishkin
2014-09-08 13:12           ` Peter Zijlstra
2014-10-06  9:08             ` Alexander Shishkin
2014-10-06 16:20               ` Peter Zijlstra
2014-10-06 21:52                 ` Alexander Shishkin
2014-10-07 15:15                   ` Peter Zijlstra
2014-08-20 12:36 ` [PATCH v4 03/22] perf: Support high-order allocations for AUX space Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 04/22] perf: Add a capability for AUX_NO_SG pmus to do software double buffering Alexander Shishkin
2014-09-08  7:17   ` Peter Zijlstra
2014-09-08 11:07     ` Alexander Shishkin
2014-09-08 11:31       ` Peter Zijlstra
2014-08-20 12:36 ` Alexander Shishkin [this message]
2014-08-20 12:36 ` [PATCH v4 06/22] perf: Redirect output from inherited events to parents Alexander Shishkin
2014-09-08 15:26   ` Peter Zijlstra
2014-09-09  9:54     ` Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 07/22] perf: Add api for pmus to write to AUX space Alexander Shishkin
2014-09-08 16:06   ` Peter Zijlstra
2014-09-08 16:18     ` Peter Zijlstra
2014-08-20 12:36 ` [PATCH v4 08/22] perf: Add AUX record Alexander Shishkin
2014-09-09  8:20   ` Peter Zijlstra
2014-08-20 12:36 ` [PATCH v4 09/22] perf: Support overwrite mode for AUX area Alexander Shishkin
2014-09-09  8:33   ` Peter Zijlstra
2014-09-09  8:44   ` Peter Zijlstra
2014-09-09  9:40     ` Alexander Shishkin
2014-09-09 10:55       ` Peter Zijlstra
2014-09-09 11:53         ` Alexander Shishkin
2014-09-09 12:43           ` Peter Zijlstra
2014-09-09 13:00             ` Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 10/22] perf: Add wakeup watermark control to " Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 11/22] perf: add ITRACE_START record to indicate that tracing has started Alexander Shishkin
2014-09-09  9:08   ` Peter Zijlstra
2014-09-09  9:33     ` Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 12/22] x86: Add Intel Processor Trace (INTEL_PT) cpu feature detection Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 13/22] x86: perf: Intel PT and LBR/BTS are mutually exclusive Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 14/22] x86: perf: intel_pt: Intel PT PMU driver Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 15/22] x86: perf: intel_bts: Add BTS " Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 16/22] perf: Add rb_{alloc,free}_kernel api Alexander Shishkin
2014-09-09  9:09   ` Peter Zijlstra
2014-08-20 12:36 ` [PATCH v4 17/22] perf: Add a helper to copy AUX data in the kernel Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 18/22] perf: Add a helper for looking up pmus by type Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 19/22] perf: Add infrastructure for using AUX data in perf samples Alexander Shishkin
2014-09-09  9:11   ` Peter Zijlstra
2014-08-20 12:36 ` [PATCH v4 20/22] perf: Allocate ring buffers for inherited per-task kernel events Alexander Shishkin
2014-09-09  9:12   ` Peter Zijlstra
2014-08-20 12:36 ` [PATCH v4 21/22] perf: Allow AUX sampling for multiple events Alexander Shishkin
2014-08-20 12:36 ` [PATCH v4 22/22] perf: Allow sampling of inherited events Alexander Shishkin
2014-08-25  6:21 ` [PATCH v4 00/22] perf: Add infrastructure and support for Intel PT Adrian Hunter
2014-09-01 16:21   ` Peter Zijlstra
2014-09-01 16:30 ` Peter Zijlstra
2014-09-01 17:17   ` Pawel Moll
     [not found]     ` <CANLsYky0vuwo7MwKbiGXypkLkrX7k6BOEf2uej3-Z3-HZHKd7w@mail.gmail.com>
2014-09-04  8:26       ` Peter Zijlstra
2014-09-05 13:34         ` Mathieu Poirier
2014-09-08 11:55           ` Alexander Shishkin
2014-09-08 13:08             ` Michael Williams
2014-09-08 13:29             ` Al Grant

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=1408538179-792-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.