From: Wang Nan <wangnan0@huawei.com>
To: Alexei Starovoitov <ast@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: "Adrian Hunter" <adrian.hunter@intel.com>,
"Cody P Schafer" <dev@codyps.com>,
"David S. Miller" <davem@davemloft.net>,
"He Kuang" <hekuang@huawei.com>,
"Jérémie Galarneau" <jeremie.galarneau@efficios.com>,
"Jiri Olsa" <jolsa@kernel.org>,
"Kirill Smelkov" <kirr@nexedi.com>,
"Li Zefan" <lizefan@huawei.com>,
"Masami Hiramatsu" <masami.hiramatsu.pt@hitachi.com>,
"Namhyung Kim" <namhyung@kernel.org>,
"Peter Zijlstra" <peterz@infradead.org>,
pi3orama@163.com, "Wang Nan" <wangnan0@huawei.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 46/48] perf record: Read from backward ring buffer
Date: Mon, 22 Feb 2016 09:11:13 +0000 [thread overview]
Message-ID: <1456132275-98875-47-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1456132275-98875-1-git-send-email-wangnan0@huawei.com>
Introduce rb_find_range() to find start and end position from a backward
ring buffer.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: He Kuang <hekuang@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
tools/perf/builtin-record.c | 69 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 67 insertions(+), 2 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index b1f37f0..82b49ce 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -86,6 +86,61 @@ static int process_synthesized_event(struct perf_tool *tool,
return record__write(rec, event, event->header.size);
}
+static int
+backward_rb_find_range(void *buf, int mask, u64 head, u64 *start, u64 *end)
+{
+ struct perf_event_header *pheader;
+ u64 evt_head = head;
+ int size = mask + 1;
+
+ pr_debug2("backward_rb_find_range: buf=%p, head=%"PRIx64"\n", buf, head);
+ pheader = (struct perf_event_header *)(buf + (head & mask));
+ *start = head;
+ while (true) {
+ if (evt_head - head >= (unsigned int)size) {
+ pr_debug("Finshed reading backward ring buffer: rewind\n");
+ if (evt_head - head > (unsigned int)size)
+ evt_head -= pheader->size;
+ *end = evt_head;
+ return 0;
+ }
+
+ pheader = (struct perf_event_header *)(buf + (evt_head & mask));
+
+ if (pheader->size == 0) {
+ pr_debug("Finshed reading backward ring buffer: get start\n");
+ *end = evt_head;
+ return 0;
+ }
+
+ evt_head += pheader->size;
+ pr_debug3("move evt_head: %"PRIx64"\n", evt_head);
+ }
+ WARN_ONCE(1, "Shouldn't get here\n");
+ return -1;
+}
+
+static int
+rb_find_range(struct perf_evlist *evlist, int idx,
+ void *data, int mask, u64 head, u64 old,
+ u64 *start, u64 *end)
+{
+ int channel;
+
+ channel = perf_evlist__idx_channel(evlist, idx);
+ if (!perf_evlist__channel_check(evlist, channel, RDONLY)) {
+ *start = old;
+ *end = head;
+ return 0;
+ }
+
+ if (perf_evlist__channel_check(evlist, channel, BACKWARD))
+ return backward_rb_find_range(data, mask, head, start, end);
+
+ WARN_ONCE(1, "Unable to find start position from a read-only ring buffer\n");
+ return -1;
+}
+
static int record__mmap_read(struct record *rec, int idx)
{
struct perf_mmap *md = &rec->evlist->mmap[idx];
@@ -97,6 +152,10 @@ static int record__mmap_read(struct record *rec, int idx)
void *buf;
int rc = 0;
+ if (rb_find_range(rec->evlist, idx, data, md->mask, head,
+ old, &start, &end))
+ return -1;
+
if (start == end)
return 0;
@@ -530,8 +589,14 @@ static bool record__mmap_should_read(struct record *rec, int idx)
return false;
if (perf_evlist__channel_idx(rec->evlist, &channel, &idx))
return false;
- if (perf_evlist__channel_check(rec->evlist, channel, RDONLY))
- return false;
+ if (perf_evlist__channel_check(rec->evlist, channel, RDONLY)) {
+ if (rec->overwrite_evt_state != OVERWRITE_EVT_DATA_PENDING)
+ return false;
+ if (perf_evlist__channel_check(rec->evlist, channel, BACKWARD))
+ return true;
+ else
+ return false;
+ }
return true;
}
--
1.8.3.4
next prev parent reply other threads:[~2016-02-22 9:13 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 9:10 [PATCH 00/48] perf tools: Bugfix, BPF improvements and overwrite ring buffer support Wang Nan
2016-02-22 9:10 ` [PATCH 01/48] perf tools: Record text offset in dso to calculate objdump address Wang Nan
2016-02-22 9:10 ` [PATCH 02/48] perf tools: Adjust symbol for shared objects Wang Nan
2016-02-22 9:10 ` [PATCH 03/48] perf bpf: Add API to set values to map entries in a bpf object Wang Nan
2016-02-25 5:39 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-22 9:10 ` [PATCH 04/48] perf tools: Enable BPF object configure syntax Wang Nan
2016-02-25 5:39 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-22 9:10 ` [PATCH 05/48] perf record: Apply config to BPF objects before recording Wang Nan
2016-02-25 5:39 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-22 9:10 ` [PATCH 06/48] perf tools: Enable passing event to BPF object Wang Nan
2016-02-25 5:40 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-22 9:10 ` [PATCH 07/48] perf tools: Support setting different slots in a BPF map separately Wang Nan
2016-02-25 5:40 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-22 9:10 ` [PATCH 08/48] perf tools: Enable indices setting syntax for BPF map Wang Nan
2016-02-25 5:40 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-22 9:10 ` [PATCH 09/48] perf tools: Pass tracepoint options to BPF script Wang Nan
2016-02-25 5:41 ` [tip:perf/core] perf tools: Apply tracepoint event definition " tip-bot for Wang Nan
2016-02-22 9:10 ` [PATCH 10/48] perf tools: Introduce bpf-output event Wang Nan
2016-02-23 17:45 ` Arnaldo Carvalho de Melo
2016-02-24 1:58 ` Wangnan (F)
2016-02-24 2:04 ` Wangnan (F)
2016-02-24 4:03 ` Wangnan (F)
2016-02-24 5:03 ` Wangnan (F)
2016-02-24 13:36 ` Arnaldo Carvalho de Melo
2016-02-25 5:41 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-22 9:10 ` [PATCH 11/48] perf data: Support converting data from bpf_perf_event_output() Wang Nan
2016-02-23 16:14 ` Arnaldo Carvalho de Melo
2016-02-23 17:23 ` Jiri Olsa
2016-02-23 17:24 ` Jiri Olsa
2016-02-23 19:22 ` Jiri Olsa
2016-02-22 9:10 ` [PATCH 12/48] perf data: Explicitly set byte order for integer types Wang Nan
2016-02-22 9:10 ` [PATCH 13/48] perf core: Introduce new ioctl options to pause and resume ring buffer Wang Nan
2016-02-22 9:10 ` [PATCH 14/48] perf core: Set event's default overflow_handler Wang Nan
2016-02-22 9:10 ` [PATCH 15/48] perf core: Prepare writing into ring buffer from end Wang Nan
2016-02-22 9:10 ` [PATCH 16/48] perf core: Add backward attribute to perf event Wang Nan
2016-02-24 13:08 ` Jiri Olsa
2016-02-24 13:21 ` Jiri Olsa
2016-02-22 9:10 ` [PATCH 17/48] perf core: Reduce perf event output overhead by new overflow handler Wang Nan
2016-02-22 9:10 ` [PATCH 18/48] perf tools: Only validate is_pos for tracking evsels Wang Nan
2016-02-24 14:21 ` Jiri Olsa
2016-02-22 9:10 ` [PATCH 19/48] perf tools: Print write_backward value in perf_event_attr__fprintf Wang Nan
2016-02-22 9:10 ` [PATCH 20/48] perf tools: Make ordered_events reusable Wang Nan
2016-02-24 14:18 ` Jiri Olsa
2016-02-22 9:10 ` [PATCH 21/48] perf record: Extract synthesize code to record__synthesize() Wang Nan
2016-02-24 14:29 ` Jiri Olsa
2016-02-22 9:10 ` [PATCH 22/48] perf tools: Add perf_data_file__switch() helper Wang Nan
2016-02-24 14:34 ` Jiri Olsa
2016-02-22 9:10 ` [PATCH 23/48] perf record: Turns auxtrace_snapshot_enable into 3 states Wang Nan
2016-02-24 14:43 ` Jiri Olsa
2016-02-22 9:10 ` [PATCH 24/48] perf record: Introduce record__finish_output() to finish a perf.data Wang Nan
2016-02-22 9:10 ` [PATCH 25/48] perf record: Add '--timestamp-filename' option to append timestamp to output filename Wang Nan
2016-02-22 9:10 ` [PATCH 26/48] perf record: Split output into multiple files via '--switch-output' Wang Nan
2016-02-22 9:10 ` [PATCH 27/48] perf record: Force enable --timestamp-filename when --switch-output is provided Wang Nan
2016-02-22 9:10 ` [PATCH 28/48] perf record: Disable buildid cache options by default in switch output mode Wang Nan
2016-02-22 9:10 ` [PATCH 29/48] perf record: Re-synthesize tracking events after output switching Wang Nan
2016-02-24 14:57 ` Jiri Olsa
2016-02-22 9:10 ` [PATCH 30/48] perf record: Generate tracking events for process forked by perf Wang Nan
2016-02-24 15:01 ` Jiri Olsa
2016-02-22 9:10 ` [PATCH 31/48] perf record: Ensure return non-zero rc when mmap fail Wang Nan
2016-02-22 9:10 ` [PATCH 32/48] perf record: Prevent reading invalid data in record__mmap_read Wang Nan
2016-02-22 9:11 ` [PATCH 33/48] perf tools: Add evlist channel helpers Wang Nan
2016-02-22 9:11 ` [PATCH 34/48] perf tools: Automatically add new channel according to evlist Wang Nan
2016-02-22 9:11 ` [PATCH 35/48] perf tools: Operate multiple channels Wang Nan
2016-02-22 9:11 ` [PATCH 36/48] perf tools: Squash overwrite setting into channel Wang Nan
2016-02-22 9:11 ` [PATCH 37/48] perf record: Don't read from and poll overwrite channel Wang Nan
2016-02-22 9:11 ` [PATCH 38/48] perf record: Don't poll on " Wang Nan
2016-02-22 9:11 ` [PATCH 39/48] perf tools: Detect avalibility of write_backward Wang Nan
2016-02-22 9:11 ` [PATCH 40/48] perf tools: Enable overwrite settings Wang Nan
2016-02-22 9:11 ` [PATCH 41/48] perf tools: Set write_backward attribut bit for overwrite events Wang Nan
2016-02-22 9:11 ` [PATCH 42/48] perf tools: Record fd into perf_mmap Wang Nan
2016-02-22 9:11 ` [PATCH 43/48] perf tools: Add API to pause a channel Wang Nan
2016-02-22 9:11 ` [PATCH 44/48] perf record: Toggle overwrite ring buffer for reading Wang Nan
2016-02-22 9:11 ` [PATCH 45/48] perf record: Rename variable to make code clear Wang Nan
2016-02-22 9:11 ` Wang Nan [this message]
2016-02-22 9:11 ` [PATCH 47/48] perf record: Allow generate tracking events at the end of output Wang Nan
2016-02-22 9:11 ` [PATCH 48/48] perf tools: Don't warn about out of order event if write_backward is used Wang Nan
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=1456132275-98875-47-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=ast@kernel.org \
--cc=brendan.d.gregg@gmail.com \
--cc=davem@davemloft.net \
--cc=dev@codyps.com \
--cc=hekuang@huawei.com \
--cc=jeremie.galarneau@efficios.com \
--cc=jolsa@kernel.org \
--cc=kirr@nexedi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=pi3orama@163.com \
/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
all inboxes | Powered by JetHome®