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 01/23] perf: Add data_{offset,size} to user_page
Date: Mon, 11 Aug 2014 08:19:30 +0300 [thread overview]
Message-ID: <1407734392-31097-2-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1407734392-31097-1-git-send-email-alexander.shishkin@linux.intel.com>
Currently, the actual perf ring buffer is one page into the mmap area,
following the user page and the userspace follows this convention. This
patch adds data_{offset,size} fields to user_page that can be used by
userspace instead for locating perf data in the mmap area. This is also
helpful when mapping existing or shared buffers if their size is not
known in advance.
Right now, it is made to follow the existing convention that
data_offset == PAGE_SIZE and
data_offset + data_size == mmap_size.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
include/uapi/linux/perf_event.h | 5 +++++
kernel/events/core.c | 2 ++
2 files changed, 7 insertions(+)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 9269de2548..f7d18c2cb7 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -489,9 +489,14 @@ struct perf_event_mmap_page {
* In this case the kernel will not over-write unread data.
*
* See perf_output_put_handle() for the data ordering.
+ *
+ * data_{offset,size} indicate the location and size of the perf record
+ * buffer within the mmapped area.
*/
__u64 data_head; /* head in the data section */
__u64 data_tail; /* user-space written tail */
+ __u64 data_offset; /* where the buffer starts */
+ __u64 data_size; /* data buffer size */
};
#define PERF_RECORD_MISC_CPUMODE_MASK (7 << 0)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 1cf24b3e42..bf58d40a26 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3780,6 +3780,8 @@ static void perf_event_init_userpage(struct perf_event *event)
/* Allow new userspace to detect that bit 0 is deprecated */
userpg->cap_bit0_is_deprecated = 1;
userpg->size = offsetof(struct perf_event_mmap_page, __reserved);
+ userpg->data_offset = PAGE_SIZE;
+ userpg->data_size = perf_data_size(rb);
unlock:
rcu_read_unlock();
--
2.1.0.rc1
next prev parent reply other threads:[~2014-08-11 5:23 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 ` Alexander Shishkin [this message]
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 ` [PATCH v3 17/23] perf: Add rb_{alloc,free}_kernel api Alexander Shishkin
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-2-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