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
These are cpusets related cpu hotplug race fixes that have been tested to fix crashes and behavioral regressions that were reported.
Thanks,
Ingo
------------------>
Max Krasnyansky (2):
sched, cpuset: rework sched domains and CPU hotplug handling (v4)
sched: arch_reinit_sched_domains() must destroy domains to force rebuild
include/linux/cpuset.h | 2 +- kernel/cpuset.c | 312 ++++++++++++++++++++++++++++-------------------- kernel/sched.c | 19 ++- 3 files changed, 196 insertions(+), 137 deletions(-)
include/linux/cpuset.h +1 -1
@@ -160,7 +160,7 @@ static inline int current_cpuset_is_being_rebound(void)static inline void rebuild_sched_domains (void ) { -partition_sched_domains (0 ,NULL ,NULL ); +partition_sched_domains (1 ,NULL ,NULL ); }#endif /* !CONFIG_CPUSETS */
kernel/cpuset.c +182 -130
484 lines not on this page · raw message
kernel/sched.c +13 -6
@@ -7696,24 +7696,27 @@ static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur,* and partition_sched_domains() will fallback to the single partition * 'fallback_doms', it also forces the domains to be rebuilt. * +* If doms_new==NULL it will be replaced with cpu_online_map. +* ndoms_new==0 is a special case for destroying existing domains. +* It will not create the default domain. +* * Call with hotplug lock held */ void partition_sched_domains (int ndoms_new,cpumask_t *doms_new,struct sched_domain_attr *dattr_new) { -int i, j; +int i, j, n;mutex_lock (&sched_domains_mutex);/* always unregister in case we don't destroy any domains */ unregister_sched_domain_sysctl (); -if (doms_new ==NULL ) - ndoms_new =0 ; + n = doms_new ? ndoms_new :0 ;/* Destroy deleted domains */ for (i =0 ; i < ndoms_cur; i++) { -for (j =0 ; j < ndoms_new; j++) { +for (j =0 ; j < n; j++) {if (cpus_equal (doms_cur[i], doms_new[j]) &&dattrs_equal (dattr_cur, i, dattr_new, j)) goto match1;
@@ -7726,7 +7729,6 @@ match1:if (doms_new ==NULL ) { ndoms_cur =0 ; - ndoms_new =1 ; doms_new = &fallback_doms;cpus_andnot (doms_new[0 ], cpu_online_map, cpu_isolated_map); dattr_new =NULL ;
@@ -7763,8 +7765,13 @@ match2:int arch_reinit_sched_domains (void ) {get_online_cpus (); + +/* Destroy domains first to force the rebuild */ +partition_sched_domains (0 ,NULL ,NULL ); +rebuild_sched_domains ();put_online_cpus (); +return 0 ; }
@@ -7848,7 +7855,7 @@ static int update_sched_domains(struct notifier_block *nfb,case CPU_ONLINE_FROZEN :case CPU_DEAD :case CPU_DEAD_FROZEN : -partition_sched_domains (0 ,NULL ,NULL ); +partition_sched_domains (1 ,NULL ,NULL );return NOTIFY_OK ;default :