Memoryless nodes: Add N_CPU node state

We need the check for a node with cpu in zone reclaim.  Zone reclaim will not
allow remote zone reclaim if a node has a cpu.

[[email protected]: Move setup of N_CPU node state mask]
Signed-off-by: Christoph Lameter <[email protected]>
Tested-by:  Lee Schermerhorn <[email protected]>
Acked-by: Bob Picco <[email protected]>
Cc: Nishanth Aravamudan <[email protected]>
Cc: KAMEZAWA Hiroyuki <[email protected]>
Cc: Mel Gorman <[email protected]>
Signed-off-by: Lee Schermerhorn <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index ccee962f3559b6e97e7e8243439091dc2b9e080d..905e18f4b4122cdb7de8678766e4dada26e0b807 100644 (file)
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -349,6 +349,7 @@ enum node_states {
 #else
        N_HIGH_MEMORY = N_NORMAL_MEMORY,
 #endif
+       N_CPU,          /* The node has one or more cpus */
        NR_NODE_STATES
 };
 

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 07dfd89992fa6d0ee90cf0ca6646a43d7dd926e2..161bcb711b306ac6a843d6f3f4f29f08de43c86f 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2353,6 +2353,9 @@ static struct per_cpu_pageset boot_pageset[NR_CPUS];
 static int __cpuinit process_zones(int cpu)
 {
        struct zone *zone, *dzone;
+       int node = cpu_to_node(cpu);
+
+       node_set_state(node, N_CPU);    /* this node has a cpu */
 
        for_each_zone(zone) {
 
@@ -2360,7 +2363,7 @@ static int __cpuinit process_zones(int cpu)
                        continue;
 
                zone_pcp(zone, cpu) = kmalloc_node(sizeof(struct per_cpu_pageset),
-                                        GFP_KERNEL, cpu_to_node(cpu));
+                                        GFP_KERNEL, node);
                if (!zone_pcp(zone, cpu))
                        goto bad;
 

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 876568847b7175c4896e9e328c82e68321603f88..8fd8ba1c67b4f7f184d1bf091fd8d53a185de980 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1853,7 +1853,6 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
 
 int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
 {
-       cpumask_t mask;
        int node_id;
 
        /*
@@ -1890,8 +1889,7 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
         * as wide as possible.
         */
        node_id = zone_to_nid(zone);
-       mask = node_to_cpumask(node_id);
-       if (!cpus_empty(mask) && node_id != numa_node_id())
+       if (node_state(node_id, N_CPU) && node_id != numa_node_id())
                return 0;
        return __zone_reclaim(zone, gfp_mask, order);
 }