From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932514AbcHITR5 (ORCPT ); Tue, 9 Aug 2016 15:17:57 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52956 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932463AbcHITR4 (ORCPT ); Tue, 9 Aug 2016 15:17:56 -0400 Date: Tue, 9 Aug 2016 12:17:45 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: wangnan0@huawei.com, linux-kernel@vger.kernel.org, alexei.starovoitov@gmail.com, hpa@zytor.com, acme@kernel.org, tglx@linutronix.de, acme@redhat.com, masami.hiramatsu@linaro.org, mingo@kernel.org Reply-To: alexei.starovoitov@gmail.com, acme@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, masami.hiramatsu@linaro.org, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com In-Reply-To: <20160806192948.e366f3fbc4b194de600f8326@kernel.org> References: <20160806192948.e366f3fbc4b194de600f8326@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf probe: Adjust map->reloc offset when finding kernel symbol from map Git-Commit-ID: 8e34189b347d76acf48ce05831176582201b664d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8e34189b347d76acf48ce05831176582201b664d Gitweb: http://git.kernel.org/tip/8e34189b347d76acf48ce05831176582201b664d Author: Masami Hiramatsu AuthorDate: Sat, 6 Aug 2016 19:29:48 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 9 Aug 2016 10:47:43 -0300 perf probe: Adjust map->reloc offset when finding kernel symbol from map Adjust map->reloc offset for the unmapped address when finding alternative symbol address from map, because KASLR can relocate the kernel symbol address. The same adjustment has been done when finding appropriate kernel symbol address from map which was introduced by commit f90acac75713 ("perf probe: Find given address from offline dwarf") Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Masami Hiramatsu Cc: Alexei Starovoitov Cc: Wang Nan Link: http://lkml.kernel.org/r/20160806192948.e366f3fbc4b194de600f8326@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 953dc1a..d5ccb65 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -385,7 +385,7 @@ static int find_alternative_probe_point(struct debuginfo *dinfo, if (uprobes) address = sym->start; else - address = map->unmap_ip(map, sym->start); + address = map->unmap_ip(map, sym->start) - map->reloc; break; } if (!address) {