2 files changed, 38 insertions, 0 deletions

diff --git a/include/linux/delayacct.h b/include/linux/delayacct.h
index 9572cfa1f129..0ecbf9aad8e1 100644
--- a/include/linux/delayacct.h
+++ b/include/linux/delayacct.h
@@ -19,6 +19,13 @@
 
 #include <linux/sched.h>
 
+/*
+ * Per-task flags relevant to delay accounting
+ * maintained privately to avoid exhausting similar flags in sched.h:PF_*
+ * Used to set current->delays->flags
+ */
+#define DELAYACCT_PF_SWAPIN     0x00000001      /* I am doing a swapin */
+
 #ifdef CONFIG_TASK_DELAY_ACCT
 
 extern int delayacct_on;        /* Delay accounting turned on/off */
@@ -26,6 +33,8 @@ extern kmem_cache_t *delayacct_cache;
 extern void delayacct_init(void);
 extern void __delayacct_tsk_init(struct task_struct *);
 extern void __delayacct_tsk_exit(struct task_struct *);
+extern void __delayacct_blkio_start(void);
+extern void __delayacct_blkio_end(void);
 
 static inline void delayacct_set_flag(int flag)
 {
@@ -53,6 +62,18 @@ static inline void delayacct_tsk_exit(struct task_struct *tsk)
                 __delayacct_tsk_exit(tsk);
 }
 
+static inline void delayacct_blkio_start(void)
+{
+        if (current->delays)
+                __delayacct_blkio_start();
+}
+
+static inline void delayacct_blkio_end(void)
+{
+        if (current->delays)
+                __delayacct_blkio_end();
+}
+
 #else
 static inline void delayacct_set_flag(int flag)
 {}
@@ -64,6 +85,10 @@ static inline void delayacct_tsk_init(struct task_struct *tsk)
 {}
 static inline void delayacct_tsk_exit(struct task_struct *tsk)
 {}
+static inline void delayacct_blkio_start(void)
+{}
+static inline void delayacct_blkio_end(void)
+{}
 #endif /* CONFIG_TASK_DELAY_ACCT */
 
 #endif
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 7a54e62763c5..2f43f1fb7de7 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -566,6 +566,19 @@ struct task_delay_info {
          * Atomicity of updates to XXX_delay, XXX_count protected by
          * single lock above (split into XXX_lock if contention is an issue).
          */
+
+        /*
+         * XXX_count is incremented on every XXX operation, the delay
+         * associated with the operation is added to XXX_delay.
+         * XXX_delay contains the accumulated delay time in nanoseconds.
+         */
+        struct timespec blkio_start, blkio_end; /* Shared by blkio, swapin */
+        u64 blkio_delay;        /* wait for sync block io completion */
+        u64 swapin_delay;       /* wait for swapin block io completion */
+        u32 blkio_count;        /* total count of the number of sync block */
+                                /* io operations performed */
+        u32 swapin_count;       /* total count of the number of swapin block */
+                                /* io operations performed */
 };
 #endif