Skip to contentSkip to conversation

perf symbols: remove incorrect open-coded container_of()

PATCH New Rabin Vincent 1 participant 1 message Nov 23, 2010 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf symbols: remove incorrect open-coded container_of()

At least on ARM, padding is inserted between rb_node and sym in struct symbol_name_rb_node, causing "((void *)sym) - sizeof(struct rb_node)" to point inside rb_node rather than to the symbol_name_rb_node. Fix this by converting the code to use container_of().

---
 tools/perf/util/symbol.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
tools/perf/util/symbol.c +3 -1
index b39f499..0500895 100644
@@ -295,7 +295,9 @@ static void symbols__insert_by_name(struct rb_root *self, struct symbol *sym)
 {
 	struct rb_node **p = &self->rb_node;
 	struct rb_node *parent = NULL;
-	struct symbol_name_rb_node *symn = ((void *)sym) - sizeof(*parent), *s;
+	struct symbol_name_rb_node *symn, *s;
+
+	symn = container_of(sym, struct symbol_name_rb_node, sym);
 
 	while (*p != NULL) {
 		parent = *p;
Signature · 1 line
1.7.2.3