From patchwork Fri Feb 26 09:32:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 62985 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp610427lbc; Fri, 26 Feb 2016 01:33:54 -0800 (PST) X-Received: by 10.67.5.68 with SMTP id ck4mr660362pad.3.1456479232702; Fri, 26 Feb 2016 01:33:52 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vy4si18778514pab.124.2016.02.26.01.33.52; Fri, 26 Feb 2016 01:33:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752572AbcBZJdl (ORCPT + 30 others); Fri, 26 Feb 2016 04:33:41 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:12858 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbcBZJde (ORCPT ); Fri, 26 Feb 2016 04:33:34 -0500 Received: from 172.24.1.51 (EHLO szxeml422-hub.china.huawei.com) ([172.24.1.51]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DBZ54365; Fri, 26 Feb 2016 17:33:29 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml422-hub.china.huawei.com (10.82.67.152) with Microsoft SMTP Server id 14.3.235.1; Fri, 26 Feb 2016 17:33:16 +0800 From: Wang Nan To: Alexei Starovoitov , Arnaldo Carvalho de Melo , Arnaldo Carvalho de Melo CC: Jiri Olsa , Li Zefan , "Peter Zijlstra" , , Wang Nan , , He Kuang , Masami Hiramatsu , Namhyung Kim Subject: [PATCH 44/46] perf record: Read from backward ring buffer Date: Fri, 26 Feb 2016 09:32:32 +0000 Message-ID: <1456479154-136027-45-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1456479154-136027-1-git-send-email-wangnan0@huawei.com> References: <1456479154-136027-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090205.56D01BEA.000C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 003d618e3ba5ead8aeb4a6f5412d85ff Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce rb_find_range() to find start and end position from a backward ring buffer. Signed-off-by: Wang Nan Signed-off-by: He Kuang Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com --- tools/perf/builtin-record.c | 69 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) -- 1.8.3.4 diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index eee3436..0ce7f52 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -87,6 +87,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]; @@ -98,6 +153,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; @@ -531,8 +590,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; }