| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 10 Mar 2010 08:51:10 +0100
From: Jiri Olsa <jolsa@...hat.com>
To: rostedt@...dmis.org
Cc: linux-kernel@...r.kernel.org, Jiri Olsa <jolsa@...hat.com>
Subject: [PATCHv2 4/4] tracing: raw output for graph tracer
hi,
this patch adds raw trace output for graph tracer.
I have this one around for long time and it was quite handy
for investigating graph tracer issues.
wbr,
jirka
Signed-off-by: Jiri Olsa <jolsa@...hat.com>
---
kernel/trace/trace.c | 2 +-
kernel/trace/trace_functions_graph.c | 71 ++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f771ac1..6ce6d52 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1901,7 +1901,7 @@ static enum print_line_t print_raw_fmt(struct trace_iterator *iter)
entry = iter->ent;
if (trace_flags & TRACE_ITER_CONTEXT_INFO) {
- if (!trace_seq_printf(s, "%d %d %llu ",
+ if (!trace_seq_printf(s, " %6d %3d %20llu ",
entry->pid, iter->cpu, iter->ts))
goto partial;
}
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 78e09f1..de76226 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -1017,6 +1017,9 @@ print_graph_function(struct trace_iterator *iter)
int cpu = iter->cpu;
int ret;
+ if (trace_flags & TRACE_ITER_RAW)
+ return TRACE_TYPE_UNHANDLED;
+
if (data && per_cpu_ptr(data->cpu_data, cpu)->ignore) {
per_cpu_ptr(data->cpu_data, cpu)->ignore = 0;
return TRACE_TYPE_HANDLED;
@@ -1072,6 +1075,66 @@ print_graph_function_event(struct trace_iterator *iter, int flags)
return print_graph_function(iter);
}
+static enum print_line_t
+print_graph_raw(struct trace_iterator *iter, int flags)
+{
+ struct trace_entry *entry = iter->ent;
+ struct trace_seq *s = &iter->seq;
+ int ret = 0;
+ int depth;
+ void *func;
+ char *io;
+
+ switch (entry->type) {
+ case TRACE_GRAPH_ENT: {
+ struct ftrace_graph_ent_entry *field;
+ trace_assign_type(field, entry);
+ depth = field->graph_ent.depth;
+ func = (void *) field->graph_ent.func;
+ io = "-->";
+ break;
+ }
+ case TRACE_GRAPH_RET: {
+ struct ftrace_graph_ret_entry *field;
+ trace_assign_type(field, entry);
+ depth = field->ret.depth;
+ func = (void *) field->ret.func;
+ io = "<--";
+ break;
+ }
+ default:
+ return print_graph_comment(s, entry, iter);
+ }
+
+ ret = trace_seq_printf(s, "%s%6d %6d %6d %4d %7d %20p %4s %ps\n",
+ trace_flags & TRACE_ITER_CONTEXT_INFO ? "" : " ",
+ depth,
+ entry->lock_depth,
+ entry->flags,
+ entry->preempt_count,
+ entry->pid,
+ entry,
+ io,
+ func);
+
+ if (!ret)
+ return TRACE_TYPE_PARTIAL_LINE;
+
+ return TRACE_TYPE_HANDLED;
+}
+
+static void print_graph_raw_header(struct seq_file *s)
+{
+ if (trace_flags & TRACE_ITER_CONTEXT_INFO)
+ seq_printf(s, "#%6s %3s %20s ", "pid", "cpu", "duration");
+ else
+ seq_printf(s, "#");
+
+ seq_printf(s, "%6s %6s %6s %4s %7s %20s %4s %s\n",
+ "depth", "ldepth", "flags", "pc", "pid",
+ "entry", "i/o", "function");
+}
+
static void print_lat_header(struct seq_file *s)
{
static const char spaces[] = " " /* 16 spaces */
@@ -1098,6 +1161,11 @@ void print_graph_headers(struct seq_file *s)
{
int lat = trace_flags & TRACE_ITER_LATENCY_FMT;
+ if (trace_flags & TRACE_ITER_RAW) {
+ print_graph_raw_header(s);
+ return;
+ }
+
if (lat)
print_lat_header(s);
@@ -1113,6 +1181,7 @@ void print_graph_headers(struct seq_file *s)
seq_printf(s, "|||||");
if (tracer_flags.val & TRACE_GRAPH_PRINT_DURATION)
seq_printf(s, " DURATION ");
+
seq_printf(s, " FUNCTION CALLS\n");
/* 2nd line */
@@ -1178,11 +1247,13 @@ void graph_trace_close(struct trace_iterator *iter)
static struct trace_event graph_trace_entry_event = {
.type = TRACE_GRAPH_ENT,
.trace = print_graph_function_event,
+ .raw = print_graph_raw,
};
static struct trace_event graph_trace_ret_event = {
.type = TRACE_GRAPH_RET,
.trace = print_graph_function_event,
+ .raw = print_graph_raw,
};
static struct tracer graph_trace __read_mostly = {
--
1.6.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists