From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757476AbbEFDM3 (ORCPT ); Tue, 5 May 2015 23:12:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36248 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752742AbbEFDMY (ORCPT ); Tue, 5 May 2015 23:12:24 -0400 Date: Tue, 5 May 2015 20:11:50 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: dsahern@gmail.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, acme@redhat.com, hpa@zytor.com, namhyung@gmail.com, adrian.hunter@intel.com, fweisbec@gmail.com, tglx@linutronix.de, peterz@infradead.org, eranian@google.com, mingo@kernel.org Reply-To: peterz@infradead.org, fweisbec@gmail.com, tglx@linutronix.de, adrian.hunter@intel.com, eranian@google.com, mingo@kernel.org, namhyung@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, jolsa@redhat.com, acme@redhat.com In-Reply-To: <1429903807-20559-2-git-send-email-adrian.hunter@intel.com> References: <1429903807-20559-2-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Amend mmap ref counting for the AUX area mmap Git-Commit-ID: b72e74d1f140eb32865540f9e26e9fe0fcf983b9 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: b72e74d1f140eb32865540f9e26e9fe0fcf983b9 Gitweb: http://git.kernel.org/tip/b72e74d1f140eb32865540f9e26e9fe0fcf983b9 Author: Adrian Hunter AuthorDate: Fri, 24 Apr 2015 22:29:43 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 4 May 2015 12:43:48 -0300 perf evlist: Amend mmap ref counting for the AUX area mmap Reference counting of the mmap buffer does not work correctly when there is an AUX area mmap also. In snapshot mode it is not easy to know if the AUX area mmap buffer contains usefull information. Equally the evlist does not know if the recording is in sanpshot mode anyway. Consequently, for now just assume the AUX area mmap always has data, which will just cause the mmap buffer to remain mmapped for the duration of the recording. Signed-off-by: Adrian Hunter Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1429903807-20559-2-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 0ec8c3b..7ec1bf9 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -695,7 +695,7 @@ union perf_event *perf_evlist__mmap_read(struct perf_evlist *evlist, int idx) static bool perf_mmap__empty(struct perf_mmap *md) { - return perf_mmap__read_head(md) == md->prev; + return perf_mmap__read_head(md) == md->prev && !md->auxtrace_mmap.base; } static void perf_evlist__mmap_get(struct perf_evlist *evlist, int idx)