From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932893AbbLHEca (ORCPT ); Mon, 7 Dec 2015 23:32:30 -0500 Received: from terminus.zytor.com ([198.137.202.10]:50714 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932597AbbLHEc0 (ORCPT ); Mon, 7 Dec 2015 23:32:26 -0500 Date: Mon, 7 Dec 2015 20:32:01 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: hpa@zytor.com, adrian.hunter@intel.com, namhyung@kernel.org, jolsa@kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, wangnan0@huawei.com, dsahern@gmail.com, masami.hiramatsu.pt@hitachi.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: namhyung@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, a.p.zijlstra@chello.nl, acme@redhat.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de, dsahern@gmail.com, wangnan0@huawei.com, mingo@kernel.org In-Reply-To: <1449131658-1841-5-git-send-email-jolsa@kernel.org> References: <1449131658-1841-5-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf test: Fix cpus and thread maps reference in error path Git-Commit-ID: 7320b1b3d9e6af30adcbead64568be3c40b50e59 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: 7320b1b3d9e6af30adcbead64568be3c40b50e59 Gitweb: http://git.kernel.org/tip/7320b1b3d9e6af30adcbead64568be3c40b50e59 Author: Jiri Olsa AuthorDate: Thu, 3 Dec 2015 09:34:15 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 7 Dec 2015 18:12:55 -0300 perf test: Fix cpus and thread maps reference in error path In error path to try user space event, both cpus and threads map now owned by evlist and freed by perf_evlist__set_maps call. Getting reference to keep them alive. Signed-off-by: Jiri Olsa Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: David Ahern Cc: Masami Hiramatsu Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1449131658-1841-5-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/code-reading.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 26182ff..313a48c 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -547,6 +547,13 @@ static int do_test_code_reading(bool try_kcore) if (ret < 0) { if (!excl_kernel) { excl_kernel = true; + /* + * Both cpus and threads are now owned by evlist + * and will be freed by following perf_evlist__set_maps + * call. Getting refference to keep them alive. + */ + cpu_map__get(cpus); + thread_map__get(threads); perf_evlist__set_maps(evlist, NULL, NULL); perf_evlist__delete(evlist); evlist = NULL;