The patch titled
per-task-delay-accounting: /proc export of aggregated block I/O delays
has been removed from the -mm tree. Its filename is
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: per-task-delay-accounting: /proc export of aggregated block I/O delays
From: Shailabh Nagar <nagar@xxxxxxxxxxxxxx>
Export I/O delays seen by a task through /proc/<tgid>/stats for use in top
etc.
Note that delays for I/O done for swapping in pages (swapin I/O) is clubbed
together with all other I/O here (this is not the case in the netlink
interface where the swapin I/O is kept distinct)
[akpm@xxxxxxxx: printk warning fix]
Signed-off-by: Shailabh Nagar <nagar@xxxxxxxxxxxxxx>
Signed-off-by: Balbir Singh <balbir@xxxxxxxxxx>
Cc: Jes Sorensen <jes@xxxxxxx>
Cc: Peter Chubb <peterc@xxxxxxxxxxxxxxxxxx>
Cc: Erich Focht <efocht@xxxxxxxxxx>
Cc: Levent Serinol <lserinol@xxxxxxxxx>
Cc: Jay Lan <jlan@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/proc/array.c | 6 ++++--
include/linux/delayacct.h | 10 ++++++++++
kernel/delayacct.c | 12 ++++++++++++
3 files changed, 26 insertions(+), 2 deletions(-)
diff -puN fs/proc/array.c~per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays fs/proc/array.c
--- a/fs/proc/array.c~per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays
+++ a/fs/proc/array.c
@@ -74,6 +74,7 @@
#include <linux/times.h>
#include <linux/cpuset.h>
#include <linux/rcupdate.h>
+#include <linux/delayacct.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@ -411,7 +412,7 @@ static int do_task_stat(struct task_stru
res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
-%lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu\n",
+%lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu %llu\n",
task->pid,
tcomm,
state,
@@ -455,7 +456,8 @@ static int do_task_stat(struct task_stru
task->exit_signal,
task_cpu(task),
task->rt_priority,
- task->policy);
+ task->policy,
+ (unsigned long long)delayacct_blkio_ticks(task));
if(mm)
mmput(mm);
return res;
diff -puN include/linux/delayacct.h~per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays include/linux/delayacct.h
--- a/include/linux/delayacct.h~per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays
+++ a/include/linux/delayacct.h
@@ -37,6 +37,7 @@ extern void __delayacct_tsk_exit(struct
extern void __delayacct_blkio_start(void);
extern void __delayacct_blkio_end(void);
extern int __delayacct_add_tsk(struct taskstats *, struct task_struct *);
+extern __u64 __delayacct_blkio_ticks(struct task_struct *);
static inline void delayacct_set_flag(int flag)
{
@@ -86,6 +87,13 @@ static inline int delayacct_add_tsk(stru
return __delayacct_add_tsk(d, tsk);
}
+static inline __u64 delayacct_blkio_ticks(struct task_struct *tsk)
+{
+ if (tsk->delays)
+ return __delayacct_blkio_ticks(tsk);
+ return 0;
+}
+
#else
static inline void delayacct_set_flag(int flag)
{}
@@ -104,6 +112,8 @@ static inline void delayacct_blkio_end(v
static inline int delayacct_add_tsk(struct taskstats *d,
struct task_struct *tsk)
{ return 0; }
+static inline __u64 delayacct_blkio_ticks(struct task_struct *tsk)
+{ return 0; }
#endif /* CONFIG_TASK_DELAY_ACCT */
#endif
diff -puN kernel/delayacct.c~per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays kernel/delayacct.c
--- a/kernel/delayacct.c~per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays
+++ a/kernel/delayacct.c
@@ -164,3 +164,15 @@ done:
spin_unlock(&tsk->delays_lock);
return 0;
}
+
+__u64 __delayacct_blkio_ticks(struct task_struct *tsk)
+{
+ __u64 ret;
+
+ spin_lock(&tsk->delays->lock);
+ ret = nsec_to_clock_t(tsk->delays->blkio_delay +
+ tsk->delays->swapin_delay);
+ spin_unlock(&tsk->delays->lock);
+ return ret;
+}
+
_
Patches currently in -mm which might be from nagar@xxxxxxxxxxxxxx are
list_islast-utility.patch
netlink-improve-string-attribute-validation.patch
task-watchers-register-per-task-delay-accounting.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
