From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932334AbbLCIeg (ORCPT ); Thu, 3 Dec 2015 03:34:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41844 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759133AbbLCIec (ORCPT ); Thu, 3 Dec 2015 03:34:32 -0500 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra , =?UTF-8?q?HIRAMATU=EF=BC=8CMASAMI?= , Wang Nan , Adrian Hunter Subject: [PATCH 4/7] perf test: Fix cpus and thread maps refference in error path Date: Thu, 3 Dec 2015 09:34:15 +0100 Message-Id: <1449131658-1841-5-git-send-email-jolsa@kernel.org> In-Reply-To: <1449131658-1841-1-git-send-email-jolsa@kernel.org> References: <1449131658-1841-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Link: http://lkml.kernel.org/n/tip-koezjafs5le3zd95crpz6d85@git.kernel.org Signed-off-by: Jiri Olsa --- 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 26182ffcea75..313a48c6b2bc 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; -- 2.4.3