Skip to contentSkip to conversation

perf annotate: Fix off by one symbol hist size allocation and hit accounting

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Mar 31, 2012 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  64c17be4ffb8d6971051aec77ca1de4cfadb166d
Gitweb:     http://git.kernel.org/tip/64c17be4ffb8d6971051aec77ca1de4cfadb166d
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 28 Mar 2012 12:49:35 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 29 Mar 2012 17:13:45 -0300

perf annotate: Fix off by one symbol hist size allocation and hit accounting

We were not noticing it because symbol__inc_addr_samples was erroneously dropping samples that hit the last byte in a function.

Working on a fix for a problem reported by David Miller, Stephane Eranian and Sorin Dumitru, where addresses < sym->start were causing problems, I noticed this other problem.

Cc David Ahern <[email protected]>
Cc David Miller <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Sorin Dumitru <[email protected]>
Cc Stephane Eranian <[email protected]>
---
 tools/perf/util/annotate.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/annotate.c +3 -3
index 31ba2a2..199f69e 100644
@@ -28,8 +28,8 @@ int symbol__annotate_init(struct map *map __used, struct symbol *sym)
 int symbol__alloc_hist(struct symbol *sym)
 {
 	struct annotation *notes = symbol__annotation(sym);
-	size_t sizeof_sym_hist = (sizeof(struct sym_hist) +
-				  (sym->end - sym->start) * sizeof(u64));
+	const size_t size = sym->end - sym->start + 1;
+	size_t sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(u64));
 
 	notes->src = zalloc(sizeof(*notes->src) + symbol_conf.nr_events * sizeof_sym_hist);
 	if (notes->src == NULL)
@@ -64,7 +64,7 @@ int symbol__inc_addr_samples(struct symbol *sym, struct map *map,
 
 	pr_debug3("%s: addr=%#" PRIx64 "\n", __func__, map->unmap_ip(map, addr));
 
-	if (addr >= sym->end)
+	if (addr > sym->end)
 		return 0;
 
 	offset = addr - sym->start;