scheduler fixes
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
Two throughput regression fixes and two fixes.
Thanks,
Ingo
------------------>
Mike Galbraith (3):
sched: Strengthen buddies and mitigate buddy induced latencies
sched: Disable SD_PREFER_LOCAL at node level
sched: Fix kthread_bind() by moving the body of kthread_bind() to sched.c
Rusty Russell (1):
sched: Fix boot crash by zalloc()ing most of the cpu masks
arch/x86/include/asm/topology.h | 2 +- kernel/kthread.c | 23 ------------ kernel/sched.c | 40 +++++++++++++++++++-- kernel/sched_fair.c | 73 +++++++++++++++++++++++++-------------- 4 files changed, 84 insertions(+), 54 deletions(-)
arch/x86/include/asm/topology.h +1 -1
@@ -143,7 +143,7 @@ extern unsigned long node_remap_size[]; | 1*SD_BALANCE_FORK \ |0 *SD_BALANCE_WAKE \ |1 *SD_WAKE_AFFINE \ - |1 *SD_PREFER_LOCAL \ + |0 *SD_PREFER_LOCAL \ |0 *SD_SHARE_CPUPOWER \ |0 *SD_POWERSAVINGS_BALANCE \ |0 *SD_SHARE_PKG_RESOURCES \
kernel/kthread.c +0 -23
@@ -150,29 +150,6 @@ struct task_struct *kthread_create(int (*threadfn)(void *data),EXPORT_SYMBOL (kthread_create);/** -* kthread_bind - bind a just-created kthread to a cpu. -* @k: thread created by kthread_create(). -* @cpu: cpu (might not be online, must be possible) for @k to run on. -* -* Description: This function is equivalent to set_cpus_allowed(), -* except that @cpu doesn't need to be online, and the thread must be -* stopped (i.e., just returned from kthread_create()). -*/ -void kthread_bind (struct task_struct *k,unsigned int cpu) -{ -/* Must have done schedule() in kthread() before we set_task_cpu */ -if (!wait_task_inactive (k,TASK_UNINTERRUPTIBLE )) { -WARN_ON (1 ); -return ; - } -set_task_cpu (k, cpu); - k->cpus_allowed =cpumask_of_cpu (cpu); - k->rt.nr_cpus_allowed =1 ; - k->flags |=PF_THREAD_BOUND ; -} -EXPORT_SYMBOL (kthread_bind); - -/** * kthread_stop - stop a thread created by kthread_create(). * @k: thread created by kthread_create(). *
kernel/sched.c +36 -4
@@ -1996,6 +1996,38 @@ static inline void check_class_changed(struct rq *rq, struct task_struct *p, p->sched_class->prio_changed (rq, p, oldprio, running); } +/** +* kthread_bind - bind a just-created kthread to a cpu. +* @k: thread created by kthread_create(). +* @cpu: cpu (might not be online, must be possible) for @k to run on. +* +* Description: This function is equivalent to set_cpus_allowed(), +* except that @cpu doesn't need to be online, and the thread must be +* stopped (i.e., just returned from kthread_create()). +* +* Function lives here instead of kthread.c because it messes with +* scheduler internals which require locking. +*/ +void kthread_bind (struct task_struct *p,unsigned int cpu) +{ +struct rq *rq =cpu_rq (cpu); +unsigned long flags; + +/* Must have done schedule() in kthread() before we set_task_cpu */ +if (!wait_task_inactive (p,TASK_UNINTERRUPTIBLE )) { +WARN_ON (1 ); +return ; + } + +spin_lock_irqsave (&rq->lock, flags); +set_task_cpu (p, cpu); + p->cpus_allowed =cpumask_of_cpu (cpu); + p->rt.nr_cpus_allowed =1 ; + p->flags |=PF_THREAD_BOUND ; +spin_unlock_irqrestore (&rq->lock, flags); +} +EXPORT_SYMBOL (kthread_bind); +#ifdef CONFIG_SMP /* * Is this task likely cache-hot:
@@ -2008,7 +2040,7 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)/* * Buddy candidates are cache hot: */ -if (sched_feat (CACHE_HOT_BUDDY ) && +if (sched_feat (CACHE_HOT_BUDDY ) &&this_rq ()->nr_running && (&p->se ==cfs_rq_of (&p->se)->next || &p->se ==cfs_rq_of (&p->se)->last))return 1 ;
@@ -9535,13 +9567,13 @@ void __init sched_init(void) current->sched_class = &fair_sched_class;/* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */ -alloc_cpumask_var (&nohz_cpu_mask,GFP_NOWAIT ); +zalloc_cpumask_var (&nohz_cpu_mask,GFP_NOWAIT );#ifdef CONFIG_SMP #ifdef CONFIG_NO_HZ -alloc_cpumask_var (&nohz.cpu_mask,GFP_NOWAIT ); +zalloc_cpumask_var (&nohz.cpu_mask,GFP_NOWAIT );alloc_cpumask_var (&nohz.ilb_grp_nohz_mask,GFP_NOWAIT );#endif -alloc_cpumask_var (&cpu_isolated_map,GFP_NOWAIT ); +zalloc_cpumask_var (&cpu_isolated_map,GFP_NOWAIT );#endif /* SMP */ perf_event_init ();
kernel/sched_fair.c +47 -26
106 lines not on this page · raw message