Commit d1db9fb4 authored by Yury Norov's avatar Yury Norov Committed by Ingo Molnar
Browse files

sched/fair: Fix open-coded numa_nearest_node() 



task_numa_placement() searches for a nearest node to migrate by calling
for_each_node_state(). Now that we have numa_nearest_node(), switch to
using it.

Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Mel Gorman <mgorman@suse.de>
Link: https://lore.kernel.org/r/20230819141239.287290-3-yury.norov@gmail.com
parent b1f099b1

kernel/sched/fair.c

+1 −13
Original line number Diff line number Diff line
@@ -2847,19 +2847,7 @@ static void task_numa_placement(struct task_struct *p) 
	}



	/* Cannot migrate task to CPU-less node */

	if (max_nid != NUMA_NO_NODE && !node_state(max_nid, N_CPU)) {

		int near_nid = max_nid;

		int distance, near_distance = INT_MAX;



		for_each_node_state(nid, N_CPU) {

			distance = node_distance(max_nid, nid);

			if (distance < near_distance) {

				near_nid = nid;

				near_distance = distance;

			}

		}

		max_nid = near_nid;

	}

	max_nid = numa_nearest_node(max_nid, N_CPU);



	if (ng) {

		numa_group_count_active_nodes(ng);