From: Steven Rostedt <rostedt@goodmis.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Christoph Hellwig <hch@infradead.org>,
Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>,
Gregory Haskins <ghaskins@novell.com>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
Thomas Gleixner <tglx@linutronix.de>,
Tim Bird <tim.bird@am.sony.com>, Sam Ravnborg <sam@ravnborg.org>,
"Frank Ch. Eigler" <fche@redhat.com>,
Jan Kiszka <jan.kiszka@siemens.com>,
John Stultz <johnstul@us.ibm.com>,
Arjan van de Ven <arjan@infradead.org>,
Steven Rostedt <srostedt@redhat.com>
Subject: [PATCH 14/20 -v5] Add tracing of context switches
Date: Wed, 23 Jan 2008 11:02:50 -0500 [thread overview]
Message-ID: <20080123160443.362810617@goodmis.org> (raw)
In-Reply-To: 20080123160236.969334052@goodmis.org
[-- Attachment #1: trace-add-cmdline-switch.patch --]
[-- Type: text/plain, Size: 9266 bytes --]
This patch adds context switch tracing, of the format of:
_------=> CPU#
/ _-----=> irqs-off
| / _----=> need-resched
|| / _---=> hardirq/softirq
||| / _--=> preempt-depth
|||| /
||||| delay
cmd pid ||||| time | caller
\ / ||||| \ | /
swapper-0 1d..3 137us+: 0:140:R --> 2912:120
sshd-2912 1d..3 216us+: 2912:120:S --> 0:140
swapper-0 1d..3 261us+: 0:140:R --> 2912:120
bash-2920 0d..3 267us+: 2920:120:S --> 0:140
sshd-2912 1d..3 330us!: 2912:120:S --> 0:140
swapper-0 1d..3 2389us+: 0:140:R --> 2847:120
yum-upda-2847 1d..3 2411us!: 2847:120:S --> 0:140
swapper-0 0d..3 11089us+: 0:140:R --> 3139:120
gdm-bina-3139 0d..3 11113us!: 3139:120:S --> 0:140
swapper-0 1d..3 102328us+: 0:140:R --> 2847:120
yum-upda-2847 1d..3 102348us!: 2847:120:S --> 0:140
"sched_switch" is added to /debugfs/tracing/available_tracers
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
---
lib/tracing/Kconfig | 9 ++
lib/tracing/Makefile | 1
lib/tracing/trace_sched_switch.c | 134 +++++++++++++++++++++++++++++++++++++++
lib/tracing/tracer.c | 32 +++++++++
lib/tracing/tracer.h | 19 +++++
5 files changed, 194 insertions(+), 1 deletion(-)
Index: linux-mcount.git/lib/tracing/Kconfig
===================================================================
--- linux-mcount.git.orig/lib/tracing/Kconfig 2008-01-23 10:27:19.000000000 -0500
+++ linux-mcount.git/lib/tracing/Kconfig 2008-01-23 10:27:31.000000000 -0500
@@ -23,3 +23,12 @@ config FUNCTION_TRACER
insert a call to an architecture specific __mcount routine,
that the debugging mechanism using this facility will hook by
providing a set of inline routines.
+
+config CONTEXT_SWITCH_TRACER
+ bool "Trace process context switches"
+ depends on DEBUG_KERNEL
+ select TRACING
+ help
+ This tracer hooks into the context switch and records
+ all switching of tasks.
+
Index: linux-mcount.git/lib/tracing/Makefile
===================================================================
--- linux-mcount.git.orig/lib/tracing/Makefile 2008-01-23 10:27:19.000000000 -0500
+++ linux-mcount.git/lib/tracing/Makefile 2008-01-23 10:27:31.000000000 -0500
@@ -1,6 +1,7 @@
obj-$(CONFIG_MCOUNT) += libmcount.o
obj-$(CONFIG_TRACING) += tracer.o
+obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o
obj-$(CONFIG_FUNCTION_TRACER) += trace_function.o
libmcount-y := mcount.o
Index: linux-mcount.git/lib/tracing/trace_sched_switch.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-mcount.git/lib/tracing/trace_sched_switch.c 2008-01-23 10:27:31.000000000 -0500
@@ -0,0 +1,134 @@
+/*
+ * trace context switch
+ *
+ * Copyright (C) 2007 Steven Rostedt <srostedt@redhat.com>
+ *
+ */
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/debugfs.h>
+#include <linux/kallsyms.h>
+#include <linux/uaccess.h>
+#include <linux/marker.h>
+#include <linux/mcount.h>
+
+#include "tracer.h"
+
+static struct tracing_trace *tracer_trace;
+static int trace_enabled __read_mostly;
+
+static notrace void sched_switch_callback(const struct marker *mdata,
+ void *private_data,
+ const char *format, ...)
+{
+ struct tracing_trace **p = mdata->private;
+ struct tracing_trace *tr = *p;
+ struct tracing_trace_cpu *data;
+ struct task_struct *prev;
+ struct task_struct *next;
+ unsigned long flags;
+ va_list ap;
+ int cpu;
+
+ if (likely(!trace_enabled))
+ return;
+
+ va_start(ap, format);
+ prev = va_arg(ap, typeof(prev));
+ next = va_arg(ap, typeof(next));
+ va_end(ap);
+
+ raw_local_irq_save(flags);
+ cpu = raw_smp_processor_id();
+ data = tr->data[cpu];
+ atomic_inc(&data->disabled);
+
+ if (likely(atomic_read(&data->disabled) == 1))
+ tracing_sched_switch_trace(tr, data, prev, next, flags);
+
+ atomic_dec(&data->disabled);
+ raw_local_irq_restore(flags);
+}
+
+static notrace void sched_switch_reset(struct tracing_trace *tr)
+{
+ int cpu;
+
+ tr->time_start = now();
+
+ for_each_online_cpu(cpu)
+ tracing_reset(tr->data[cpu]);
+}
+
+static notrace void start_sched_trace(struct tracing_trace *tr)
+{
+ sched_switch_reset(tr);
+ trace_enabled = 1;
+}
+
+static notrace void stop_sched_trace(struct tracing_trace *tr)
+{
+ trace_enabled = 0;
+}
+
+static notrace void sched_switch_trace_init(struct tracing_trace *tr)
+{
+ tracer_trace = tr;
+
+ if (tr->ctrl)
+ start_sched_trace(tr);
+}
+
+static notrace void sched_switch_trace_reset(struct tracing_trace *tr)
+{
+ if (tr->ctrl)
+ stop_sched_trace(tr);
+}
+
+static void sched_switch_trace_ctrl_update(struct tracing_trace *tr)
+{
+ /* When starting a new trace, reset the buffers */
+ if (tr->ctrl)
+ start_sched_trace(tr);
+ else
+ stop_sched_trace(tr);
+}
+
+static struct trace_types_struct sched_switch_trace __read_mostly =
+{
+ .name = "sched_switch",
+ .init = sched_switch_trace_init,
+ .reset = sched_switch_trace_reset,
+ .ctrl_update = sched_switch_trace_ctrl_update,
+};
+
+
+__init static int init_sched_switch_trace(void)
+{
+ int ret;
+
+ ret = register_trace(&sched_switch_trace);
+ if (ret)
+ return ret;
+
+ ret = marker_probe_register("kernel_sched_schedule",
+ "prev %p next %p",
+ sched_switch_callback,
+ &tracer_trace);
+ if (ret) {
+ pr_info("sched trace: Couldn't add marker"
+ " probe to switch_to\n");
+ goto out;
+ }
+
+ ret = marker_arm("kernel_sched_schedule");
+ if (ret) {
+ pr_info("sched trace: Couldn't arm probe switch_to\n");
+ goto out;
+ }
+
+ out:
+ return ret;
+}
+
+device_initcall(init_sched_switch_trace);
Index: linux-mcount.git/lib/tracing/tracer.c
===================================================================
--- linux-mcount.git.orig/lib/tracing/tracer.c 2008-01-23 10:27:19.000000000 -0500
+++ linux-mcount.git/lib/tracing/tracer.c 2008-01-23 10:27:31.000000000 -0500
@@ -52,6 +52,7 @@ enum trace_type {
__TRACE_FIRST_TYPE = 0,
TRACE_FN,
+ TRACE_CTX,
__TRACE_LAST_TYPE
};
@@ -227,6 +228,24 @@ notrace void tracing_function_trace(stru
entry->fn.parent_ip = parent_ip;
}
+notrace void tracing_sched_switch_trace(struct tracing_trace *tr,
+ struct tracing_trace_cpu *data,
+ struct task_struct *prev,
+ struct task_struct *next,
+ unsigned long flags)
+{
+ struct tracing_entry *entry;
+
+ entry = tracing_get_trace_entry(tr, data);
+ tracing_generic_entry_update(entry, flags);
+ entry->type = TRACE_CTX;
+ entry->ctx.prev_pid = prev->pid;
+ entry->ctx.prev_prio = prev->prio;
+ entry->ctx.prev_state = prev->state;
+ entry->ctx.next_pid = next->pid;
+ entry->ctx.next_prio = next->prio;
+}
+
enum trace_iterator {
TRACE_ITER_SYM_ONLY = 1,
TRACE_ITER_VERBOSE = 2,
@@ -545,6 +564,8 @@ lat_print_timestamp(struct seq_file *m,
seq_puts(m, " : ");
}
+static const char state_to_char[] = TASK_STATE_TO_CHAR_STR;
+
static void notrace
print_lat_fmt(struct seq_file *m, struct tracing_iterator *iter,
unsigned int trace_idx, int cpu)
@@ -555,6 +576,7 @@ print_lat_fmt(struct seq_file *m, struct
unsigned long rel_usecs;
int sym_only = !!(trace_flags & TRACE_ITER_SYM_ONLY);
int verbose = !!(trace_flags & TRACE_ITER_VERBOSE);
+ int S;
if (!next_entry)
next_entry = entry;
@@ -581,6 +603,16 @@ print_lat_fmt(struct seq_file *m, struct
seq_print_ip_sym(m, entry->fn.parent_ip, sym_only);
seq_puts(m, ")\n");
break;
+ case TRACE_CTX:
+ S = entry->ctx.prev_state < sizeof(state_to_char) ?
+ state_to_char[entry->ctx.prev_state] : 'X';
+ seq_printf(m, " %d:%d:%c --> %d:%d\n",
+ entry->ctx.prev_pid,
+ entry->ctx.prev_prio,
+ S,
+ entry->ctx.next_pid,
+ entry->ctx.next_prio);
+ break;
}
}
Index: linux-mcount.git/lib/tracing/tracer.h
===================================================================
--- linux-mcount.git.orig/lib/tracing/tracer.h 2008-01-23 10:27:19.000000000 -0500
+++ linux-mcount.git/lib/tracing/tracer.h 2008-01-23 10:27:31.000000000 -0500
@@ -10,6 +10,14 @@ struct tracing_function {
unsigned long parent_ip;
};
+struct tracing_sched_switch {
+ unsigned int prev_pid;
+ unsigned char prev_prio;
+ unsigned char prev_state;
+ unsigned int next_pid;
+ unsigned char next_prio;
+};
+
struct tracing_entry {
char type;
char cpu; /* who will want to trace more than 256 CPUS? */
@@ -18,7 +26,10 @@ struct tracing_entry {
int pid;
cycle_t t;
char comm[TASK_COMM_LEN];
- struct tracing_function fn;
+ union {
+ struct tracing_function fn;
+ struct tracing_sched_switch ctx;
+ };
};
struct tracing_trace_cpu {
@@ -82,6 +93,12 @@ void tracing_function_trace(struct traci
unsigned long ip,
unsigned long parent_ip,
unsigned long flags);
+void tracing_sched_switch_trace(struct tracing_trace *tr,
+ struct tracing_trace_cpu *data,
+ struct task_struct *prev,
+ struct task_struct *next,
+ unsigned long flags);
+
void tracing_start_function_trace(void);
void tracing_stop_function_trace(void);
--
next prev parent reply other threads:[~2008-01-23 16:08 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-23 16:02 [PATCH 00/20 -v5] mcount and latency tracing utility -v5 Steven Rostedt
2008-01-23 16:02 ` [PATCH 01/20 -v5] printk - dont wakeup klogd with interrupts disabled Steven Rostedt
2008-01-23 17:06 ` Daniel Walker
2008-01-23 17:25 ` Mathieu Desnoyers
2008-01-23 17:49 ` Tim Bird
2008-01-24 10:35 ` Pavel Machek
2008-01-23 17:27 ` Steven Rostedt
2008-01-23 17:32 ` Mathieu Desnoyers
2008-01-23 17:43 ` Daniel Walker
2008-01-23 18:18 ` Steven Rostedt
2008-01-23 18:28 ` Daniel Walker
2008-01-23 18:43 ` Steven Rostedt
2008-01-23 18:50 ` Daniel Walker
2008-01-23 19:59 ` Daniel Walker
2008-01-24 22:42 ` [PATCH] defer printks in irqs Tim Bird
2008-01-24 22:48 ` Peter Zijlstra
2008-01-24 23:23 ` Tim Bird
2008-01-27 6:01 ` Andrew Morton
2008-01-28 21:14 ` Tim Bird
2008-01-24 10:36 ` [PATCH 01/20 -v5] printk - dont wakeup klogd with interrupts disabled Pavel Machek
2008-01-23 16:02 ` [PATCH 02/20 -v5] Add basic support for gcc profiler instrumentation Steven Rostedt
2008-01-23 16:02 ` [PATCH 03/20 -v5] Annotate core code that should not be traced Steven Rostedt
2008-01-23 16:02 ` [PATCH 04/20 -v5] x86_64: notrace annotations Steven Rostedt
2008-01-23 16:02 ` [PATCH 05/20 -v5] add notrace annotations to vsyscall Steven Rostedt
2008-01-23 16:02 ` [PATCH 06/20 -v5] add notrace annotations for NMI routines Steven Rostedt
2008-01-23 21:31 ` Mathieu Desnoyers
2008-01-23 21:58 ` Steven Rostedt
2008-01-26 5:25 ` Steven Rostedt
2008-01-28 11:51 ` Jan Kiszka
2008-01-28 12:15 ` Steven Rostedt
2008-01-23 16:02 ` [PATCH 07/20 -v5] handle accurate time keeping over long delays Steven Rostedt
2008-01-23 16:02 ` [PATCH 08/20 -v5] initialize the clock source to jiffies clock Steven Rostedt
2008-01-23 16:40 ` Tim Bird
2008-01-23 16:02 ` [PATCH 09/20 -v5] add get_monotonic_cycles Steven Rostedt
2008-01-23 16:02 ` [PATCH 10/20 -v5] add notrace annotations to timing events Steven Rostedt
2008-01-23 16:02 ` [PATCH 11/20 -v5] mcount based trace in the form of a header file library Steven Rostedt
2008-01-23 16:02 ` [PATCH 12/20 -v5] Add context switch marker to sched.c Steven Rostedt
2008-01-23 16:02 ` [PATCH 13/20 -v5] Make the task State char-string visible to all Steven Rostedt
2008-01-23 16:02 ` Steven Rostedt [this message]
2008-01-23 16:02 ` [PATCH 15/20 -v5] Generic command line storage Steven Rostedt
2008-01-23 16:02 ` [PATCH 16/20 -v5] trace generic call to schedule switch Steven Rostedt
2008-01-23 16:02 ` [PATCH 17/20 -v5] Add marker in try_to_wake_up Steven Rostedt
2008-01-23 16:02 ` [PATCH 18/20 -v5] mcount tracer for wakeup latency timings Steven Rostedt
2008-01-23 16:02 ` [PATCH 19/20 -v5] Trace irq disabled critical timings Steven Rostedt
2008-01-23 16:53 ` Steven Rostedt
2008-01-23 17:11 ` Steven Rostedt
2008-01-23 17:27 ` Frank Ch. Eigler
2008-01-23 17:45 ` Steven Rostedt
2008-01-23 17:54 ` Mathieu Desnoyers
2008-01-23 17:58 ` Peter Zijlstra
2008-01-23 18:25 ` Frank Ch. Eigler
2008-01-23 18:48 ` Steven Rostedt
2008-01-23 21:29 ` Mathieu Desnoyers
2008-01-23 16:02 ` [PATCH 20/20 -v5] trace preempt off " Steven Rostedt
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=20080123160443.362810617@goodmis.org \
--to=rostedt@goodmis.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=akpm@linux-foundation.org \
--cc=arjan@infradead.org \
--cc=fche@redhat.com \
--cc=ghaskins@novell.com \
--cc=hch@infradead.org \
--cc=jan.kiszka@siemens.com \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@polymtl.ca \
--cc=mingo@elte.hu \
--cc=sam@ravnborg.org \
--cc=srostedt@redhat.com \
--cc=tglx@linutronix.de \
--cc=tim.bird@am.sony.com \
--cc=torvalds@linux-foundation.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.