scheduler fixes for 2.6.35
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
tglx
------------------>
Alex,Shi (1):
sched: Fix over-scheduling bug
Peter Zijlstra (1):
sched: Fix PROVE_RCU vs cpu_cgroup
Will Deacon (1):
sched: Prevent compiler from optimising the sched_avg_update() loop
include/linux/cgroup.h | 20 +++++-- kernel/sched.c | 124 +++++++++++++++++++++++++----------------------- 2 files changed, 79 insertions(+), 65 deletions(-)
include/linux/cgroup.h +14 -6
@@ -525,13 +525,21 @@ static inline struct cgroup_subsys_state *cgroup_subsys_state(return cgrp->subsys[subsys_id]; } -static inline struct cgroup_subsys_state *task_subsys_state ( -struct task_struct *task,int subsys_id) +/* +* function to get the cgroup_subsys_state which allows for extra +* rcu_dereference_check() conditions, such as locks used during the +* cgroup_subsys::attach() methods. +*/ +#define task_subsys_state_check (task, subsys_id, __c) \ + rcu_dereference_check(task->cgroups->subsys[subsys_id], \ + rcu_read_lock_held() || \ + lockdep_is_held(&task->alloc_lock) || \ + cgroup_lock_is_held() || (__c)) + +static inline struct cgroup_subsys_state * +task_subsys_state (struct task_struct *task,int subsys_id) { -return rcu_dereference_check (task->cgroups->subsys[subsys_id], -rcu_read_lock_held () || -lockdep_is_held (&task->alloc_lock) || -cgroup_lock_is_held ()); +return task_subsys_state_check (task, subsys_id, false); } static inline struct cgroup* task_cgroup(struct task_struct *task,
kernel/sched.c +65 -59
160 lines not on this page · raw message