On Mon, Apr 16, 2018 at 01:22:40PM +0900, Namhyung Kim wrote: > The map_groups__fixup_end() was called to set end addresses of kernel > map and module maps. But now machine__create_modules() is set the end > address of modules properly so the only remaining piece is the kernel > map. We can set it with adjacent module's address directly instead of > calling the map_groups__fixup_end(). If there's no module after the > kernel map, the end address will be ~0ULL. > > Reported-by: Kim Phillips <kim.phill...@arm.com> > Signed-off-by: Namhyung Kim <namhy...@kernel.org>
looks good Acked-by: Jiri Olsa <jo...@kernel.org> thanks, jirka > --- > tools/perf/util/machine.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c > index 2eca8478e24f..be328416de61 100644 > --- a/tools/perf/util/machine.c > +++ b/tools/perf/util/machine.c > @@ -1019,13 +1019,6 @@ int machine__load_vmlinux_path(struct machine > *machine, enum map_type type) > return ret; > } > > -static void map_groups__fixup_end(struct map_groups *mg) > -{ > - int i; > - for (i = 0; i < MAP__NR_TYPES; ++i) > - __map_groups__fixup_end(mg, i); > -} > - > static char *get_kernel_version(const char *root_dir) > { > char version[PATH_MAX]; > @@ -1233,7 +1226,9 @@ int machine__create_kernel_maps(struct machine *machine) > { > struct dso *kernel = machine__get_kernel(machine); > const char *name = NULL; > + struct map *map; > u64 addr = 0; > + u64 end = ~0ULL; > int ret; > > if (kernel == NULL) > @@ -1259,13 +1254,14 @@ int machine__create_kernel_maps(struct machine > *machine) > machine__destroy_kernel_maps(machine); > return -1; > } > - machine__set_kernel_mmap(machine, addr, 0); > } > > - /* > - * Now that we have all the maps created, just set the ->end of them: > - */ > - map_groups__fixup_end(&machine->kmaps); > + /* update end address of the kernel map using adjacent module address */ > + map = map__next(machine__kernel_map(machine)); > + if (map) > + end = map->start; > + > + machine__set_kernel_mmap(machine, addr, end); > return 0; > } > > -- > 2.16.2 >