aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorShailabh Nagar <nagar@watson.ibm.com>2006-07-14 03:24:37 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-15 00:53:56 -0400
commit0ff922452df86f3e9a2c6f705c4588ec62d096a7 (patch)
treeac84041bfb63f12d0e2db733c46b2cd2438b4882 /kernel/sched.c
parentca74e92b4698276b6696f15a801759f50944f387 (diff)
[PATCH] per-task-delay-accounting: sync block I/O and swapin delay collection
Unlike earlier iterations of the delay accounting patches, now delays are only collected for the actual I/O waits rather than try and cover the delays seen in I/O submission paths. Account separately for block I/O delays incurred as a result of swapin page faults whose frequency can be affected by the task/process' rss limit. Hence swapin delays can act as feedback for rss limit changes independent of I/O priority changes. Signed-off-by: Shailabh Nagar <nagar@watson.ibm.com> Signed-off-by: Balbir Singh <balbir@in.ibm.com> Cc: Jes Sorensen <jes@sgi.com> Cc: Peter Chubb <peterc@gelato.unsw.edu.au> Cc: Erich Focht <efocht@ess.nec.de> Cc: Levent Serinol <lserinol@gmail.com> Cc: Jay Lan <jlan@engr.sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index e9a0b61f12ab..9d42cbfc4f8b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -51,6 +51,7 @@
51#include <linux/times.h> 51#include <linux/times.h>
52#include <linux/acct.h> 52#include <linux/acct.h>
53#include <linux/kprobes.h> 53#include <linux/kprobes.h>
54#include <linux/delayacct.h>
54#include <asm/tlb.h> 55#include <asm/tlb.h>
55 56
56#include <asm/unistd.h> 57#include <asm/unistd.h>
@@ -4534,9 +4535,11 @@ void __sched io_schedule(void)
4534{ 4535{
4535 struct rq *rq = &__raw_get_cpu_var(runqueues); 4536 struct rq *rq = &__raw_get_cpu_var(runqueues);
4536 4537
4538 delayacct_blkio_start();
4537 atomic_inc(&rq->nr_iowait); 4539 atomic_inc(&rq->nr_iowait);
4538 schedule(); 4540 schedule();
4539 atomic_dec(&rq->nr_iowait); 4541 atomic_dec(&rq->nr_iowait);
4542 delayacct_blkio_end();
4540} 4543}
4541EXPORT_SYMBOL(io_schedule); 4544EXPORT_SYMBOL(io_schedule);
4542 4545
@@ -4545,9 +4548,11 @@ long __sched io_schedule_timeout(long timeout)
4545 struct rq *rq = &__raw_get_cpu_var(runqueues); 4548 struct rq *rq = &__raw_get_cpu_var(runqueues);
4546 long ret; 4549 long ret;
4547 4550
4551 delayacct_blkio_start();
4548 atomic_inc(&rq->nr_iowait); 4552 atomic_inc(&rq->nr_iowait);
4549 ret = schedule_timeout(timeout); 4553 ret = schedule_timeout(timeout);
4550 atomic_dec(&rq->nr_iowait); 4554 atomic_dec(&rq->nr_iowait);
4555 delayacct_blkio_end();
4551 return ret; 4556 return ret;
4552} 4557}
4553 4558