[PATCH] cpuset code prevents binding tasks to new cpus

[Nathan Lynch <ntl@pobox.com>]

Andrew Morton wrote:
> On Wed, 23 Aug 2006 18:49:53 -0500
> Nathan Lynch <ntl@pobox.com> wrote:
> 
> >  
> > +static int cpuset_handle_cpuhp(struct notifier_block *nb,
> > +				unsigned long phase, void *_cpu)
> > +{
> > +	unsigned long cpu = (unsigned long)_cpu;
> > +
> > +	mutex_lock(&manage_mutex);
> > +	mutex_lock(&callback_mutex);
> > +
> > +	switch (phase) {
> > +	case CPU_ONLINE:
> > +		cpu_set(cpu, top_cpuset.cpus_allowed);
> > +		break;
> > +	case CPU_DEAD:
> > +		cpu_clear(cpu, top_cpuset.cpus_allowed);
> > +		break;
> > +	}
> > +
> > +	mutex_unlock(&callback_mutex);
> > +	mutex_unlock(&manage_mutex);
> > +
> > +	return 0;
> > +}
> > +
> 
> The above needs #ifdef CONFIG_HOTPLUG_CPU wrappers.

Fixed, thanks.


Update cpus_allowed in top_cpuset when cpus are hotplugged; otherwise
binding a task to a newly hotplugged cpu fails since the toplevel
cpuset has a static copy of whatever cpu_online_map was at boot time.

Signed-off-by: Nathan Lynch <ntl@pobox.com>


--- cpuhp-sched_setaffinity.orig/kernel/cpuset.c
+++ cpuhp-sched_setaffinity/kernel/cpuset.c
@@ -2033,6 +2033,31 @@ out:
 	return err;
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
+static int cpuset_handle_cpuhp(struct notifier_block *nb,
+				unsigned long phase, void *_cpu)
+{
+	unsigned long cpu = (unsigned long)_cpu;
+
+	mutex_lock(&manage_mutex);
+	mutex_lock(&callback_mutex);
+
+	switch (phase) {
+	case CPU_ONLINE:
+		cpu_set(cpu, top_cpuset.cpus_allowed);
+		break;
+	case CPU_DEAD:
+		cpu_clear(cpu, top_cpuset.cpus_allowed);
+		break;
+	}
+
+	mutex_unlock(&callback_mutex);
+	mutex_unlock(&manage_mutex);
+
+	return 0;
+}
+#endif
+
 /**
  * cpuset_init_smp - initialize cpus_allowed
  *
@@ -2043,6 +2068,8 @@ void __init cpuset_init_smp(void)
 {
 	top_cpuset.cpus_allowed = cpu_online_map;
 	top_cpuset.mems_allowed = node_online_map;
+
+	hotcpu_notifier(cpuset_handle_cpuhp, 0);
 }
 
 /**
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/