From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756731AbcAIQmR (ORCPT ); Sat, 9 Jan 2016 11:42:17 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42398 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755953AbcAIQmO (ORCPT ); Sat, 9 Jan 2016 11:42:14 -0500 Date: Sat, 9 Jan 2016 08:41:58 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: adrian.hunter@intel.com, tglx@linutronix.de, noelgrandin@gmail.com, mingo@kernel.org, namhyung@kernel.org, jolsa@kernel.org, dsahern@gmail.com, hpa@zytor.com, a.p.zijlstra@chello.nl, acme@redhat.com, linux-kernel@vger.kernel.org Reply-To: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, dsahern@gmail.com, a.p.zijlstra@chello.nl, mingo@kernel.org, namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, noelgrandin@gmail.com In-Reply-To: <1452158050-28061-6-git-send-email-jolsa@kernel.org> References: <1452158050-28061-6-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf libdw: Check for mmaps also in MAP__VARIABLE tree Git-Commit-ID: 0ba98149f8c8b6b2ba36be9938afb731fa719004 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: 0ba98149f8c8b6b2ba36be9938afb731fa719004 Gitweb: http://git.kernel.org/tip/0ba98149f8c8b6b2ba36be9938afb731fa719004 Author: Jiri Olsa AuthorDate: Thu, 7 Jan 2016 10:14:02 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 8 Jan 2016 14:16:57 -0300 perf libdw: Check for mmaps also in MAP__VARIABLE tree We've seen cases (softice) where DWARF unwinder went through non executable mmaps, which we need to lookup in MAP__VARIABLE tree. Reported-and-Tested-by: Noel Grandin Signed-off-by: Jiri Olsa Cc: Adrian Hunter Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1452158050-28061-6-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/unwind-libdw.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c index db8142b..cf5e250 100644 --- a/tools/perf/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw.c @@ -96,6 +96,16 @@ static int access_dso_mem(struct unwind_info *ui, Dwarf_Addr addr, thread__find_addr_map(ui->thread, PERF_RECORD_MISC_USER, MAP__FUNCTION, addr, &al); if (!al.map) { + /* + * We've seen cases (softice) where DWARF unwinder went + * through non executable mmaps, which we need to lookup + * in MAP__VARIABLE tree. + */ + thread__find_addr_map(ui->thread, PERF_RECORD_MISC_USER, + MAP__VARIABLE, addr, &al); + } + + if (!al.map) { pr_debug("unwind: no map for %lx\n", (unsigned long)addr); return -1; }