These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / trace / events / writeback.h

diff --git a/kernel/include/trace/events/writeback.h b/kernel/include/trace/events/writeback.h
index c178d13..73614ce 100644 (file)
--- a/kernel/include/trace/events/writeback.h
+++ b/kernel/include/trace/events/writeback.h
@@ -131,6 +131,36 @@ DEFINE_EVENT(writeback_dirty_inode_template, writeback_dirty_inode,
        TP_ARGS(inode, flags)
 );
 
+#ifdef CREATE_TRACE_POINTS
+#ifdef CONFIG_CGROUP_WRITEBACK
+
+static inline unsigned int __trace_wb_assign_cgroup(struct bdi_writeback *wb)
+{
+       return wb->memcg_css->cgroup->kn->ino;
+}
+
+static inline unsigned int __trace_wbc_assign_cgroup(struct writeback_control *wbc)
+{
+       if (wbc->wb)
+               return __trace_wb_assign_cgroup(wbc->wb);
+       else
+               return -1U;
+}
+#else  /* CONFIG_CGROUP_WRITEBACK */
+
+static inline unsigned int __trace_wb_assign_cgroup(struct bdi_writeback *wb)
+{
+       return -1U;
+}
+
+static inline unsigned int __trace_wbc_assign_cgroup(struct writeback_control *wbc)
+{
+       return -1U;
+}
+
+#endif /* CONFIG_CGROUP_WRITEBACK */
+#endif /* CREATE_TRACE_POINTS */
+
 DECLARE_EVENT_CLASS(writeback_write_inode_template,
 
        TP_PROTO(struct inode *inode, struct writeback_control *wbc),
@@ -141,6 +171,7 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template,
                __array(char, name, 32)
                __field(unsigned long, ino)
                __field(int, sync_mode)
+               __field(unsigned int, cgroup_ino)
        ),
 
        TP_fast_assign(
@@ -148,12 +179,14 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template,
                        dev_name(inode_to_bdi(inode)->dev), 32);
                __entry->ino            = inode->i_ino;
                __entry->sync_mode      = wbc->sync_mode;
+               __entry->cgroup_ino     = __trace_wbc_assign_cgroup(wbc);
        ),
 
-       TP_printk("bdi %s: ino=%lu sync_mode=%d",
+       TP_printk("bdi %s: ino=%lu sync_mode=%d cgroup_ino=%u",
                __entry->name,
                __entry->ino,
-               __entry->sync_mode
+               __entry->sync_mode,
+               __entry->cgroup_ino
        )
 );
 
@@ -172,8 +205,8 @@ DEFINE_EVENT(writeback_write_inode_template, writeback_write_inode,
 );
 
 DECLARE_EVENT_CLASS(writeback_work_class,
-       TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work),
-       TP_ARGS(bdi, work),
+       TP_PROTO(struct bdi_writeback *wb, struct wb_writeback_work *work),
+       TP_ARGS(wb, work),
        TP_STRUCT__entry(
                __array(char, name, 32)
                __field(long, nr_pages)
@@ -183,10 +216,11 @@ DECLARE_EVENT_CLASS(writeback_work_class,
                __field(int, range_cyclic)
                __field(int, for_background)
                __field(int, reason)
+               __field(unsigned int, cgroup_ino)
        ),
        TP_fast_assign(
                strncpy(__entry->name,
-                       bdi->dev ? dev_name(bdi->dev) : "(unknown)", 32);
+                       wb->bdi->dev ? dev_name(wb->bdi->dev) : "(unknown)", 32);
                __entry->nr_pages = work->nr_pages;
                __entry->sb_dev = work->sb ? work->sb->s_dev : 0;
                __entry->sync_mode = work->sync_mode;
@@ -194,9 +228,10 @@ DECLARE_EVENT_CLASS(writeback_work_class,
                __entry->range_cyclic = work->range_cyclic;
                __entry->for_background = work->for_background;
                __entry->reason = work->reason;
+               __entry->cgroup_ino = __trace_wb_assign_cgroup(wb);
        ),
        TP_printk("bdi %s: sb_dev %d:%d nr_pages=%ld sync_mode=%d "
-                 "kupdate=%d range_cyclic=%d background=%d reason=%s",
+                 "kupdate=%d range_cyclic=%d background=%d reason=%s cgroup_ino=%u",
                  __entry->name,
                  MAJOR(__entry->sb_dev), MINOR(__entry->sb_dev),
                  __entry->nr_pages,
@@ -204,13 +239,14 @@ DECLARE_EVENT_CLASS(writeback_work_class,
                  __entry->for_kupdate,
                  __entry->range_cyclic,
                  __entry->for_background,
-                 __print_symbolic(__entry->reason, WB_WORK_REASON)
+                 __print_symbolic(__entry->reason, WB_WORK_REASON),
+                 __entry->cgroup_ino
        )
 );
 #define DEFINE_WRITEBACK_WORK_EVENT(name) \
 DEFINE_EVENT(writeback_work_class, name, \
-       TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work), \
-       TP_ARGS(bdi, work))
+       TP_PROTO(struct bdi_writeback *wb, struct wb_writeback_work *work), \
+       TP_ARGS(wb, work))
 DEFINE_WRITEBACK_WORK_EVENT(writeback_queue);
 DEFINE_WRITEBACK_WORK_EVENT(writeback_exec);
 DEFINE_WRITEBACK_WORK_EVENT(writeback_start);
