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 17/23] perf: Add rb_{alloc,free}_kernel api
Date: Mon, 11 Aug 2014 08:19:46 +0300 [thread overview]
Message-ID: <1407734392-31097-18-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1407734392-31097-1-git-send-email-alexander.shishkin@linux.intel.com>
Events that generate AUX data can also be created by the kernel. In this
case, some in-kernel infrastructure is needed to store and copy this data.
This patch adds api for ring buffer (de-)allocation that can be used by the
kernel code.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
kernel/events/internal.h | 3 +++
kernel/events/ring_buffer.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/kernel/events/internal.h b/kernel/events/internal.h
index 4f99987bc3..f4cfa4cabb 100644
--- a/kernel/events/internal.h
+++ b/kernel/events/internal.h
@@ -59,6 +59,9 @@ 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 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);
extern struct ring_buffer *ring_buffer_get(struct perf_event *event);
extern void ring_buffer_put(struct ring_buffer *rb);
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 85858d201c..43c4cc1892 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -467,6 +467,39 @@ void rb_free_aux(struct ring_buffer *rb, struct perf_event *event)
rb->aux_nr_pages = 0;
}
+struct ring_buffer *
+rb_alloc_kernel(struct perf_event *event, int nr_pages, int aux_nr_pages)
+{
+ struct ring_buffer *rb;
+ int ret, pgoff = nr_pages + 1;
+
+ rb = rb_alloc(nr_pages, 0, event->cpu, 0);
+ if (!rb)
+ return NULL;
+
+ ret = rb_alloc_aux(rb, event, pgoff, aux_nr_pages, 0, 0);
+ if (ret) {
+ rb_free(rb);
+ return NULL;
+ }
+
+ /*
+ * Kernel counters don't need ring buffer wakeups, therefore we don't
+ * use ring_buffer_attach() here and event->rb_entry stays empty
+ */
+ rcu_assign_pointer(event->rb, rb);
+
+ return rb;
+}
+
+void rb_free_kernel(struct ring_buffer *rb, struct perf_event *event)
+{
+ BUG_ON(atomic_read(&rb->refcount) != 1);
+ rcu_assign_pointer(event->rb, NULL);
+ rb_free_aux(rb, event);
+ rb_free(rb);
+}
+
#ifndef CONFIG_PERF_USE_VMALLOC
/*
--
2.1.0.rc1
next prev parent reply other threads:[~2014-08-11 5:32 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 ` [PATCH v3 05/23] perf: Add a pmu capability for "exclusive" events Alexander Shishkin
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 ` Alexander Shishkin [this message]
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-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