Skip to contentSkip to conversation

sched/deadline: support dl task migration during cpu hotplug

RFC PATCH Superseded Wanpeng Li 3 participants 3 messages Nov 6, 2014 – Nov 11, 2014 Scheduler

v3 of 14 Superseded Latest is v14 →

lore
Share & tools
lore

Wanpeng Li

author
#0 lore raw

RFC PATCH v3 1/1 sched/deadline: support dl task migration during cpu hotplug

I observe that dl task can't be migrated to other cpus during cpu hotplug, in addition, task may/may not be running again if cpu is added back. The root cause which I found is that dl task will be throtted and removed from dl rq after comsuming all budget, which leads to stop task can't pick it up from dl rq and migrate to other cpus during hotplug.

The method to reproduce:
schedtool -E -t 50000:100000 -e ./test
Actually test is just a simple for loop. Then observe which cpu the test task is on.
echo 0 > /sys/devices/system/cpu/cpuN/online

This patch fix it by push the task to another cpu in dl_task_timer() if rq is offline.

---
v2 -> v3:
* don't get_task_struct
* if cannot preempt any rq, fallback to pick any online cpus
* use cpu_active_mask as original later_mask if cpu is offline
v1 -> v2:
* push the task to another cpu in dl_task_timer() if rq is offline.

 kernel/sched/deadline.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)
kernel/sched/deadline.c +48 -3
index f3d7776..b1660c8 100644
@@ -487,6 +487,7 @@ static int start_dl_timer(struct sched_dl_entity *dl_se, bool boosted)
 	return hrtimer_active(&dl_se->dl_timer);
 }
 
+static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq);
 /*
  * This is the bandwidth enforcement timer callback. If here, we know
  * a task is not on its dl_rq, since the fact that the timer was running
@@ -538,6 +539,46 @@ again:
 	update_rq_clock(rq);
 	dl_se->dl_throttled = 0;
 	dl_se->dl_yielded = 0;
+
+	/*
+	 * So if we find that the rq the task was on is no longer
+	 * available, we need to select a new rq.
+	 */
+	if (!rq->online) {
+		struct rq *later_rq = NULL;
+
+		raw_spin_unlock(&rq->lock);
+
+		later_rq = find_lock_later_rq(p, rq);
+
+		if (!later_rq) {
+			int cpu;
+
+			/*
+			 * If cannot preempt any rq, fallback to pick any
+			 * online cpu.
+			 */
+			for_each_cpu(cpu, &p->cpus_allowed)
+				if (cpu_online(cpu))
+					later_rq = cpu_rq(cpu);
+			if (!later_rq) {
+				pr_warn("fail to find any online and task
+						will never come back to us\n");
+				goto out;
+			}
+		}
+
+		deactivate_task(rq, p, 0);
+		set_task_cpu(p, later_rq->cpu);
+		activate_task(later_rq, p, 0);
+
+		resched_curr(later_rq);
+
+		double_unlock_balance(rq, later_rq);
+
+		goto out;
+	}
+
 	if (task_on_rq_queued(p)) {
 		enqueue_task_dl(rq, p, ENQUEUE_REPLENISH);
 		if (dl_task(rq->curr))
@@ -555,7 +596,7 @@ again:
 	}
 unlock:
 	raw_spin_unlock(&rq->lock);
-
+out:
 	return HRTIMER_NORESTART;
 }
 
@@ -1185,8 +1226,12 @@ static int find_later_rq(struct task_struct *task)
 	 * We have to consider system topology and task affinity
 	 * first, then we can look for a suitable cpu.
 	 */
-	cpumask_copy(later_mask, task_rq(task)->rd->span);
-	cpumask_and(later_mask, later_mask, cpu_active_mask);
+	if (likely(task_rq(task)->online)) {
+		cpumask_copy(later_mask, task_rq(task)->rd->span);
+		cpumask_and(later_mask, later_mask, cpu_active_mask);
+	} else
+		/* for offline cpus we have a singleton rd */
+		cpumask_copy(later_mask, cpu_active_mask);
 	cpumask_and(later_mask, later_mask, &task->cpus_allowed);
 	best_cpu = cpudl_find(&task_rq(task)->rd->cpudl,
 			task, later_mask);
Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 16 lines · Wanpeng Li
kernel/sched/deadline.c +12 -0
@@ -538,6 +539,46 @@ again:
 	update_rq_clock(rq);
 	dl_se->dl_throttled = 0;
 	dl_se->dl_yielded = 0;
+
+	/*
+	 * So if we find that the rq the task was on is no longer
+	 * available, we need to select a new rq.
+	 */
+	if (!rq->online) {
+		struct rq *later_rq = NULL;
+
+		raw_spin_unlock(&rq->lock);
+
+		later_rq = find_lock_later_rq(p, rq);
+

kernel/sched/deadline.c again: · line 563

Quoted 10 lines
kernel/sched/deadline.c +10 -0
+		if (!later_rq) {
+			int cpu;
+
+			/*
+			 * If cannot preempt any rq, fallback to pick any
+			 * online cpu.
+			 */
+			for_each_cpu(cpu, &p->cpus_allowed)
+				if (cpu_online(cpu))
+					later_rq = cpu_rq(cpu);
			cpu = cpumask_any_and(cpu_active_mask, tsk_cpus_allowed(p));
			if (cpu >= nr_cpu_ids)
				/* fail */

			later_rq = cpu_rq(cpu);
Quoted 35 lines
kernel/sched/deadline.c +19 -2
+			if (!later_rq) {
+				pr_warn("fail to find any online and task
+						will never come back to us\n");
+				goto out;
+			}
+		}
+
+		deactivate_task(rq, p, 0);
+		set_task_cpu(p, later_rq->cpu);
+		activate_task(later_rq, p, 0);
+
+		resched_curr(later_rq);
+
+		double_unlock_balance(rq, later_rq);
+
+		goto out;
+	}
+
 	if (task_on_rq_queued(p)) {
 		enqueue_task_dl(rq, p, ENQUEUE_REPLENISH);
 		if (dl_task(rq->curr))
@@ -555,7 +596,7 @@ again:
 	}
 unlock:
 	raw_spin_unlock(&rq->lock);
-
+out:
 	return HRTIMER_NORESTART;
 }
 
