From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: rostedt@goodmis.org, mingo@elte.hu, akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [PATCH 1/3] ftrace: add proper bin iterator support
Date: Fri, 14 Nov 2008 16:16:04 +0530 [thread overview]
Message-ID: <1226659566-28168-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In s_show after print_trace_line we call trace_print_seq which
does a strlen on the buffer containing binary data. I guess that would
give wrong results for bin data even though we are null terminating it.
We also don't want header in the output file if we have TRACE_ITER_BIN.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
kernel/trace/trace.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 8a499e2..fb32a5c 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1833,10 +1833,51 @@ static enum print_line_t print_trace_line(struct trace_iterator *iter)
return print_trace_fmt(iter);
}
+static int s_bin_show(struct seq_file *m, void *v)
+{
+ int len;
+ enum print_line_t ret;
+ struct trace_iterator *iter = v;
+
+ if (iter->ent == NULL)
+ return 0;
+
+ if (iter->trace && iter->trace->print_line) {
+ ret = iter->trace->print_line(iter);
+ if (ret != TRACE_TYPE_UNHANDLED)
+ goto trace_handled;
+ }
+ /*
+ * If trace type is unhandled or if we don't have
+ * a print_line call the standard bin_fmt callback
+ */
+ print_bin_fmt(iter);
+
+trace_handled:
+ /* copy the trace buffer to seq file buffer */
+ if (iter->seq.len >= PAGE_SIZE)
+ len = PAGE_SIZE - 1;
+ else
+ len = iter->seq.len;
+
+ if (m->count + len < m->size) {
+ memcpy(m->buf + m->count, iter->seq.buffer, len);
+ m->count += len;
+ } else
+ m->count = m->size;
+ trace_seq_reset(&iter->seq);
+
+ return 0;
+}
+
+
static int s_show(struct seq_file *m, void *v)
{
struct trace_iterator *iter = v;
+ if (trace_flags & TRACE_ITER_BIN)
+ return s_bin_show(m, v);
+
if (iter->ent == NULL) {
if (iter->tr) {
seq_printf(m, "# tracer: %s\n", iter->trace->name);
--
1.6.0.4.608.ga9645
next reply other threads:[~2008-11-14 10:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-14 10:46 Aneesh Kumar K.V [this message]
2008-11-14 10:46 ` [PATCH 2/3] ftrace: Add debug_print trace to print data from kernel to userspace Aneesh Kumar K.V
2008-11-14 10:46 ` [PATCH 3/3] ftrace: Add debug_dump trace to dump binary " Aneesh Kumar K.V
2008-11-14 11:54 ` Frédéric Weisbecker
2008-11-14 13:19 ` Frédéric Weisbecker
2008-11-14 13:25 ` Frédéric Weisbecker
2008-11-14 11:21 ` [PATCH 2/3] ftrace: Add debug_print trace to print " Frédéric Weisbecker
2008-11-14 13:46 ` Aneesh Kumar K.V
2008-11-14 14:39 ` Frédéric Weisbecker
2008-11-16 10:49 ` Aneesh Kumar K.V
2008-11-14 11:25 ` Frédéric Weisbecker
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=1226659566-28168-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
--to=aneesh.kumar@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--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
Powered by JetHome