diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 21:56:42 +0200 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-02-13 00:34:58 +0100 |
| commit | 5315b94d421482a62ce58ca20be04e6fa58e4afe (patch) | |
| tree | c8118d664147a85344637eba73d03d4a758e78f0 | |
| parent | 03f3039d78c331d9f4e99f11eddeb61661b5f668 (diff) | |
| download | rt-linux-5315b94d421482a62ce58ca20be04e6fa58e4afe.tar.gz | |
trace: Add migrate-disabled counter to tracing output
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/trace_events.h | 2 | ||||
| -rw-r--r-- | kernel/trace/trace.c | 9 | ||||
| -rw-r--r-- | kernel/trace/trace_events.c | 2 | ||||
| -rw-r--r-- | kernel/trace/trace_output.c | 5 |
4 files changed, 15 insertions, 3 deletions
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index 429fdfc3baf59..93087d2a4a75e 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -66,6 +66,8 @@ struct trace_entry { unsigned char flags; unsigned char preempt_count; int pid; + unsigned short migrate_disable; + unsigned short padding; }; #define TRACE_EVENT_TYPE_MAX \ diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 87fb9801bd9ee..b3c7dd4dbadd6 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1663,6 +1663,8 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) | (tif_need_resched() ? TRACE_FLAG_NEED_RESCHED : 0) | (test_preempt_need_resched() ? TRACE_FLAG_PREEMPT_RESCHED : 0); + + entry->migrate_disable = (tsk) ? __migrate_disabled(tsk) & 0xFF : 0; } EXPORT_SYMBOL_GPL(tracing_generic_entry_update); @@ -2560,9 +2562,10 @@ static void print_lat_help_header(struct seq_file *m) "# | / _----=> need-resched \n" "# || / _---=> hardirq/softirq \n" "# ||| / _--=> preempt-depth \n" - "# |||| / delay \n" - "# cmd pid ||||| time | caller \n" - "# \\ / ||||| \\ | / \n"); + "# |||| / _--=> migrate-disable\n" + "# ||||| / delay \n" + "# cmd pid |||||| time | caller \n" + "# \\ / ||||| \\ | / \n"); } static void print_event_info(struct trace_buffer *buf, struct seq_file *m) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 4f6ef6912e001..878cf6525a0de 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -186,6 +186,8 @@ static int trace_define_common_fields(void) __common_field(unsigned char, flags); __common_field(unsigned char, preempt_count); __common_field(int, pid); + __common_field(unsigned short, migrate_disable); + __common_field(unsigned short, padding); return ret; } diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 282982195e09f..d7192cbff44a6 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -428,6 +428,11 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) else trace_seq_putc(s, '.'); + if (entry->migrate_disable) + trace_seq_printf(s, "%x", entry->migrate_disable); + else + trace_seq_putc(s, '.'); + return !trace_seq_has_overflowed(s); } |