sched: More sched_domain iterations fixes (cd4ae6ad) · Commits · 戴 / test

kernel/sched_rt.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -1263,6 +1263,7 @@ static int find_lowest_rq(struct task_struct *task)
		if (!cpumask_test_cpu(this_cpu, lowest_mask))
		this_cpu = -1; /* Skip this_cpu opt if not among lowest */

		rcu_read_lock();
		for_each_domain(cpu, sd) {
		if (sd->flags & SD_WAKE_AFFINE) {
		int best_cpu;
		@@ -1272,15 +1273,20 @@ static int find_lowest_rq(struct task_struct *task)
		* remote processor.
		*/
		if (this_cpu != -1 &&
		cpumask_test_cpu(this_cpu, sched_domain_span(sd)))
		cpumask_test_cpu(this_cpu, sched_domain_span(sd))) {
		rcu_read_unlock();
		return this_cpu;
		}

		best_cpu = cpumask_first_and(lowest_mask,
		sched_domain_span(sd));
		if (best_cpu < nr_cpu_ids)
		if (best_cpu < nr_cpu_ids) {
		rcu_read_unlock();
		return best_cpu;
		}
		}
		}
		rcu_read_unlock();

		/*
		* And finally, if there were no matches within the domains

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ static int show_schedstat(struct seq_file seq, void v)

		#ifdef CONFIG_SMP
		/* domain-specific stats */
		preempt_disable();
		rcu_read_lock();
		for_each_domain(cpu, sd) {
		enum cpu_idle_type itype;

		@@ -64,7 +64,7 @@ static int show_schedstat(struct seq_file seq, void v)
		sd->ttwu_wake_remote, sd->ttwu_move_affine,
		sd->ttwu_move_balance);
		}
		preempt_enable();
		rcu_read_unlock();
		#endif
		}
		kfree(mask_str);