[PATCH 37/48] perf record: Don't read from and poll overwrite channel

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Wang Nan <wangnan0@huawei.com>
Newsgroups	linux.kernel
Subject	[PATCH 37/48] perf record: Don't read from and poll overwrite channel
Date	Mon, 22 Feb 2016 10:20:02 +0100
Message-ID	<r4UOS-3pt-27@gated-at.bofh.it> (permalink)
References	<r4UOR-3pt-3@gated-at.bofh.it>
X-Original-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>
X-Mailer	git-send-email 1.8.3.4
MIME-Version	1.0
Content-Type	text/plain
X-Originating-IP	[10.107.193.248]
X-Cfilter-Loop	Reflected
X-Mirapoint-Virus-Rapid-Raw	score=unknown(0), refid=str=0001.0A020205.56CAD0EF.00BB,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	fdf60ca506dc772766ea6d4d55574fe2
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	52
Organization	linux.* mail to news gateway
X-Original-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>
X-Original-Date	Mon, 22 Feb 2016 09:11:04 +0000
X-Original-Message-ID	<1456132275-98875-38-git-send-email-wangnan0@huawei.com>
X-Original-References	<1456132275-98875-1-git-send-email-wangnan0@huawei.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1339246

Show key headers only | View raw

Reading from overwritable ring buffer is unreliable. Introduce
record__mmap_should_read() and prevent reading from overwrite ring
buffer in 'perf record'. The rule in record__mmap_should_read() will
be changed when perf support reading from backward writing 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 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index f5bc5bf..b27b3ff 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -461,6 +461,19 @@ static struct perf_event_header finished_round_event = {
 	.type = PERF_RECORD_FINISHED_ROUND,
 };
 
+static bool record__mmap_should_read(struct record *rec, int idx)
+{
+	int channel = -1;
+
+	if (!rec->evlist->mmap[idx].base)
+		return false;
+	if (perf_evlist__channel_idx(rec->evlist, &channel, &idx))
+		return false;
+	if (perf_evlist__channel_check(rec->evlist, channel, RDONLY))
+		return false;
+	return true;
+}
+
 static int record__mmap_read_all(struct record *rec)
 {
 	u64 bytes_written = rec->bytes_written;
@@ -471,7 +484,7 @@ static int record__mmap_read_all(struct record *rec)
 	for (i = 0; i < total_mmaps; i++) {
 		struct auxtrace_mmap *mm = &rec->evlist->mmap[i].auxtrace_mmap;
 
-		if (rec->evlist->mmap[i].base) {
+		if (record__mmap_should_read(rec, i)) {
 			if (record__mmap_read(rec, i) != 0) {
 				rc = -1;
 				goto out;
-- 
1.8.3.4

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 37/48] perf record: Don't read from and poll overwrite channel Wang Nan <wangnan0@huawei.com> - 2016-02-22 10:20 +0100

csiph-web