From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung.kim@lge.com>,
Namhyung Kim <namhyung@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Steven Rostedt <rostedt@goodmis.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 04/13] tools lib traceevent: Check string is really printable
Date: Mon, 2 Jul 2012 17:18:42 -0300 [thread overview]
Message-ID: <1341260331-10204-5-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1341260331-10204-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung.kim@lge.com>
When libtraceevent parses format fields, it assumes that array of 1 byte
is string but it's not always true. The kvm_emulate_insn contains 15 u8
array of insn that contains (binary) instructions. Thus when it's
printed, it'll have broken output like below:
kvm_emulate_insn: [FAILED TO PARSE] rip=3238197797 csbase=0 len=2 \
insn=<89>P^]<B4>& flags=5 failed=0
With this patch:
kvm_emulate_insn: [FAILED TO PARSE] rip=3238197797 csbase=0 len=2 \
insn=ARRAY[89, 10, 5d, c3, 8d, b4, 26, 00, 00, 00, 00, 55, 89, e5, 3e] flags=5 failed=0
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1340352615-20737-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/traceevent/event-parse.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 5548282..b203a50 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -3589,6 +3589,16 @@ static void print_mac_arg(struct trace_seq *s, int mac, void *data, int size,
trace_seq_printf(s, fmt, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);
}
+static int is_printable_array(char *p, unsigned int len)
+{
+ unsigned int i;
+
+ for (i = 0; i < len && p[i]; i++)
+ if (!isprint(p[i]))
+ return 0;
+ return 1;
+}
+
static void print_event_fields(struct trace_seq *s, void *data, int size,
struct event_format *event)
{
@@ -3608,7 +3618,8 @@ static void print_event_fields(struct trace_seq *s, void *data, int size,
len = offset >> 16;
offset &= 0xffff;
}
- if (field->flags & FIELD_IS_STRING) {
+ if (field->flags & FIELD_IS_STRING &&
+ is_printable_array(data + offset, len)) {
trace_seq_printf(s, "%s", (char *)data + offset);
} else {
trace_seq_puts(s, "ARRAY[");
@@ -3619,6 +3630,7 @@ static void print_event_fields(struct trace_seq *s, void *data, int size,
*((unsigned char *)data + offset + i));
}
trace_seq_putc(s, ']');
+ field->flags &= ~FIELD_IS_STRING;
}
} else {
val = pevent_read_number(event->pevent, data + field->offset,
--
1.7.9.2.358.g22243
next prev parent reply other threads:[~2012-07-02 20:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-02 20:18 [GIT PULL 00/13] perf/core fixes and improvements Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 01/13] tools lib traceevent: Fix clean target in Makefile Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 02/13] tools lib traceevent: Teach [ce]tags about libtraceeevent error codes Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 03/13] tools lib traceevent: Make dependency files regeneratable Arnaldo Carvalho de Melo
2012-07-02 20:18 ` Arnaldo Carvalho de Melo [this message]
2012-07-02 20:18 ` [PATCH 05/13] tools lib traceevent: Use local variable 'field' Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 06/13] tools lib traceevent: Add support for __print_hex() Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 07/13] tools lib traceevent: Replace malloc_or_die to plain malloc in alloc_event() Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 08/13] perf tools: Fix hw breakpoint's type modifier parsing Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 09/13] perf evsel: Handle hw breakpoints event names in perf_evsel__name() Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 10/13] perf tools: Fix generation of pmu list Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 11/13] perf symbols: Add '.note' check into search for NOTE section Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 12/13] perf tools: Adding round_up/round_down macros Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 13/13] perf bench: Fix confused variable namings and descriptions in mem subsystem Arnaldo Carvalho de Melo
2012-07-06 8:24 ` [GIT PULL 00/13] perf/core fixes and improvements Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1341260331-10204-5-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®