From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: rostedt@goodmis.org, mingo@elte.hu, akpm@linux-foundation.org,
fweisbec@gmail.com
Cc: linux-kernel@vger.kernel.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [PATCH] ftrace: add proper bin iterator support
Date: Sun, 16 Nov 2008 16:08:00 +0530 [thread overview]
Message-ID: <1226831883-26362-3-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1226831883-26362-2-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
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 4a90462..f6e21d8 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2080,10 +2080,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);
--
tg: (7195b67..) an/ftrace-bin-iterator.patch (depends on: master)
next prev parent reply other threads:[~2008-11-16 10:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-16 10:37 [PATCH] Fix writing to trace/trace_options Aneesh Kumar K.V
2008-11-16 10:37 ` [PATCH] ftrace: Add new entry type TRACE_BIN_DUMP Aneesh Kumar K.V
2008-11-16 10:38 ` Aneesh Kumar K.V [this message]
2008-11-16 10:38 ` [PATCH] ftrace: Add debug_dump trace to dump binary data from kernel to userspace Aneesh Kumar K.V
2008-11-16 10:38 ` [PATCH] ftrace: Add debug_print trace to print " Aneesh Kumar K.V
2008-11-16 10:38 ` [PATCH] ftrace: Add dump iteator Aneesh Kumar K.V
2008-11-16 10:46 ` [PATCH] Fix writing to trace/trace_options Aneesh Kumar K.V
2008-11-16 15:07 ` Steven Rostedt
2008-11-17 11:17 ` Ingo Molnar
2008-11-17 13:11 ` Aneesh Kumar K.V
2008-11-18 14:06 ` Ingo Molnar
2008-11-16 15:05 ` Steven Rostedt
2008-11-17 11:08 ` 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=1226831883-26362-3-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
--to=aneesh.kumar@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.