Skip to contentSkip to conversation

cpu hotplug fixes for dependent_sleeper and wake_sleeping_dependent

PATCH In review Nathan Lynch 3 participants 3 messages Aug 30, 2004 – Sep 1, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpu hotplug fixes for dependent_sleeper and wake_sleeping_dependent

Hi-

I've reported this issue a couple of times and I think I've finally tracked it down, though I don't know whether I've come up with the best fix.

To recap, offlining a cpu with current bk results in the "Aiee, killing interrupt handler!" panic from do_exit(). This seems to be triggered only with CONFIG_PREEMPT and CONFIG_SCHED_SMT both enabled. I believe the problem is that when do_stop() calls schedule(), dependent_sleeper() drops the "offline" cpu's rq->lock and never reacquires it.

The following seems to work (tested on ppc64). Is there a better way?

Nathan

---

Return early from dependent_sleeper and wake_sleeping_dependent if this_cpu is offline to avoid releasing this_cpu's rq->lock.

---

kernel/sched.c renamed from kernel/sched.c~sched-smt-cpu-hotplug-fix +2 -2
diff -puN kernel/sched.c~sched-smt-cpu-hotplug-fix kernel/sched.c
@@ -2502,7 +2502,7 @@ static inline void wake_sleeping_depende
 	cpumask_t sibling_map;
 	int i;
 
-	if (!(sd->flags & SD_SHARE_CPUPOWER))
+	if (!(sd->flags & SD_SHARE_CPUPOWER) || cpu_is_offline(this_cpu))
 		return;
 
 	/*
@@ -2549,7 +2549,7 @@ static inline int dependent_sleeper(int 
 	int ret = 0, i;
 	task_t *p;
 
-	if (!(sd->flags & SD_SHARE_CPUPOWER))
+	if (!(sd->flags & SD_SHARE_CPUPOWER) || cpu_is_offline(this_cpu))
 		return 0;
 
 	/*

_

#1 lore raw

kernel/sched.c static inline void wake_sleeping_depende

Quoted 13 lines · Nathan Lynch

To recap, offlining a cpu with current bk results in the "Aiee, killing interrupt handler!" panic from do_exit(). This seems to be triggered only with CONFIG_PREEMPT and CONFIG_SCHED_SMT both enabled. I believe the problem is that when do_stop() calls schedule(), dependent_sleeper() drops the "offline" cpu's rq->lock and never reacquires it.

The following seems to work (tested on ppc64). Is there a better way?

kernel/sched.c renamed from kernel/sched.c~sched-smt-cpu-hotplug-fix +2 -1
-	if (!(sd->flags & SD_SHARE_CPUPOWER))
+	if (!(sd->flags & SD_SHARE_CPUPOWER) || cpu_is_offline(this_cpu))
 
+	if (!(sd->flags & SD_SHARE_CPUPOWER) || cpu_is_offline(this_cpu))

it would really be nice to do this without any runtime overhead. Rusty?

Ingo

#2 lore raw
Quoted 9 lines · Ingo Molnar
Quoted 7 lines · Nathan Lynch

To recap, offlining a cpu with current bk results in the "Aiee, killing interrupt handler!" panic from do_exit(). This seems to be triggered only with CONFIG_PREEMPT and CONFIG_SCHED_SMT both enabled. I believe the problem is that when do_stop() calls schedule(), dependent_sleeper() drops the "offline" cpu's rq->lock and never reacquires it.

Quoted 8 lines

kernel/sched.c static inline void wake_sleeping_depende

Quoted 6 lines

The following seems to work (tested on ppc64). Is there a better way?

kernel/sched.c renamed from kernel/sched.c~sched-smt-cpu-hotplug-fix +2 -1
-	if (!(sd->flags & SD_SHARE_CPUPOWER))
+	if (!(sd->flags & SD_SHARE_CPUPOWER) || cpu_is_offline(this_cpu))
 
+	if (!(sd->flags & SD_SHARE_CPUPOWER) || cpu_is_offline(this_cpu))

it would really be nice to do this without any runtime overhead. Rusty?

If the scheduling topology is updated atomically (ie. inside __cpu_disable), this would not happen; there are patches around to do this and I think longer term this is the correct fix. However, I believe a good current fix is to merely ensure that the current cpu is always set in dependent_sleeper(), something like:L

	/*
	 * The same locking rules and details apply as for
	 * wake_sleeping_dependent():
	 */
	spin_unlock(&this_rq->lock);
	cpus_and(sibling_map, sd->span, cpu_online_map);
+	/* Include this CPU, for special case of going us dying */
+	cpu_set(this_cpu, sibling_map);
	for_each_cpu_mask(i, sibling_map)
		spin_lock(&cpu_rq(i)->lock);
	cpu_clear(this_cpu, sibling_map);

Not quite free, but very cheap...
Rusty.

Signature · 1 line
Anyone who quotes me in their signature is an idiot -- Rusty Russell