From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752848AbdDLFoN (ORCPT ); Wed, 12 Apr 2017 01:44:13 -0400 Received: from terminus.zytor.com ([65.50.211.136]:53623 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899AbdDLFoL (ORCPT ); Wed, 12 Apr 2017 01:44:11 -0400 Date: Tue, 11 Apr 2017 22:39:33 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: sque@chromium.org, alexander.shishkin@linux.intel.com, davidcc@google.com, mingo@kernel.org, acme@redhat.com, wangnan0@huawei.com, tglx@linutronix.de, jolsa@kernel.org, peterz@infradead.org, pjt@google.com, mhiramat@kernel.org, eranian@google.com, hpa@zytor.com, hekuang@huawei.com, linux-kernel@vger.kernel.org, ak@linux.intel.com Reply-To: hpa@zytor.com, mhiramat@kernel.org, eranian@google.com, hekuang@huawei.com, linux-kernel@vger.kernel.org, ak@linux.intel.com, peterz@infradead.org, pjt@google.com, wangnan0@huawei.com, tglx@linutronix.de, jolsa@kernel.org, davidcc@google.com, alexander.shishkin@linux.intel.com, sque@chromium.org, mingo@kernel.org, acme@redhat.com In-Reply-To: <20170410201432.24807-3-davidcc@google.com> References: <20170410201432.24807-3-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf inject: Copy events when reordering events in pipe mode Git-Commit-ID: 1e0d4f0200e4dbdfc38d818f329d8a0955f7c6f5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1e0d4f0200e4dbdfc38d818f329d8a0955f7c6f5 Gitweb: http://git.kernel.org/tip/1e0d4f0200e4dbdfc38d818f329d8a0955f7c6f5 Author: David Carrillo-Cisneros AuthorDate: Mon, 10 Apr 2017 13:14:27 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 11 Apr 2017 15:23:41 -0300 perf inject: Copy events when reordering events in pipe mode __perf_session__process_pipe_events reuses the same memory buffer to process all events in the pipe. When reordering is needed (e.g. -b option), events are not immediately flushed, but kept around until reordering is possible, causing memory corruption. The problem is usually observed by a "Unknown sample error" output. It can easily be reproduced by: perf record -o - noploop | perf inject -b > output Committer testing: Before: $ perf record -o - stress -t 2 -c 2 | perf inject -b > /dev/null stress: info: [8297] dispatching hogs: 2 cpu, 0 io, 0 vm, 0 hdd stress: info: [8297] successful run completed in 2s [ perf record: Woken up 3 times to write data ] [ perf record: Captured and wrote 0.000 MB - ] Warning: Found 1 unknown events! Is this an older tool processing a perf.data file generated by a more recent tool? If that is not the case, consider reporting to linux-kernel@vger.kernel.org. $ After: $ perf record -o - stress -t 2 -c 2 | perf inject -b > /dev/null stress: info: [9027] dispatching hogs: 2 cpu, 0 io, 0 vm, 0 hdd stress: info: [9027] successful run completed in 2s [ perf record: Woken up 3 times to write data ] [ perf record: Captured and wrote 0.000 MB - ] no symbols found in /usr/bin/stress, maybe install a debug package? no symbols found in /usr/bin/stress, maybe install a debug package? $ Signed-off-by: David Carrillo-Cisneros Tested-by: Arnaldo Carvalho de Melo Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: He Kuang Cc: Masami Hiramatsu Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/20170410201432.24807-3-davidcc@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/ordered-events.c | 3 ++- tools/perf/util/session.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-events.c index fe84df1..e70e935 100644 --- a/tools/perf/util/ordered-events.c +++ b/tools/perf/util/ordered-events.c @@ -79,7 +79,7 @@ static union perf_event *dup_event(struct ordered_events *oe, static void free_dup_event(struct ordered_events *oe, union perf_event *event) { - if (oe->copy_on_queue) { + if (event && oe->copy_on_queue) { oe->cur_alloc_size -= event->header.size; free(event); } @@ -150,6 +150,7 @@ void ordered_events__delete(struct ordered_events *oe, struct ordered_event *eve list_move(&event->list, &oe->cache); oe->nr_events--; free_dup_event(oe, event->event); + event->event = NULL; } int ordered_events__queue(struct ordered_events *oe, union perf_event *event, diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 24259bc2..a25302b 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1656,6 +1656,7 @@ static int __perf_session__process_pipe_events(struct perf_session *session) buf = malloc(cur_size); if (!buf) return -errno; + ordered_events__set_copy_on_queue(oe, true); more: event = buf; err = readn(fd, event, sizeof(struct perf_event_header));