[tip:perf/core] perf events: Fix mmap offset determination
in [Kernel]
|
Prev: [GIT PULL] Performance events updates for v2.6.36
Next: [tip:perf/core] tracing/kprobes: unregister_trace_probe needs to be called under mutex
From: tip-bot for Dave Martin on 5 Aug 2010 04:10 Commit-ID: b5a6325464b700c4bdac8799c495970516eed41c Gitweb: http://git.kernel.org/tip/b5a6325464b700c4bdac8799c495970516eed41c Author: Dave Martin <dave.martin(a)linaro.org> AuthorDate: Tue, 3 Aug 2010 12:48:35 +0100 Committer: Arnaldo Carvalho de Melo <acme(a)redhat.com> CommitDate: Wed, 4 Aug 2010 12:41:23 -0300 perf events: Fix mmap offset determination 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: Nicolas Pitre <nicolas.pitre(a)linaro.org> Cc: Will Deacon <Will.Deacon(a)arm.com> LKML-Reference: <1280836116-6654-2-git-send-email-dave.martin(a)linaro.org> Signed-off-by: Dave Martin <dave.martin(a)linaro.org> Signed-off-by: Arnaldo Carvalho de Melo <acme(a)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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |