From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163AbcAGJSN (ORCPT ); Thu, 7 Jan 2016 04:18:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41831 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752992AbcAGJOZ (ORCPT ); Thu, 7 Jan 2016 04:14:25 -0500 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra , Noel Grandin , Adrian Hunter Subject: [PATCH 05/13] perf tools libdw: Check for mmaps also in MAP__VARIABLE tree Date: Thu, 7 Jan 2016 10:14:02 +0100 Message-Id: <1452158050-28061-6-git-send-email-jolsa@kernel.org> In-Reply-To: <1452158050-28061-1-git-send-email-jolsa@kernel.org> References: <1452158050-28061-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We've seen cases (softice) where DWARF unwinder went through non executable mmaps, which we need to lookup in MAP__VARIABLE tree. Reported-by: Noel Grandin Tested-by: Noel Grandin Link: http://lkml.kernel.org/n/tip-pd37evgxxggiu5sfomog8gtw@git.kernel.org Signed-off-by: Jiri Olsa --- 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 db8142ba7cb9..cf5e250bc78e 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; } -- 2.4.3