* [GIT PULL] perf fixlet for 2.6.34
@ 2010-05-08 4:45 Frederic Weisbecker
2010-05-08 7:59 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Frederic Weisbecker @ 2010-05-08 4:45 UTC (permalink / raw
To: Ingo Molnar
Cc: LKML, Frederic Weisbecker, Jason Baron, Arnaldo Carvalho de Melo,
Peter Zijlstra, Paul Mackerras, Tom Zanussi
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 <fweisbec@gmail.com>
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.
Reported-by: Jason Baron <jbaron@redhat.com>
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Tom Zanussi <tzanussi@gmail.com>
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 9b3c20f..613c9cc 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [GIT PULL] perf fixlet for 2.6.34
2010-05-08 4:45 [GIT PULL] perf fixlet for 2.6.34 Frederic Weisbecker
@ 2010-05-08 7:59 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2010-05-08 7:59 UTC (permalink / raw
To: Frederic Weisbecker
Cc: LKML, Jason Baron, Arnaldo Carvalho de Melo, Peter Zijlstra,
Paul Mackerras, Tom Zanussi
* Frederic Weisbecker <fweisbec@gmail.com> wrote:
> 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(-)
Pulled, thanks Frederic!
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-08 7:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-08 4:45 [GIT PULL] perf fixlet for 2.6.34 Frederic Weisbecker
2010-05-08 7:59 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).