| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20190704160024.56600-2-alexander.shishkin@linux.intel.com>
Date: Thu, 4 Jul 2019 19:00:18 +0300
From: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
To: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>,
Ingo Molnar <mingo@...hat.com>, linux-kernel@...r.kernel.org,
kan.liang@...ux.intel.com,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Subject: [PATCH v1 1/7] perf: Allow normal events to be sources of AUX data
In some cases, ordinary (non-AUX) events can generate data for AUX events.
For example, PEBS events can come out as records in the Intel PT stream
instead of their usual DS records, if configured to do so.
One requirement for such events is to consistently schedule together, to
ensure that the data from the "AUX source" events isn't lost while their
corresponding AUX event is not scheduled. We use grouping to provide this
guarantee: an "AUX source" event can be added to a group with an AUX event,
provided that the former supports writing to the latter.
Signed-off-by: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
---
include/linux/perf_event.h | 14 +++++
include/uapi/linux/perf_event.h | 3 +-
kernel/events/core.c | 92 +++++++++++++++++++++++++++++++++
3 files changed, 108 insertions(+), 1 deletion(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 201cc93cec32..7e5920b94290 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -245,6 +245,7 @@ struct perf_event;
#define PERF_PMU_CAP_ITRACE 0x20
#define PERF_PMU_CAP_HETEROGENEOUS_CPUS 0x40
#define PERF_PMU_CAP_NO_EXCLUDE 0x80
+#define PERF_PMU_CAP_AUX_SOURCE 0x100
/**
* struct pmu - generic performance monitoring unit
@@ -445,6 +446,16 @@ struct pmu {
void (*addr_filters_sync) (struct perf_event *event);
/* optional */
+ /*
+ * Check if event can be used for aux_source purposes for
+ * events of this PMU.
+ *
+ * Runs from perf_event_open(). Should return 0 for "no match"
+ * or non-zero for "match".
+ */
+ int (*aux_source_match) (struct perf_event *event);
+ /* optional */
+
/*
* Filter events for PMU-specific reasons.
*/
@@ -680,6 +691,9 @@ struct perf_event {
struct perf_addr_filter_range *addr_filter_ranges;
unsigned long addr_filters_gen;
+ /* for aux_source events */
+ struct perf_event *aux_event;
+
void (*destroy)(struct perf_event *);
struct rcu_head rcu_head;
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 7198ddd0c6b1..213cae95e713 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -374,7 +374,8 @@ struct perf_event_attr {
namespaces : 1, /* include namespaces data */
ksymbol : 1, /* include ksymbol events */
bpf_event : 1, /* include bpf events */
- __reserved_1 : 33;
+ aux_source : 1, /* generate AUX records instead of events */
+ __reserved_1 : 32;
union {
__u32 wakeup_events; /* wakeup every n events */
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 8cfb721bb284..fc586da37067 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1887,6 +1887,57 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
ctx->generation++;
}
+static int
+perf_aux_source_match(struct perf_event *event, struct perf_event *aux_event)
+{
+ if (!has_aux(aux_event))
+ return 0;
+
+ if (!event->pmu->aux_source_match)
+ return 0;
+
+ return event->pmu->aux_source_match(aux_event);
+}
+
+static void put_event(struct perf_event *event);
+static void event_sched_out(struct perf_event *event,
+ struct perf_cpu_context *cpuctx,
+ struct perf_event_context *ctx);
+
+static void perf_put_aux_event(struct perf_event *event)
+{
+ struct perf_event_context *ctx = event->ctx;
+ struct perf_cpu_context *cpuctx = __get_cpu_context(ctx);
+ struct perf_event *iter = NULL;
+
+ /*
+ * If event uses aux_event tear down the link
+ */
+ if (event->aux_event) {
+ put_event(event->aux_event);
+ event->aux_event = NULL;
+ return;
+ }
+
+ /*
+ * If the event is an aux_event, tear down all links to
+ * it from other events.
+ */
+ for_each_sibling_event(iter, event->group_leader) {
+ if (iter->aux_event != event)
+ continue;
+
+ iter->aux_event = NULL;
+ put_event(event);
+
+ /*
+ * If it's ACTIVE, schedule it out. It won't schedule
+ * again because !aux_event.
+ */
+ event_sched_out(iter, cpuctx, ctx);
+ }
+}
+
static void perf_group_detach(struct perf_event *event)
{
struct perf_event *sibling, *tmp;
@@ -1902,6 +1953,8 @@ static void perf_group_detach(struct perf_event *event)
event->attach_state &= ~PERF_ATTACH_GROUP;
+ perf_put_aux_event(event);
+
/*
* If this is a sibling, remove it from its group.
*/
@@ -10396,6 +10449,12 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
goto err_ns;
}
+ if (event->attr.aux_source &&
+ !(pmu->capabilities & PERF_PMU_CAP_AUX_SOURCE)) {
+ err = -EOPNOTSUPP;
+ goto err_pmu;
+ }
+
err = exclusive_event_init(event);
if (err)
goto err_pmu;
@@ -11052,6 +11111,39 @@ SYSCALL_DEFINE5(perf_event_open,
}
}
+ if (event->attr.aux_source) {
+ struct perf_event *aux_event = group_leader;
+
+ /*
+ * One of the events in the group must be an aux event
+ * if we want to be an aux_source. This way, the aux event
+ * will precede its aux_source events in the group, and
+ * therefore will always schedule first.
+ */
+ err = -EINVAL;
+ if (!aux_event)
+ goto err_locked;
+
+ if (perf_aux_source_match(event, aux_event))
+ goto found_aux;
+
+ for_each_sibling_event(aux_event, group_leader) {
+ if (perf_aux_source_match(event, aux_event))
+ goto found_aux;
+ }
+
+ goto err_locked;
+
+found_aux:
+ /*
+ * Link aux_sources to their aux event; this is undone in
+ * perf_group_detach(). When the group in torn down, the
+ * aux_source events loose their link to the aux_event and
+ * can't schedule any more.
+ */
+ if (atomic_long_inc_not_zero(&aux_event->refcount))
+ event->aux_event = aux_event;
+ }
/*
* Must be under the same ctx::mutex as perf_install_in_context(),
--
2.20.1
Powered by blists - more mailing lists