Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1283811

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

Show all headers | View raw

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'?


> +	}
> +
>  	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
> 
--
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/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

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