@@ -230,26 +266,42 @@ TRACE_EVENT(writeback_pages_written,
 );
 
 DECLARE_EVENT_CLASS(writeback_class,
-       TP_PROTO(struct backing_dev_info *bdi),
-       TP_ARGS(bdi),
+       TP_PROTO(struct bdi_writeback *wb),
+       TP_ARGS(wb),
        TP_STRUCT__entry(
                __array(char, name, 32)
+               __field(unsigned int, cgroup_ino)
        ),
        TP_fast_assign(
-               strncpy(__entry->name, dev_name(bdi->dev), 32);
+               strncpy(__entry->name, dev_name(wb->bdi->dev), 32);
+               __entry->cgroup_ino = __trace_wb_assign_cgroup(wb);
        ),
-       TP_printk("bdi %s",
-                 __entry->name
+       TP_printk("bdi %s: cgroup_ino=%u",
+                 __entry->name,
+                 __entry->cgroup_ino
        )
 );
 #define DEFINE_WRITEBACK_EVENT(name) \
 DEFINE_EVENT(writeback_class, name, \
-       TP_PROTO(struct backing_dev_info *bdi), \
-       TP_ARGS(bdi))
+       TP_PROTO(struct bdi_writeback *wb), \
+       TP_ARGS(wb))
 
 DEFINE_WRITEBACK_EVENT(writeback_nowork);
 DEFINE_WRITEBACK_EVENT(writeback_wake_background);
-DEFINE_WRITEBACK_EVENT(writeback_bdi_register);
+
+TRACE_EVENT(writeback_bdi_register,
+       TP_PROTO(struct backing_dev_info *bdi),
+       TP_ARGS(bdi),
+       TP_STRUCT__entry(
+               __array(char, name, 32)
+       ),
+       TP_fast_assign(
+               strncpy(__entry->name, dev_name(bdi->dev), 32);
+       ),
+       TP_printk("bdi %s",
+               __entry->name
+       )
+);
 
 DECLARE_EVENT_CLASS(wbc_class,
        TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi),
@@ -265,6 +317,7 @@ DECLARE_EVENT_CLASS(wbc_class,
                __field(int, range_cyclic)
                __field(long, range_start)
                __field(long, range_end)
+               __field(unsigned int, cgroup_ino)
        ),
 
        TP_fast_assign(
@@ -278,11 +331,12 @@ DECLARE_EVENT_CLASS(wbc_class,
                __entry->range_cyclic   = wbc->range_cyclic;
                __entry->range_start    = (long)wbc->range_start;
                __entry->range_end      = (long)wbc->range_end;
+               __entry->cgroup_ino     = __trace_wbc_assign_cgroup(wbc);
        ),
 
        TP_printk("bdi %s: towrt=%ld skip=%ld mode=%d kupd=%d "
                "bgrd=%d reclm=%d cyclic=%d "
-               "start=0x%lx end=0x%lx",
+               "start=0x%lx end=0x%lx cgroup_ino=%u",
                __entry->name,
                __entry->nr_to_write,
                __entry->pages_skipped,
@@ -292,7 +346,9 @@ DECLARE_EVENT_CLASS(wbc_class,
                __entry->for_reclaim,
                __entry->range_cyclic,
                __entry->range_start,
-               __entry->range_end)
+               __entry->range_end,
+               __entry->cgroup_ino
+       )
 )
 
 #define DEFINE_WBC_EVENT(name) \
