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 7/7] perf: add AUX record
Date: Wed, 11 Jun 2014 18:41:50 +0300 [thread overview]
Message-ID: <1402501310-31940-8-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1402501310-31940-1-git-send-email-alexander.shishkin@linux.intel.com>
When there's new data in the AUX space, output a record indicating its
offset and size and weather it was truncated to fix in the ring buffer.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
include/uapi/linux/perf_event.h | 15 +++++++++++++++
kernel/events/core.c | 38 ++++++++++++++++++++++++++++++++++++++
kernel/events/internal.h | 3 +++
kernel/events/ring_buffer.c | 1 +
4 files changed, 57 insertions(+)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index dd10f16..7f8621f 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -726,6 +726,21 @@ enum perf_event_type {
*/
PERF_RECORD_MMAP2 = 10,
+ /*
+ * Records that new data landed in the AUX buffer part.
+ *
+ * struct {
+ * struct perf_event_header header;
+ *
+ * u64 aux_offset;
+ * u64 aux_size;
+ * u8 truncated;
+ * u64 id;
+ * u64 stream_id;
+ * };
+ */
+ PERF_RECORD_AUX = 11,
+
PERF_RECORD_MAX, /* non-ABI */
};
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 44d6d01..cd64b75 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5394,6 +5394,44 @@ void perf_event_mmap(struct vm_area_struct *vma)
perf_event_mmap_event(&mmap_event);
}
+void perf_event_aux_event(struct perf_event *event, unsigned long head,
+ unsigned long size, bool truncated)
+{
+ struct perf_output_handle handle;
+ struct perf_sample_data sample;
+ struct perf_aux_event {
+ struct perf_event_header header;
+ u64 offset;
+ u64 size;
+ u8 truncated;
+ u64 id;
+ u64 stream_id;
+ } rec = {
+ .header = {
+ .type = PERF_RECORD_AUX,
+ .misc = 0,
+ .size = sizeof(rec),
+ },
+ .offset = head,
+ .size = size,
+ .truncated = truncated,
+ .id = primary_event_id(event),
+ .stream_id = event->id,
+ };
+ int ret;
+
+ perf_event_header__init_id(&rec.header, &sample, event);
+ ret = perf_output_begin(&handle, event, rec.header.size);
+
+ if (ret)
+ return;
+
+ perf_output_put(&handle, rec);
+ perf_event__output_id_sample(event, &handle, &sample);
+
+ perf_output_end(&handle);
+}
+
/*
* IRQ throttle logging
*/
diff --git a/kernel/events/internal.h b/kernel/events/internal.h
index e20d073..8bc4547 100644
--- a/kernel/events/internal.h
+++ b/kernel/events/internal.h
@@ -63,6 +63,9 @@ static inline bool rb_has_aux(struct ring_buffer *rb)
return !!rb->aux_nr_pages;
}
+void perf_event_aux_event(struct perf_event *event, unsigned long head,
+ unsigned long size, bool truncated);
+
extern void
perf_event_header__init_id(struct perf_event_header *header,
struct perf_sample_data *data,
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 8f76e5c..4e6f815 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -280,6 +280,7 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size,
aux_head = local_read(&rb->aux_head);
local_add(size, &rb->aux_head);
+ perf_event_aux_event(handle->event, aux_head, size, truncated);
rb->user_page->aux_head = local_read(&rb->aux_head);
smp_wmb();
--
2.0.0
prev parent reply other threads:[~2014-06-11 15:51 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 ` [RFC v2 5/7] perf: add a pmu capability for "exclusive" events Alexander Shishkin
2014-06-24 17:18 ` 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 ` Alexander Shishkin [this message]
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-8-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;
as well as URLs for NNTP newsgroup(s).