[PATCHv2 7/7] perf test: Create kernel maps properly for hist entries test

From	Jiri Olsa <jolsa@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCHv2 7/7] perf test: Create kernel maps properly for hist entries test
Date	2015-12-06 17:10 +0100
Message-ID	<qCK2R-GZ-3@gated-at.bofh.it> (permalink)
References	<qBxAK-2vK-3@gated-at.bofh.it> <qBxAK-2vK-21@gated-at.bofh.it> <qBYAW-3bA-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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 <jolsa@kernel.org>
> > ---
> >  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 <jolsa@kernel.org>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

[PATCH 0/7] perf test: Fixes Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
  [PATCH 7/7] perf test: Create kernel maps properly for hist entries test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
    Re: [PATCH 7/7] perf test: Create kernel maps properly for hist  entries test Namhyung Kim <namhyung@kernel.org> - 2015-12-04 14:30 +0100
      [PATCHv2 7/7] perf test: Create kernel maps properly for hist  entries test Jiri Olsa <jolsa@redhat.com> - 2015-12-06 17:10 +0100
  [PATCH 3/7] perf test: Use machine__new_host in mma thread code reading test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
    [tip:perf/core] perf test:   Use machine__new_host in mmap thread code reading test tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-12-08 05:40 +0100
  [PATCH 2/7] perf test: Use machine__new_host in mma thread lookup test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
    Re: [PATCH 2/7] perf test: Use machine__new_host in mma thread  lookup test Namhyung Kim <namhyung@kernel.org> - 2015-12-04 14:30 +0100
      Re: [PATCH 2/7] perf test: Use machine__new_host in mma thread  lookup test Jiri Olsa <jolsa@redhat.com> - 2015-12-06 17:10 +0100
    [tip:perf/core] perf test:   Use machine__new_host in mmap thread lookup test tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-12-08 05:40 +0100
  [PATCH 6/7] perf test: Use machine__new_host in thread mg sharing test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
  [PATCH 1/7] perf test: Use machine__new_host in dwarf unwind test Jiri Olsa <jolsa@kernel.org> - 2015-12-03 09:40 +0100
    [tip:perf/core] perf test:   Use machine__new_host in dwarf unwind test tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-12-08 05:40 +0100
  Re: [PATCH 0/7] perf test: Fixes Jiri Olsa <jolsa@redhat.com> - 2015-12-03 10:20 +0100
  Re: [PATCH 0/7] perf test: Fixes Namhyung Kim <namhyung@kernel.org> - 2015-12-04 14:30 +0100

csiph-web