From: Namhyung Kim <namhyung@kernel.org>
To: Kim Phillips <kim.phillips@arm.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@redhat.com>, Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
kernel-team@lge.com
Subject: Re: [PATCH] perf tools: set kernel end address properly
Date: Fri, 20 Apr 2018 08:59:15 +0900 [thread overview]
Message-ID: <20180419235915.GA19067@sejong> (raw)
In-Reply-To: <20180419182024.5d3bc71deef99551cc19fc55@arm.com>
On Thu, Apr 19, 2018 at 06:20:24PM -0500, Kim Phillips wrote:
> On Thu, 19 Apr 2018 11:37:12 +0900
> Namhyung Kim <namhyung@kernel.org> wrote:
> > I think the problem is perf assumes the kernel is the
> > first map in the kmaps. When it calls maps_groups__insert() it uses
> > start address of 0 for the kernel map. It seems always true for x86
> > but not for ARM64.
> >
> > While it changes the start address in machine__set_kernel_mmap() it
> > doesn't change the order in the kmaps.
> >
> > Could you please test below patch (on top) then?
>
> Much better, thank you! Together with the "module_emit_adrp_veneer not
> on kallsyms" mitigation diff, test 1 now passes on arm64 systems both
> with modules loaded, and without, and with and without RANDOMIZE_BASE.
>
> I would send a patch (From: you), but I think you'd do a better job on
> writing the commit text, so would you care to, please?
Sure, what about this?
Thanks,
Namhyung
>From 1d9fa3b21bd7a964af43dcc9d486a09917d795e9 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@kernel.org>
Date: Mon, 19 Feb 2018 19:05:45 +0900
Subject: [PATCH] perf tools: set kernel end address properly
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, 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.
Since it also changes the start address of the kernel map, it needs to
re-insert the map to the kmaps in order to keep a correct ordering. Kim
reported that it caused problems on ARM64.
Reported-by: Kim Phillips <kim.phillips@arm.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/machine.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 2eca8478e24f..32d50492505d 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,6 +1226,7 @@ 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;
int ret;
@@ -1259,13 +1253,25 @@ int machine__create_kernel_maps(struct machine *machine)
machine__destroy_kernel_maps(machine);
return -1;
}
- machine__set_kernel_mmap(machine, addr, 0);
+
+ /* we have a real start address now, so re-order the kmaps */
+ map = machine__kernel_map(machine);
+
+ map__get(map);
+ map_groups__remove(&machine->kmaps, map);
+
+ /* assume it's the last in the kmaps */
+ machine__set_kernel_mmap(machine, addr, ~0ULL);
+
+ map_groups__insert(&machine->kmaps, map);
+ map__put(map);
}
- /*
- * 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)
+ machine__set_kernel_mmap(machine, addr, map->start);
+
return 0;
}
--
2.16.2
next prev parent reply other threads:[~2018-04-19 23:59 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-16 4:22 [PATCH] perf tools: set kernel end address properly Namhyung Kim
2018-04-16 9:23 ` Jiri Olsa
2018-04-16 13:51 ` Arnaldo Carvalho de Melo
2018-04-16 16:07 ` Kim Phillips
2018-04-16 16:58 ` Arnaldo Carvalho de Melo
2018-04-16 17:24 ` Kim Phillips
2018-04-16 22:48 ` Kim Phillips
2018-04-17 2:27 ` Namhyung Kim
2018-04-19 0:37 ` Kim Phillips
2018-04-19 2:37 ` Namhyung Kim
2018-04-19 23:20 ` Kim Phillips
2018-04-19 23:59 ` Namhyung Kim [this message]
2018-04-20 23:23 ` Kim Phillips
2018-04-23 13:52 ` Arnaldo Carvalho de Melo
2018-04-23 14:56 ` Kim Phillips
2018-04-26 5:51 ` [tip:perf/urgent] perf machine: Set main " tip-bot for Namhyung Kim
2018-04-19 2:54 ` [PATCH] perf tools: set " Namhyung Kim
2018-04-19 23:33 ` Kim Phillips
2018-04-20 0:11 ` Namhyung Kim
2018-04-20 8:10 ` Ard Biesheuvel
2018-04-23 21:43 ` Kim Phillips
2018-04-24 6:13 ` Ard Biesheuvel
2018-04-24 12:50 ` Kim Phillips
2018-04-24 13:07 ` Ard Biesheuvel
2018-04-24 15:13 ` [PATCH] arm64/kernel: rename module_emit_adrp_veneer->module_emit_veneer_for_adrp Kim Phillips
2018-04-24 15:15 ` Ard Biesheuvel
2018-04-24 15:39 ` [PATCH v2] " Kim Phillips
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180419235915.GA19067@sejong \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=kernel-team@lge.com \
--cc=kim.phillips@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).