diff options
author | Paul Turner <pjt@google.com> | 2011-07-21 12:43:27 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-08-14 06:01:13 -0400 |
commit | 953bfcd10e6f3697233e8e5128c611d275da39c1 (patch) | |
tree | a3ca8136bb9e992bb40945c5eee2a8dcc0fd0b57 /kernel/sched_rt.c | |
parent | 5710f15b52664ae0bfa60a66d75464769d297b2b (diff) |
sched: Implement hierarchical task accounting for SCHED_OTHER
Introduce hierarchical task accounting for the group scheduling case in CFS, as
well as promoting the responsibility for maintaining rq->nr_running to the
scheduling classes.
The primary motivation for this is that with scheduling classes supporting
bandwidth throttling it is possible for entities participating in throttled
sub-trees to not have root visible changes in rq->nr_running across activate
and de-activate operations. This in turn leads to incorrect idle and
weight-per-task load balance decisions.
This also allows us to make a small fixlet to the fastpath in pick_next_task()
under group scheduling.
Note: this issue also exists with the existing sched_rt throttling mechanism.
This patch does not address that.
Signed-off-by: Paul Turner <pjt@google.com>
Reviewed-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110721184756.878333391@google.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_rt.c')
-rw-r--r-- | kernel/sched_rt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index a8c207ff349..a9d3c6bc684 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -936,6 +936,8 @@ enqueue_task_rt(struct rq *rq, struct task_struct *p, int flags) | |||
936 | 936 | ||
937 | if (!task_current(rq, p) && p->rt.nr_cpus_allowed > 1) | 937 | if (!task_current(rq, p) && p->rt.nr_cpus_allowed > 1) |
938 | enqueue_pushable_task(rq, p); | 938 | enqueue_pushable_task(rq, p); |
939 | |||
940 | inc_nr_running(rq); | ||
939 | } | 941 | } |
940 | 942 | ||
941 | static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int flags) | 943 | static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int flags) |
@@ -946,6 +948,8 @@ static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int flags) | |||
946 | dequeue_rt_entity(rt_se); | 948 | dequeue_rt_entity(rt_se); |
947 | 949 | ||
948 | dequeue_pushable_task(rq, p); | 950 | dequeue_pushable_task(rq, p); |
951 | |||
952 | dec_nr_running(rq); | ||
949 | } | 953 | } |
950 | 954 | ||
951 | /* | 955 | /* |
@@ -1841,4 +1845,3 @@ static void print_rt_stats(struct seq_file *m, int cpu) | |||
1841 | rcu_read_unlock(); | 1845 | rcu_read_unlock(); |
1842 | } | 1846 | } |
1843 | #endif /* CONFIG_SCHED_DEBUG */ | 1847 | #endif /* CONFIG_SCHED_DEBUG */ |
1844 | |||