From: Namhyung Kim Date: Fri, 28 Feb 2025 21:17:31 +0000 (-0300) Subject: perf machine: Fixup kernel maps ends after adding extra maps X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7a46e028c394cd422326caa7a2ad6ba0cd87915;p=users%2Fjedix%2Flinux-maple.git perf machine: Fixup kernel maps ends after adding extra maps I just noticed it would add extra kernel maps after modules. I think it should fixup end address of the kernel maps after adding all maps first. Fixes: 876e80cf83d10585 ("perf tools: Fixup end address of modules") Reported-by: Arnaldo Carvalho de Melo Tested-by: Arnaldo Carvalho de Melo Reviewed-by: Ian Rogers Link: https://lore.kernel.org/lkml/Z7TvZGjVix2asYWI@x1 Link: https://lore.kernel.org/lkml/Z712hzvv22Ni63f1@google.com Link: https://lore.kernel.org/r/20250228211734.33781-4-acme@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim --- diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 3f1faf94198db..f7df01adad61c 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1462,8 +1462,6 @@ static int machine__create_modules(struct machine *machine) if (modules__parse(modules, machine, machine__create_module)) return -1; - maps__fixup_end(machine__kernel_maps(machine)); - if (!machine__set_modules_path(machine)) return 0; @@ -1557,6 +1555,8 @@ int machine__create_kernel_maps(struct machine *machine) } } + maps__fixup_end(machine__kernel_maps(machine)); + out_put: dso__put(kernel); return ret;