Zone specific allocations, such as GFP_DMA32, should not be restricted
to cpusets allowed node list: the zones which such allocations demand
might be contained in particular nodes outside the cpuset node list.
The alternative would be to not perform such allocations from
applications which are cpuset restricted, which is unrealistic.
Fixes KVM's alloc_page(gfp_mask=GFP_DMA32) with cpuset as explained.
Signed-off-by: Marcelo Tosatti <mtosa...@redhat.com>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5dba293..f228039 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2698,6 +2698,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
unsigned int cpuset_mems_cookie;
int alloc_flags = ALLOC_WMARK_LOW|ALLOC_CPUSET|ALLOC_FAIR;
struct mem_cgroup *memcg = NULL;
+ nodemask_t *cpuset_mems_allowed = &cpuset_current_mems_allowed;
gfp_mask &= gfp_allowed_mask;
@@ -2726,9 +2727,14 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int
order,
retry_cpuset:
cpuset_mems_cookie = read_mems_allowed_begin();
+#ifdef CONFIG_NUMA
+ if (gfp_zone(gfp_mask) < policy_zone)
+ cpuset_mems_allowed = NULL;
+#endif
+
/* The preferred zone is used for statistics later */
first_zones_zonelist(zonelist, high_zoneidx,
- nodemask ? : &cpuset_current_mems_allowed,
+ nodemask ? : cpuset_mems_allowed,
&preferred_zone);
if (!preferred_zone)
goto out;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
