mm-page_alloc-add-same-penalty-is-enough-to-get-round-robin-order-v3

remove remove MAX_NODE_LOAD, per Vlastimil

Link: https://lkml.kernel.org/r/20220412001319.7462-1-richard.weiyang@gmail.com
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: Oscar Salvador <osalvador@suse.de>
Cc: David Rientjes <rientjes@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Krupa Ramakrishnan <krupa.ramakrishnan@amd.com>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 73a86a659ce58c3e63fe89197fa0a163cf79655b..296001d5d02d740fa29d40d0424c8e5d1d6ad9f7 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6173,7 +6173,6 @@ int numa_zonelist_order_handler(struct ctl_table *table, int write,
 }
 
 
-#define MAX_NODE_LOAD (nr_online_nodes)
 static int node_load[MAX_NUMNODES];
 
 /**
@@ -6220,7 +6219,7 @@ int find_next_best_node(int node, nodemask_t *used_node_mask)
                        val += PENALTY_FOR_NODE_WITH_CPUS;
 
                /* Slight preference for less loaded node */
-               val *= (MAX_NODE_LOAD*MAX_NUMNODES);
+               val *= MAX_NUMNODES;
                val += node_load[n];
 
                if (val < min_val) {
@@ -6303,7 +6302,7 @@ static void build_zonelists(pg_data_t *pgdat)
                 */
                if (node_distance(local_node, node) !=
                    node_distance(local_node, prev_node))
-                       node_load[node] += nr_online_nodes;
+                       node_load[node] += 1;
 
                node_order[nr_nodes++] = node;
                prev_node = node;