@@ -312,6 +368,7 @@ TRACE_EVENT(writeback_queue_io,
                __field(long,           age)
                __field(int,            moved)
                __field(int,            reason)
+               __field(unsigned int,   cgroup_ino)
        ),
        TP_fast_assign(
                unsigned long *older_than_this = work->older_than_this;
@@ -321,13 +378,15 @@ TRACE_EVENT(writeback_queue_io,
                                  (jiffies - *older_than_this) * 1000 / HZ : -1;
                __entry->moved  = moved;
                __entry->reason = work->reason;
+               __entry->cgroup_ino     = __trace_wb_assign_cgroup(wb);
        ),
-       TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s",
+       TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%u",
                __entry->name,
                __entry->older, /* older_than_this in jiffies */
                __entry->age,   /* older_than_this in relative milliseconds */
                __entry->moved,
-               __print_symbolic(__entry->reason, WB_WORK_REASON)
+               __print_symbolic(__entry->reason, WB_WORK_REASON),
+               __entry->cgroup_ino
        )
 );
 
@@ -360,7 +419,7 @@ TRACE_EVENT(global_dirty_state,
                __entry->nr_written     = global_page_state(NR_WRITTEN);
                __entry->background_thresh = background_thresh;
                __entry->dirty_thresh   = dirty_thresh;
-               __entry->dirty_limit = global_dirty_limit;
+               __entry->dirty_limit    = global_wb_domain.dirty_limit;
        ),
 
        TP_printk("dirty=%lu writeback=%lu unstable=%lu "
@@ -381,11 +440,11 @@ TRACE_EVENT(global_dirty_state,
 
 TRACE_EVENT(bdi_dirty_ratelimit,
 
-       TP_PROTO(struct backing_dev_info *bdi,
+       TP_PROTO(struct bdi_writeback *wb,
                 unsigned long dirty_rate,
                 unsigned long task_ratelimit),
 
-       TP_ARGS(bdi, dirty_rate, task_ratelimit),
+       TP_ARGS(wb, dirty_rate, task_ratelimit),
 
        TP_STRUCT__entry(
                __array(char,           bdi, 32)
@@ -395,36 +454,39 @@ TRACE_EVENT(bdi_dirty_ratelimit,
                __field(unsigned long,  dirty_ratelimit)
                __field(unsigned long,  task_ratelimit)
                __field(unsigned long,  balanced_dirty_ratelimit)
+               __field(unsigned int,   cgroup_ino)
        ),
 
        TP_fast_assign(
-               strlcpy(__entry->bdi, dev_name(bdi->dev), 32);
-               __entry->write_bw       = KBps(bdi->write_bandwidth);
-               __entry->avg_write_bw   = KBps(bdi->avg_write_bandwidth);
+               strlcpy(__entry->bdi, dev_name(wb->bdi->dev), 32);
+               __entry->write_bw       = KBps(wb->write_bandwidth);
+               __entry->avg_write_bw   = KBps(wb->avg_write_bandwidth);
                __entry->dirty_rate     = KBps(dirty_rate);
-               __entry->dirty_ratelimit = KBps(bdi->dirty_ratelimit);
+               __entry->dirty_ratelimit = KBps(wb->dirty_ratelimit);
                __entry->task_ratelimit = KBps(task_ratelimit);
                __entry->balanced_dirty_ratelimit =
-                                         KBps(bdi->balanced_dirty_ratelimit);
+                                       KBps(wb->balanced_dirty_ratelimit);
+               __entry->cgroup_ino     = __trace_wb_assign_cgroup(wb);
        ),
 
        TP_printk("bdi %s: "
                  "write_bw=%lu awrite_bw=%lu dirty_rate=%lu "
                  "dirty_ratelimit=%lu task_ratelimit=%lu "
-                 "balanced_dirty_ratelimit=%lu",
+                 "balanced_dirty_ratelimit=%lu cgroup_ino=%u",
                  __entry->bdi,
                  __entry->write_bw,            /* write bandwidth */
                  __entry->avg_write_bw,        /* avg write bandwidth */
                  __entry->dirty_rate,          /* bdi dirty rate */
                  __entry->dirty_ratelimit,     /* base ratelimit */
                  __entry->task_ratelimit, /* ratelimit with position control */
-                 __entry->balanced_dirty_ratelimit /* the balanced ratelimit */
+                 __entry->balanced_dirty_ratelimit, /* the balanced ratelimit */
+                 __entry->cgroup_ino
        )
 );
 
 TRACE_EVENT(balance_dirty_pages,
 
-       TP_PROTO(struct backing_dev_info *bdi,
+       TP_PROTO(struct bdi_writeback *wb,
                 unsigned long thresh,
                 unsigned long bg_thresh,
                 unsigned long dirty,
@@ -437,7 +499,7 @@ TRACE_EVENT(balance_dirty_pages,
                 long pause,
                 unsigned long start_time),
 
-       TP_ARGS(bdi, thresh, bg_thresh, dirty, bdi_thresh, bdi_dirty,
+       TP_ARGS(wb, thresh, bg_thresh, dirty, bdi_thresh, bdi_dirty,
                dirty_ratelimit, task_ratelimit,
                dirtied, period, pause, start_time),
 
@@ -456,14 +518,16 @@ TRACE_EVENT(balance_dirty_pages,
                __field(         long,  pause)
                __field(unsigned long,  period)
                __field(         long,  think)
+               __field(unsigned int,   cgroup_ino)
        ),
 
        TP_fast_assign(
                unsigned long freerun = (thresh + bg_thresh) / 2;
-               strlcpy(__entry->bdi, dev_name(bdi->dev), 32);
+               strlcpy(__entry->bdi, dev_name(wb->bdi->dev), 32);
 
-               __entry->limit          = global_dirty_limit;
-               __entry->setpoint       = (global_dirty_limit + freerun) / 2;
+               __entry->limit          = global_wb_domain.dirty_limit;
+               __entry->setpoint       = (global_wb_domain.dirty_limit +
+                                               freerun) / 2;
                __entry->dirty          = dirty;
                __entry->bdi_setpoint   = __entry->setpoint *
                                                bdi_thresh / (thresh + 1);
@@ -477,6 +541,7 @@ TRACE_EVENT(balance_dirty_pages,
                __entry->period         = period * 1000 / HZ;
                __entry->pause          = pause * 1000 / HZ;
                __entry->paused         = (jiffies - start_time) * 1000 / HZ;
+               __entry->cgroup_ino     = __trace_wb_assign_cgroup(wb);
        ),
 
 
@@ -485,7 +550,7 @@ TRACE_EVENT(balance_dirty_pages,
                  "bdi_setpoint=%lu bdi_dirty=%lu "
                  "dirty_ratelimit=%lu task_ratelimit=%lu "
                  "dirtied=%u dirtied_pause=%u "
-                 "paused=%lu pause=%ld period=%lu think=%ld",
+                 "paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%u",
                  __entry->bdi,
                  __entry->limit,
                  __entry->setpoint,
@@ -499,7 +564,8 @@ TRACE_EVENT(balance_dirty_pages,
                  __entry->paused,      /* ms */
                  __entry->pause,       /* ms */
                  __entry->period,      /* ms */
-                 __entry->think        /* ms */
+                 __entry->think,       /* ms */
+                 __entry->cgroup_ino
          )
 );
 
@@ -513,6 +579,7 @@ TRACE_EVENT(writeback_sb_inodes_requeue,
                __field(unsigned long, ino)
                __field(unsigned long, state)
                __field(unsigned long, dirtied_when)
+               __field(unsigned int, cgroup_ino)
        ),
 
        TP_fast_assign(
@@ -521,14 +588,16 @@ TRACE_EVENT(writeback_sb_inodes_requeue,
                __entry->ino            = inode->i_ino;
                __entry->state          = inode->i_state;
                __entry->dirtied_when   = inode->dirtied_when;
+               __entry->cgroup_ino     = __trace_wb_assign_cgroup(inode_to_wb(inode));
        ),
 
-       TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu",
+       TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu cgroup_ino=%u",
                  __entry->name,
                  __entry->ino,
                  show_inode_state(__entry->state),
                  __entry->dirtied_when,
-                 (jiffies - __entry->dirtied_when) / HZ
+                 (jiffies - __entry->dirtied_when) / HZ,
+                 __entry->cgroup_ino
        )
 );
 
@@ -584,6 +653,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
                __field(unsigned long, writeback_index)
                __field(long, nr_to_write)
                __field(unsigned long, wrote)
+               __field(unsigned int, cgroup_ino)
        ),
 
        TP_fast_assign(
@@ -595,10 +665,11 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
                __entry->writeback_index = inode->i_mapping->writeback_index;
                __entry->nr_to_write    = nr_to_write;
                __entry->wrote          = nr_to_write - wbc->nr_to_write;
+               __entry->cgroup_ino     = __trace_wbc_assign_cgroup(wbc);
        ),
 
        TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu "
-                 "index=%lu to_write=%ld wrote=%lu",
+                 "index=%lu to_write=%ld wrote=%lu cgroup_ino=%u",
                  __entry->name,
                  __entry->ino,
                  show_inode_state(__entry->state),
@@ -606,7 +677,8 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
                  (jiffies - __entry->dirtied_when) / HZ,
                  __entry->writeback_index,
                  __entry->nr_to_write,
-                 __entry->wrote
+                 __entry->wrote,
+                 __entry->cgroup_ino
        )
 );