sched/core: Keep rq online after cpu isolation (a5e669b8) · Commits · e / devices / android_kernel_oneplus_sm8150

To move tasks off a cpu when offlining the rq needs to be offlined to un-throttle tasks. However, tasks might still run on the CPU even after the CPU has been isolated (per-CPU threads). Thus we should leave the rq in online state after tasks have been moved. Signed-off-by:

Olav Haugan <ohaugan@codeaurora.org> [markivx: Fix minor merge conflict] Signed-off-by:

Vikram Mulukutla <markivx@codeaurora.org> Change-Id: I9b1e0a21a22acea7c55b126fdbc20355697950a0 Signed-off-by:

Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>

kernel/sched/core.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -5691,12 +5691,18 @@ int do_isolation_work_cpu_stop(void *data)
		/* Update our root-domain */
		raw_spin_lock_irqsave(&rq->lock, flags);

		/*
		* Temporarily mark the rq as offline. This will allow us to
		* move tasks off the CPU.
		*/
		if (rq->rd) {
		BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
		set_rq_offline(rq);
		}

		migrate_tasks(rq, &rf, false);
		if (rq->rd)
		set_rq_online(rq);
		raw_spin_unlock_irqrestore(&rq->lock, flags);

		/*
		@@ -5850,10 +5856,6 @@ int sched_unisolate_cpu_unlocked(int cpu)

		raw_spin_lock_irqsave(&rq->lock, flags);
		rq->age_stamp = sched_clock_cpu(cpu);
		if (rq->rd) {
		BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
		set_rq_online(rq);
		}
		raw_spin_unlock_irqrestore(&rq->lock, flags);
		}