From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
Dave Martin <dave.martin@linaro.org>,
Anton Blanchard <anton@samba.org>,
Nicolas Pitre <nicolas.pitre@linaro.org>,
Will Deacon <Will.Deacon@arm.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 1/3] perf events: Fix mmap offset determination
Date: Wed, 4 Aug 2010 18:26:02 -0300 [thread overview]
Message-ID: <1280957164-14274-2-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1280957164-14274-1-git-send-email-acme@infradead.org>
From: Dave Martin <dave.martin@linaro.org>
Fix buggy-looking code which unnecessarily adjusts the file offset
fields read from /proc/*/maps.
This may have gone unnoticed since the offset is usually 0 (and the
logic in util/symbol.c may work incorrectly for other offset values).
Commiter note:
This fixes a bug introduced in 4af8b35, there is no need to shift pgoff
twice, the show_map_vma routine in fs/proc/task_mmu.c already converts
it from the number of pages to the size in bytes, and that is what
appears in /proc/PID/map.
Cc: Anton Blanchard <anton@samba.org>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Will Deacon <Will.Deacon@arm.com>
LKML-Reference: <1280836116-6654-2-git-send-email-dave.martin@linaro.org>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/event.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 6b0db55..db8a1d4 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -151,7 +151,6 @@ static int event__synthesize_mmap_events(pid_t pid, pid_t tgid,
continue;
pbf += n + 3;
if (*pbf == 'x') { /* vm_exec */
- u64 vm_pgoff;
char *execname = strchr(bf, '/');
/* Catch VDSO */
@@ -162,12 +161,7 @@ static int event__synthesize_mmap_events(pid_t pid, pid_t tgid,
continue;
pbf += 3;
- n = hex2u64(pbf, &vm_pgoff);
- /* pgoff is in bytes, not pages */
- if (n >= 0)
- ev.mmap.pgoff = vm_pgoff << getpagesize();
- else
- ev.mmap.pgoff = 0;
+ n = hex2u64(pbf, &ev.mmap.pgoff);
size = strlen(execname);
execname[size - 1] = '\0'; /* Remove \n */
--
1.6.2.5
next prev parent reply other threads:[~2010-08-04 21:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-04 21:26 [GIT PULL 0/3] perf/core fixes and improvements Arnaldo Carvalho de Melo
2010-08-04 21:26 ` Arnaldo Carvalho de Melo [this message]
2010-08-04 21:26 ` [PATCH 2/3] perf: expose event__process function Arnaldo Carvalho de Melo
2010-08-04 21:26 ` [PATCH 3/3] tracing/kprobes: unregister_trace_probe needs to be called under mutex Arnaldo Carvalho de Melo
2010-08-05 6:46 ` [GIT PULL 0/3] perf/core fixes and improvements Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1280957164-14274-2-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=Will.Deacon@arm.com \
--cc=acme@redhat.com \
--cc=anton@samba.org \
--cc=dave.martin@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=nicolas.pitre@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®