From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751863AbbLDNYO (ORCPT ); Fri, 4 Dec 2015 08:24:14 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33532 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751359AbbLDNYM (ORCPT ); Fri, 4 Dec 2015 08:24:12 -0500 Date: Fri, 4 Dec 2015 22:23:37 +0900 From: Namhyung Kim To: Jiri Olsa Cc: Arnaldo Carvalho de Melo , lkml , David Ahern , Ingo Molnar , Peter Zijlstra , =?utf-8?Q?HIRAMATU=EF=BC=8CMASAMI?= , Wang Nan , Adrian Hunter Subject: Re: [PATCH 7/7] perf test: Create kernel maps properly for hist entries test Message-ID: <20151204132337.GG22102@danjae.kornet> References: <1449131658-1841-1-git-send-email-jolsa@kernel.org> <1449131658-1841-8-git-send-email-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1449131658-1841-8-git-send-email-jolsa@kernel.org> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 03, 2015 at 09:34:18AM +0100, Jiri Olsa wrote: > 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; Why not just doing 'goto out'? > + } > + > 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 >