@@ -1185,8 +1226,12 @@ static int find_later_rq(struct task_struct *task)
 	 * We have to consider system topology and task affinity
 	 * first, then we can look for a suitable cpu.
 	 */
-	cpumask_copy(later_mask, task_rq(task)->rd->span);

kernel/sched/deadline.c static int find_later_rq(struct task_struct *task) · line 1237

Quoted 10 lines
kernel/sched/deadline.c +6 -1
-	cpumask_and(later_mask, later_mask, cpu_active_mask);
+	if (likely(task_rq(task)->online)) {
+		cpumask_copy(later_mask, task_rq(task)->rd->span);
+		cpumask_and(later_mask, later_mask, cpu_active_mask);
+	} else
+		/* for offline cpus we have a singleton rd */
+		cpumask_copy(later_mask, cpu_active_mask);
 	cpumask_and(later_mask, later_mask, &task->cpus_allowed);
 	best_cpu = cpudl_find(&task_rq(task)->rd->cpudl,
 			task, later_mask);
	cpumask_copy(later_mask, cpu_active_mask);
	if (likely(task_rq(task)->online))
		cpumask_and(later_mask, later_mask, task_rq(task)->rd->span);

Is the same, right and less lines.

#2 lore raw

Hi Peter,

Quoted 24 lines · Peter Zijlstra
Quoted 23 lines · Wanpeng Li
kernel/sched/deadline.c +19 -0
@@ -538,6 +539,46 @@ again:
  	update_rq_clock(rq);
  	dl_se->dl_throttled = 0;
  	dl_se->dl_yielded = 0;
+
+	/*
+	 * So if we find that the rq the task was on is no longer
+	 * available, we need to select a new rq.
+	 */
+	if (!rq->online) {
+		struct rq *later_rq = NULL;
+
+		raw_spin_unlock(&rq->lock);
+
+		later_rq = find_lock_later_rq(p, rq);
+
+		if (!later_rq) {
+			int cpu;
+
+			/*
+			 * If cannot preempt any rq, fallback to pick any
+			 * online cpu.
+			 */
Quoted 8 lines

kernel/sched/deadline.c again: · line 563

Quoted 3 lines
kernel/sched/deadline.c +3 -0
+			for_each_cpu(cpu, &p->cpus_allowed)
+				if (cpu_online(cpu))
+					later_rq = cpu_rq(cpu);
			cpu = cpumask_any_and(cpu_active_mask, tsk_cpus_allowed(p));
			if (cpu >= nr_cpu_ids)
				/* fail */

			later_rq = cpu_rq(cpu);

Ok.

Quoted 49 lines
Quoted 35 lines
kernel/sched/deadline.c +19 -2
+			if (!later_rq) {
+				pr_warn("fail to find any online and task
+						will never come back to us\n");
+				goto out;
+			}
+		}
+
+		deactivate_task(rq, p, 0);
+		set_task_cpu(p, later_rq->cpu);
+		activate_task(later_rq, p, 0);
+
+		resched_curr(later_rq);
+
+		double_unlock_balance(rq, later_rq);
+
+		goto out;
+	}
+
  	if (task_on_rq_queued(p)) {
  		enqueue_task_dl(rq, p, ENQUEUE_REPLENISH);
  		if (dl_task(rq->curr))
@@ -555,7 +596,7 @@ again:
  	}
  unlock:
  	raw_spin_unlock(&rq->lock);
-
+out:
  	return HRTIMER_NORESTART;
  }
 
@@ -1185,8 +1226,12 @@ static int find_later_rq(struct task_struct *task)
  	 * We have to consider system topology and task affinity
  	 * first, then we can look for a suitable cpu.
  	 */
-	cpumask_copy(later_mask, task_rq(task)->rd->span);

kernel/sched/deadline.c static int find_later_rq(struct task_struct *task) · line 1237

Quoted 10 lines
kernel/sched/deadline.c +6 -1
-	cpumask_and(later_mask, later_mask, cpu_active_mask);
+	if (likely(task_rq(task)->online)) {
+		cpumask_copy(later_mask, task_rq(task)->rd->span);
+		cpumask_and(later_mask, later_mask, cpu_active_mask);
+	} else
+		/* for offline cpus we have a singleton rd */
+		cpumask_copy(later_mask, cpu_active_mask);
  	cpumask_and(later_mask, later_mask, &task->cpus_allowed);
  	best_cpu = cpudl_find(&task_rq(task)->rd->cpudl,
  			task, later_mask);
	cpumask_copy(later_mask, cpu_active_mask);
	if (likely(task_rq(task)->online))
		cpumask_and(later_mask, later_mask, task_rq(task)->rd->span);
Quoted 1 line

Is the same, right and less lines.

Thanks for your great help! I will fold these to my patch and send out a newer version tomorrow. ;-)

Regards,
Wanpeng Li

Quoted 6 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/