From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932507AbbLCIen (ORCPT ); Thu, 3 Dec 2015 03:34:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35028 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932375AbbLCIem (ORCPT ); Thu, 3 Dec 2015 03:34:42 -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 7/7] perf test: Create kernel maps properly for hist entries test Date: Thu, 3 Dec 2015 09:34:18 +0100 Message-Id: <1449131658-1841-8-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 It fixes segfault within machine__exit, that's caused but not creating kernel maps for machine.. We're calling machine__destroy_kernel_maps in machine__exit since commit: ebe9729c8c31 perf machine: Fix to destroy kernel maps when machine exits Link: http://lkml.kernel.org/n/tip-k4snzv5t4dvdckggzwdzyljo@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/tests/hists_common.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c index ce80b274b097..6ccdc8ac9578 100644 --- a/tools/perf/tests/hists_common.c +++ b/tools/perf/tests/hists_common.c @@ -87,6 +87,11 @@ struct machine *setup_fake_machine(struct machines *machines) return NULL; } + if (machine__create_kernel_maps(machine)) { + pr_debug("Not enough memory for machine setup\n"); + goto out_maps; + } + for (i = 0; i < ARRAY_SIZE(fake_threads); i++) { struct thread *thread; @@ -149,6 +154,8 @@ struct machine *setup_fake_machine(struct machines *machines) out: pr_debug("Not enough memory for machine setup\n"); + +out_maps: machine__delete_threads(machine); machine__delete(machine); return NULL; -- 2.4.3