Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4edc059b authored by Adrian Hunter's avatar Adrian Hunter Committed by Greg Kroah-Hartman
Browse files

perf tools: Fix kernel_start for PTI on x86 



commit 19422a9f2a3be7f3a046285ffae4cbb571aa853a upstream.

On x86_64, PTI entry trampolines are less than the start of kernel text,
but still above 2^63. So leave kernel_start = 1ULL << 63 for x86_64.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/1526548928-20790-7-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e404a629

tools/perf/util/machine.c

+6 −1
Original line number Diff line number Diff line
@@ -2263,7 +2263,12 @@ int machine__get_kernel_start(struct machine *machine) 
	machine->kernel_start = 1ULL << 63;

	if (map) {

		err = map__load(map);

		if (!err)

		/*

		 * On x86_64, PTI entry trampolines are less than the

		 * start of kernel text, but still above 2^63. So leave

		 * kernel_start = 1ULL << 63 for x86_64.

		 */

		if (!err && !machine__is(machine, "x86_64"))

			machine->kernel_start = map->start;

	}

	return err;