Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c186fafe authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched: Clean up remnants of sd_idle 



With the wholesale removal of the sd_idle SMT logic we can clean up
some more.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Nikhil Rao <ncrao@google.com>
Cc: Venkatesh Pallipadi <venki@google.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d927dc93

kernel/sched_fair.c

+10 −13
Original line number Diff line number Diff line
@@ -3150,16 +3150,7 @@ find_busiest_group(struct sched_domain *sd, int this_cpu, 
	if (sds.this_load >= sds.avg_load)

		goto out_balanced;



	/*

	 * In the CPU_NEWLY_IDLE, use imbalance_pct to be conservative.

	 * And to check for busy balance use !idle_cpu instead of

	 * CPU_NOT_IDLE. This is because HT siblings will use CPU_NOT_IDLE

	 * even when they are idle.

	 */

	if (idle == CPU_NEWLY_IDLE || !idle_cpu(this_cpu)) {

		if (100 * sds.max_load <= sd->imbalance_pct * sds.this_load)

			goto out_balanced;

	} else {

	if (idle == CPU_IDLE) {

		/*

		 * This cpu is idle. If the busiest group load doesn't

		 * have more tasks than the number of available cpu's and
@@ -3169,6 +3160,13 @@ find_busiest_group(struct sched_domain *sd, int this_cpu, 
		if ((sds.this_idle_cpus <= sds.busiest_idle_cpus + 1) &&

		    sds.busiest_nr_running <= sds.busiest_group_weight)

			goto out_balanced;

	} else {

		/*

		 * In the CPU_NEWLY_IDLE, CPU_NOT_IDLE cases, use

		 * imbalance_pct to be conservative.

		 */

		if (100 * sds.max_load <= sd->imbalance_pct * sds.this_load)

			goto out_balanced;

	}



force_balance:
@@ -3862,8 +3860,7 @@ static void rebalance_domains(int cpu, enum cpu_idle_type idle) 
			if (load_balance(cpu, rq, sd, idle, &balance)) {

				/*

				 * We've pulled tasks over so either we're no

				 * longer idle, or one of our SMT siblings is

				 * not idle.

				 * longer idle.

				 */

				idle = CPU_NOT_IDLE;

			}