From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756721AbcAIQld (ORCPT ); Sat, 9 Jan 2016 11:41:33 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42368 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755819AbcAIQl3 (ORCPT ); Sat, 9 Jan 2016 11:41:29 -0500 Date: Sat, 9 Jan 2016 08:41:14 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: namhyung@kernel.org, jolsa@kernel.org, tglx@linutronix.de, mingo@kernel.org, adrian.hunter@intel.com, acme@redhat.com, a.p.zijlstra@chello.nl, dsahern@gmail.com, noelgrandin@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, dsahern@gmail.com, noelgrandin@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, jolsa@kernel.org, namhyung@kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com In-Reply-To: <1452158050-28061-4-git-send-email-jolsa@kernel.org> References: <1452158050-28061-4-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf unwind: Use find_map function in access_dso_mem Git-Commit-ID: f22ed827a8d5ff5a85e7c8e865baaaaf71a8d0cc 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: f22ed827a8d5ff5a85e7c8e865baaaaf71a8d0cc Gitweb: http://git.kernel.org/tip/f22ed827a8d5ff5a85e7c8e865baaaaf71a8d0cc Author: Jiri Olsa AuthorDate: Thu, 7 Jan 2016 10:14:00 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 8 Jan 2016 14:16:12 -0300 perf unwind: Use find_map function in access_dso_mem The find_map helper is already there, so let's use it. Also we're going to introduce wider search in following patch, so it'll be easier to make this change on single place. Signed-off-by: Jiri Olsa Tested-by: Noel Grandin Cc: Adrian Hunter Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1452158050-28061-4-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/unwind-libunwind.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c index 3c258a0..f37859c 100644 --- a/tools/perf/util/unwind-libunwind.c +++ b/tools/perf/util/unwind-libunwind.c @@ -416,20 +416,19 @@ get_proc_name(unw_addr_space_t __maybe_unused as, static int access_dso_mem(struct unwind_info *ui, unw_word_t addr, unw_word_t *data) { - struct addr_location al; + struct map *map; ssize_t size; - thread__find_addr_map(ui->thread, PERF_RECORD_MISC_USER, - MAP__FUNCTION, addr, &al); - if (!al.map) { + map = find_map(addr, ui); + if (!map) { pr_debug("unwind: no map for %lx\n", (unsigned long)addr); return -1; } - if (!al.map->dso) + if (!map->dso) return -1; - size = dso__data_read_addr(al.map->dso, al.map, ui->machine, + size = dso__data_read_addr(map->dso, map, ui->machine, addr, (u8 *) data, sizeof(*data)); return !(size == sizeof(*data));