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 17/22] perf: Add a helper to copy AUX data in the kernel
Date: Wed, 20 Aug 2014 15:36:14 +0300 [thread overview]
Message-ID: <1408538179-792-18-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1408538179-792-1-git-send-email-alexander.shishkin@linux.intel.com>
This patch adds a helper for the kernel counters that generate AUX data to
copy this data around, for example, to output it to the perf ring buffer
as a sample record or write it to a core dump file.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
kernel/events/internal.h | 5 +++++
kernel/events/ring_buffer.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/kernel/events/internal.h b/kernel/events/internal.h
index f4cfa4cabb..bb035dd645 100644
--- a/kernel/events/internal.h
+++ b/kernel/events/internal.h
@@ -52,6 +52,9 @@ struct ring_buffer {
void *data_pages[0];
};
+typedef unsigned long (*aux_copyfn)(void *data, const void *src,
+ unsigned long len);
+
extern void rb_free(struct ring_buffer *rb);
extern struct ring_buffer *
rb_alloc(int nr_pages, long watermark, int cpu, int flags);
@@ -59,6 +62,8 @@ extern void perf_event_wakeup(struct perf_event *event);
extern int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event,
pgoff_t pgoff, int nr_pages, long watermark, int flags);
extern void rb_free_aux(struct ring_buffer *rb, struct perf_event *event);
+extern long rb_output_aux(struct ring_buffer *rb, unsigned long from,
+ unsigned long to, aux_copyfn copyfn, void *data);
extern struct ring_buffer *
rb_alloc_kernel(struct perf_event *event, int nr_pages, int aux_nr_pages);
extern void rb_free_kernel(struct ring_buffer *rb, struct perf_event *event);
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 7887601aa5..4cf5a1cd0a 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -345,6 +345,37 @@ void *perf_get_aux(struct perf_output_handle *handle)
return handle->rb->aux_priv;
}
+long rb_output_aux(struct ring_buffer *rb, unsigned long from,
+ unsigned long to, aux_copyfn copyfn, void *data)
+{
+ unsigned long tocopy, remainder, len = 0;
+ void *addr;
+
+ from &= (rb->aux_nr_pages << PAGE_SHIFT) - 1;
+ to &= (rb->aux_nr_pages << PAGE_SHIFT) - 1;
+
+ do {
+ tocopy = PAGE_SIZE - offset_in_page(from);
+ if (to > from)
+ tocopy = min(tocopy, to - from);
+ if (!tocopy)
+ break;
+
+ addr = rb->aux_pages[from >> PAGE_SHIFT];
+ addr += offset_in_page(from);
+
+ remainder = copyfn(data, addr, tocopy);
+ if (remainder)
+ return -EFAULT;
+
+ len += tocopy;
+ from += tocopy;
+ from &= (rb->aux_nr_pages << PAGE_SHIFT) - 1;
+ } while (to != from);
+
+ return len;
+}
+
#define PERF_AUX_GFP (GFP_KERNEL | __GFP_ZERO | __GFP_NOWARN | __GFP_NORETRY)
static struct page *rb_alloc_aux_page(int node, int order)
--
2.1.0
next prev parent reply other threads:[~2014-08-20 12:45 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 ` [PATCH v4 05/22] perf: Add a pmu capability for "exclusive" events Alexander Shishkin
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 ` Alexander Shishkin [this message]
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-18-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;
as well as URLs for NNTP newsgroup(s).