From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753801AbbLFQHH (ORCPT ); Sun, 6 Dec 2015 11:07:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59966 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753043AbbLFQHF (ORCPT ); Sun, 6 Dec 2015 11:07:05 -0500 Date: Sun, 6 Dec 2015 17:07:01 +0100 From: Jiri Olsa To: Namhyung Kim Cc: Jiri Olsa , Arnaldo Carvalho de Melo , lkml , David Ahern , Ingo Molnar , Peter Zijlstra , =?utf-8?Q?HIRAMATU=EF=BC=8CMASAMI?= , Wang Nan , Adrian Hunter Subject: [PATCHv2 7/7] perf test: Create kernel maps properly for hist entries test Message-ID: <20151206160701.GB25715@krava.brq.redhat.com> References: <1449131658-1841-1-git-send-email-jolsa@kernel.org> <1449131658-1841-8-git-send-email-jolsa@kernel.org> <20151204132337.GG22102@danjae.kornet> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151204132337.GG22102@danjae.kornet> 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 Fri, Dec 04, 2015 at 10:23:37PM +0900, Namhyung Kim wrote: > 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'? > right.. v2 attached, perf-fixes branch updated thanks, jirka --- Subject: [PATCH] perf test: Create kernel maps properly for hist entries test 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c index ce80b274b097..46f453b1de60 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; + } + for (i = 0; i < ARRAY_SIZE(fake_threads); i++) { struct thread *thread; -- 2.4.3