/proc export of aggregated block I/O delays
Subsystems (2)
PATCH 8/8 /proc export of aggregated block I/O delays
Changelog
Fixed comments by akpm
- use __u64 for delayacct_blkio_ticks() return type
- redundant check for tsk->delays in __delayacct_blkio_ticks()
delayacct-procfs.patch
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)
Signed-off-by Shailabh Nagar <[email protected]>
Signed-off-by Balbir Singh <[email protected]>
---
fs/proc/array.c | 6 ++++-- include/linux/delayacct.h | 10 ++++++++++ kernel/delayacct.c | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-)
fs/proc/array.c renamed from fs/proc/array.c~delayacct-procfs +4 -2
@@ -75,6 +75,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>
@@ -412,7 +413,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,
@@ -456,7 +457,8 @@ static int do_task_stat(struct task_stru task->exit_signal,task_cpu (task), task->rt_priority, - task->policy); + task->policy, + delayacct_blkio_ticks(task));if (mm)mmput (mm);return res;
include/linux/delayacct.h renamed from include/linux/delayacct.h~delayacct-procfs +10 -0
@@ -37,6 +37,7 @@ extern void __delayacct_tsk_exit(structextern 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) {
@@ -84,6 +85,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) {}
@@ -102,6 +110,8 @@ static inline void delayacct_blkio_end(vstatic 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
kernel/delayacct.c renamed from kernel/delayacct.c~delayacct-procfs +12 -0
@@ -146,3 +146,15 @@ int __delayacct_add_tsk(struct taskstatsreturn 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; +} +
_