scheduler fixes
Linus,
Please pull the latest scheduler fixes git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Bharath Ravi (1):
sched, delay accounting: fix incorrect delay time when constantly waiting on runqueue
Dario Faggioli (1):
sched: NULL pointer dereference while setting sched_rt_period_us
Max Krasnyansky (1):
sched: CPU hotplug events must not destroy scheduler domains created by the cpusets
Peter Zijlstra (3):
sched: rt-group: fix hierarchy
sched: rt-group: heirarchy aware throttle
sched: rt-group: fix RR buglet
Rabin Vincent (1):
sched: fix defined-but-unused warning
kernel/cpuset.c | 6 ++++ kernel/sched.c | 27 +++++++++++++++++++- kernel/sched_rt.c | 63 ++++++++++++++++++++++++++++--------------------- kernel/sched_stats.h | 6 ++++ 4 files changed, 73 insertions(+), 29 deletions(-)
kernel/cpuset.c +6 -0
@@ -1890,6 +1890,12 @@ static void common_cpu_mem_hotplug_unplug(void) top_cpuset.mems_allowed = node_states[N_HIGH_MEMORY ];scan_for_empty_cpusets (&top_cpuset); +/* +* Scheduler destroys domains on hotplug events. +* Rebuild them based on the current settings. +*/ +rebuild_sched_domains (); +cgroup_unlock (); }
kernel/sched.c +25 -2
@@ -1127,6 +1127,7 @@ static enum hrtimer_restart hrtick(struct hrtimer *timer)return HRTIMER_NORESTART ; } +#ifdef CONFIG_SMP static void hotplug_hrtick_disable (int cpu) {struct rq *rq =cpu_rq (cpu);
@@ -1182,6 +1183,7 @@ static void init_hrtick(void) {hotcpu_notifier (hotplug_hrtick,0 ); } +#endif /* CONFIG_SMP */ static void init_rq_hrtick (struct rq *rq) {
@@ -7236,6 +7238,18 @@ void __attribute__((weak)) arch_update_cpu_topology(void) }/* +* Free current domain masks. +* Called after all cpus are attached to NULL domain. +*/ +static void free_sched_domains (void ) +{ + ndoms_cur =0 ; +if (doms_cur != &fallback_doms) +kfree (doms_cur); + doms_cur = &fallback_doms; +} + +/* * Set up scheduler domains and groups. Callers must hold the hotplug lock. * For now this just excludes isolated cpus, but could be used to * exclude other special cases in the future.
@@ -7382,6 +7396,7 @@ int arch_reinit_sched_domains(void)get_online_cpus ();mutex_lock (&sched_domains_mutex);detach_destroy_domains (&cpu_online_map); +free_sched_domains (); err =arch_init_sched_domains (&cpu_online_map);mutex_unlock (&sched_domains_mutex);put_online_cpus ();
@@ -7467,6 +7482,7 @@ static int update_sched_domains(struct notifier_block *nfb,case CPU_DOWN_PREPARE :case CPU_DOWN_PREPARE_FROZEN :detach_destroy_domains (&cpu_online_map); +free_sched_domains ();return NOTIFY_OK ;case CPU_UP_CANCELED :
@@ -7485,8 +7501,16 @@ static int update_sched_domains(struct notifier_block *nfb,return NOTIFY_DONE ; } +#ifndef CONFIG_CPUSETS +/* +* Create default domain partitioning if cpusets are disabled. +* Otherwise we let cpusets rebuild the domains based on the +* current setup. +*/ +/* The hotplug lock is already held by cpu_up/cpu_down */ arch_init_sched_domains (&cpu_online_map); +#endif return NOTIFY_OK ; }
@@ -7626,7 +7650,6 @@ static void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq,else rt_se->rt_rq = parent->my_q; - rt_se->rt_rq = &rq->rt; rt_se->my_q = rt_rq; rt_se->parent = parent;INIT_LIST_HEAD (&rt_se->run_list);
@@ -8348,7 +8371,7 @@ static unsigned long to_ratio(u64 period, u64 runtime)#ifdef CONFIG_CGROUP_SCHED static int __rt_schedulable (struct task_group *tg,u64 period,u64 runtime) { -struct task_group *tgi, *parent = tg->parent; +struct task_group *tgi, *parent = tg ? tg->parent :NULL ;unsigned long total =0 ;if (!parent) {
kernel/sched_rt.c +36 -27
114 lines not on this page · raw message
kernel/sched_stats.h +6 -0
@@ -198,6 +198,9 @@ static inline void sched_info_queued(struct task_struct *t)/* * Called when a process ceases being the active-running process, either * voluntarily or involuntarily. Now we can calculate how long we ran. +* Also, if the process is still in the TASK_RUNNING state, call +* sched_info_queued() to mark that it has now again started waiting on +* the runqueue. */ static inline void sched_info_depart (struct task_struct *t) {
@@ -206,6 +209,9 @@ static inline void sched_info_depart(struct task_struct *t) t->sched_info.cpu_time += delta;rq_sched_info_depart (task_rq (t), delta); + +if (t->state ==TASK_RUNNING ) +sched_info_queued (t); }/*