rt-patches/0104-trace-Add-migrate-disabled-counter-to-tracing-output.patch

   1 From 10007e7134956e7f4d27cd0cf751c18f24c69195 Mon Sep 17 00:00:00 2001
   2 From: Thomas Gleixner <tglx@linutronix.de>
   3 Date: Sun, 17 Jul 2011 21:56:42 +0200
   4 Subject: [PATCH 104/366] trace: Add migrate-disabled counter to tracing output
   5
   6 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
   7 ---
   8  include/linux/trace_events.h | 2 ++
   9  kernel/trace/trace.c         | 9 ++++++---
  10  kernel/trace/trace_events.c  | 2 ++
  11  kernel/trace/trace_output.c  | 5 +++++
  12  4 files changed, 15 insertions(+), 3 deletions(-)
  13
  14 diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
  15 index 925730b..28ece38 100644
  16 --- a/include/linux/trace_events.h
  17 +++ b/include/linux/trace_events.h
  18 @@ -66,6 +66,8 @@ struct trace_entry {
  19         unsigned char           flags;
  20         unsigned char           preempt_count;
  21         int                     pid;
  22 +       unsigned short          migrate_disable;
  23 +       unsigned short          padding;
  24  };
  25
  26  #define TRACE_EVENT_TYPE_MAX                                           \
  27 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
  28 index db9881e..114a079 100644
  29 --- a/kernel/trace/trace.c
  30 +++ b/kernel/trace/trace.c
  31 @@ -1708,6 +1708,8 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
  32                 ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) |
  33                 (tif_need_resched() ? TRACE_FLAG_NEED_RESCHED : 0) |
  34                 (test_preempt_need_resched() ? TRACE_FLAG_PREEMPT_RESCHED : 0);
  35 +
  36 +       entry->migrate_disable = (tsk) ? __migrate_disabled(tsk) & 0xFF : 0;
  37  }
  38  EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
  39
  40 @@ -2604,9 +2606,10 @@ static void print_lat_help_header(struct seq_file *m)
  41                     "#                | / _----=> need-resched    \n"
  42                     "#                || / _---=> hardirq/softirq \n"
  43                     "#                ||| / _--=> preempt-depth   \n"
  44 -                   "#                |||| /     delay            \n"
  45 -                   "#  cmd     pid   ||||| time  |   caller      \n"
  46 -                   "#     \\   /      |||||  \\    |   /         \n");
  47 +                   "#                |||| / _--=> migrate-disable\n"
  48 +                   "#                ||||| /     delay           \n"
  49 +                   "#  cmd     pid   |||||| time  |   caller     \n"
  50 +                   "#     \\   /      |||||  \\   |   /          \n");
  51  }
  52
  53  static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
  54 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
  55 index 996f0fd..4a48f97 100644
  56 --- a/kernel/trace/trace_events.c
  57 +++ b/kernel/trace/trace_events.c
  58 @@ -188,6 +188,8 @@ static int trace_define_common_fields(void)
  59         __common_field(unsigned char, flags);
  60         __common_field(unsigned char, preempt_count);
  61         __common_field(int, pid);
  62 +       __common_field(unsigned short, migrate_disable);
  63 +       __common_field(unsigned short, padding);
  64
  65         return ret;
  66  }
  67 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
  68 index 3bc4b6d..71b78b1 100644
  69 --- a/kernel/trace/trace_output.c
  70 +++ b/kernel/trace/trace_output.c
  71 @@ -428,6 +428,11 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
  72         else
  73                 trace_seq_putc(s, '.');
  74
  75 +       if (entry->migrate_disable)
  76 +               trace_seq_printf(s, "%x", entry->migrate_disable);
  77 +       else
  78 +               trace_seq_putc(s, '.');
  79 +
  80         return !trace_seq_has_overflowed(s);
  81  }
  82
  83 --
  84 1.9.1
  85