From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755719Ab3HFKF5 (ORCPT ); Tue, 6 Aug 2013 06:05:57 -0400 Received: from mga02.intel.com ([134.134.136.20]:55541 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754797Ab3HFKF4 (ORCPT ); Tue, 6 Aug 2013 06:05:56 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,825,1367996400"; d="scan'208";a="382575698" Message-ID: <5200CBE9.9020804@intel.com> Date: Tue, 06 Aug 2013 13:11:53 +0300 From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Arnaldo Carvalho de Melo CC: linux-kernel@vger.kernel.org, David Ahern , Frederic Weisbecker , Jiri Olsa , Mike Galbraith , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Stephane Eranian , Ingo Molnar Subject: Re: [PATCH V3 10/10] perf tools: allow annotation using /proc/kcore References: <1375438252-24776-1-git-send-email-adrian.hunter@intel.com> <1375438252-24776-11-git-send-email-adrian.hunter@intel.com> <20130805195927.GA24584@ghostprotocols.net> In-Reply-To: <20130805195927.GA24584@ghostprotocols.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/08/13 22:59, Arnaldo Carvalho de Melo wrote: > Em Fri, Aug 02, 2013 at 01:10:52PM +0300, Adrian Hunter escreveu: >> Annotation with /proc/kcore is possible so the logic >> is adjusted to allow it. The main difference is that >> /proc/kcore had no symbols so the parsing logic needed >> a tweak to read jump offsets. >> >> The other difference is that objdump cannot always >> read from kcore. That seems to be a bug with objdump. > > Was this reported to the objdump guys? Can you ellaborate on the failure > cases? Bug is here: http://sourceware.org/bugzilla/show_bug.cgi?id=15818 It appears to fail because /proc/kcore has extremely large segments and objdump seems to be trying to do something with mmap related to those sizes. Anything in the text segment is ok. Anything else (e.g. module addresses) fails. > >> Signed-off-by: Adrian Hunter >> --- >> tools/perf/builtin-top.c | 3 ++- >> tools/perf/util/annotate.c | 13 +++++++++---- >> 2 files changed, 11 insertions(+), 5 deletions(-) >> >> diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c >> index bbf4635..3b19a6b 100644 >> --- a/tools/perf/builtin-top.c >> +++ b/tools/perf/builtin-top.c >> @@ -103,7 +103,8 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he) >> /* >> * We can't annotate with just /proc/kallsyms >> */ >> - if (map->dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS) { >> + if (map->dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS && >> + !dso__is_kcore(map->dso)) { >> pr_err("Can't annotate %s: No vmlinux file was found in the " >> "path\n", sym->name); >> sleep(1); >> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c >> index d102716..4ab2f11 100644 >> --- a/tools/perf/util/annotate.c >> +++ b/tools/perf/util/annotate.c >> @@ -110,10 +110,10 @@ static int jump__parse(struct ins_operands *ops) >> { >> const char *s = strchr(ops->raw, '+'); >> >> - ops->target.addr = strtoll(ops->raw, NULL, 16); >> + ops->target.addr = strtoull(ops->raw, NULL, 16); >> >> if (s++ != NULL) >> - ops->target.offset = strtoll(s, NULL, 16); >> + ops->target.offset = strtoull(s, NULL, 16); >> else >> ops->target.offset = UINT64_MAX; >> >> @@ -821,6 +821,10 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, >> if (dl == NULL) >> return -1; >> >> + if (dl->ops.target.offset == UINT64_MAX) >> + dl->ops.target.offset = dl->ops.target.addr - >> + map__rip_2objdump(map, sym->start); >> + >> disasm__add(¬es->src->source, dl); >> >> return 0; >> @@ -864,7 +868,8 @@ fallback: >> free_filename = false; >> } >> >> - if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS) { >> + if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS && >> + !dso__is_kcore(dso)) { >> char bf[BUILD_ID_SIZE * 2 + 16] = " with build id "; >> char *build_id_msg = NULL; >> >> @@ -898,7 +903,7 @@ fallback: >> snprintf(command, sizeof(command), >> "%s %s%s --start-address=0x%016" PRIx64 >> " --stop-address=0x%016" PRIx64 >> - " -d %s %s -C %s|grep -v %s|expand", >> + " -d %s %s -C %s 2>/dev/null|grep -v %s|expand", >> objdump_path ? objdump_path : "objdump", >> disassembler_style ? "-M " : "", >> disassembler_style ? disassembler_style : "", >> -- >> 1.7.11.7 > >