Skip to contentSkip to conversation

perf fixlet for 2.6.34

GIT PULL Frederic Weisbecker 2 participants 2 messages May 8, 2010 perf events

lore
Share & tools
lore
#0 lore raw

Ingo,

Please pull the perf/urgent branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/urgent

Thanks,
Frederic
---

Frederic Weisbecker (1):
perf: Fix static strings treated like dynamic ones

 tools/perf/util/trace-event-parse.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

---
commit c236e02b1c5adba76022e349ceff9dd60a00a2b8

Author: Frederic Weisbecker <[email protected]>
Date:   Wed May 5 22:07:39 2010 +0200

perf: Fix static strings treated like dynamic ones

The raw_field_ptr() helper, used to retrieve the address of a field inside a trace event, treats every strings as if they were dynamic
ie: having a secondary level of indirection to retrieve their contents.

FIELD_IS_STRING doesn't mean FIELD_IS_DYNAMIC, we only need to compute the secondary dereference for the latter case.

This fixes perf sched segfaults, bad cmdline report and may be some other bugs.

tools/perf/util/trace-event-parse.c +1 -1
index 9b3c20f..613c9cc 100644
@@ -1925,7 +1925,7 @@ void *raw_field_ptr(struct event *event, const char *name, void *data)
 	if (!field)
 		return NULL;
 
-	if (field->flags & FIELD_IS_STRING) {
+	if (field->flags & FIELD_IS_DYNAMIC) {
 		int offset;
 
 		offset = *(int *)(data + field->offset);
#1 lore raw
Quoted 11 lines · Frederic Weisbecker

Ingo,

Please pull the perf/urgent branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/urgent

Thanks,
Frederic
---

Quoted 6 lines

Frederic Weisbecker (1):
perf: Fix static strings treated like dynamic ones

 tools/perf/util/trace-event-parse.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Pulled, thanks Frederic!

Ingo