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

Groups > linux.kernel > #1287570

Re: [PATCH perf/core 21/22] perf: Fix machine.vmlinux_maps to make sure to clear the old one

Show all headers | View raw

Em Wed, Dec 09, 2015 at 11:11:33AM +0900, Masami Hiramatsu escreveu:
> Fix machine.vmlinux_maps to make sure to clear the old one
> if it is renewal. This can leak the previous maps on the
> vmlinux_maps because those are just overwritten.
> 
> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>  tools/perf/util/machine.c |    5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> index bfc289c..3172aa5 100644
> --- a/tools/perf/util/machine.c
> +++ b/tools/perf/util/machine.c
> @@ -44,6 +44,8 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid)
>  	machine->comm_exec = false;
>  	machine->kernel_start = 0;
>  
> +	memset(machine->vmlinux_maps, 0, sizeof(struct map *) * MAP__NR_TYPES);


Simpler:

	memset(machine->vmlinux_maps, 0, sizeof(machine->vmlinux_maps));

struct machine {
 	...
	struct map *vmlinux_maps[MAP__NR_TYPES];
 	...
};

[acme@zoo c]$ cat pointer_array_sizeof.c 
#include <stdio.h>

struct foo { int *array[2]; };
struct bar { int *array[4]; };

int main(void)
{
	struct foo *foo; struct bar *bar;

	printf("sizeof(foo->array)=%zd\n", sizeof(foo->array));
	printf("sizeof(bar->array)=%zd\n", sizeof(bar->array));
	return 0;
}
[acme@zoo c]$ make pointer_array_sizeof
cc     pointer_array_sizeof.c   -o pointer_array_sizeof
[acme@zoo c]$ ./pointer_array_sizeof 
sizeof(foo->array)=16
sizeof(bar->array)=32
[acme@zoo c]$

> +
>  	machine->root_dir = strdup(root_dir);
>  	if (machine->root_dir == NULL)
>  		return -ENOMEM;
> @@ -770,6 +772,9 @@ int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)
>  	enum map_type type;
>  	u64 start = machine__get_running_kernel_start(machine, NULL);
>  
> +	/* In case of renewal the kernel map, destroy previous one */
> +	machine__destroy_kernel_maps(machine);
> +
>  	for (type = 0; type < MAP__NR_TYPES; ++type) {
>  		struct kmap *kmap;
>  		struct map *map;
--
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 perf/core 21/22] perf: Fix machine.vmlinux_maps to make sure  to clear the old one Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-12-09 03:20 +0100
  Re: [PATCH perf/core 21/22] perf: Fix machine.vmlinux_maps to make  sure to clear the old one Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-09 16:30 +0100
    Re: [PATCH perf/core 21/22] perf: Fix machine.vmlinux_maps to make  sure to clear the old one "Wangnan (F)" <wangnan0@huawei.com> - 2015-12-10 04:00 +0100
  [tip:perf/core] perf machine:   Fix machine.vmlinux_maps to make sure to clear the old one tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-12-10 09:20 +0100

csiph-web