|
@@ -1616,6 +1616,21 @@ static void zlc_mark_zone_full(struct zonelist *zonelist, struct zoneref *z)
|
|
|
set_bit(i, zlc->fullzones);
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * clear all zones full, called after direct reclaim makes progress so that
|
|
|
+ * a zone that was recently full is not skipped over for up to a second
|
|
|
+ */
|
|
|
+static void zlc_clear_zones_full(struct zonelist *zonelist)
|
|
|
+{
|
|
|
+ struct zonelist_cache *zlc; /* cached zonelist speedup info */
|
|
|
+
|
|
|
+ zlc = zonelist->zlcache_ptr;
|
|
|
+ if (!zlc)
|
|
|
+ return;
|
|
|
+
|
|
|
+ bitmap_zero(zlc->fullzones, MAX_ZONES_PER_ZONELIST);
|
|
|
+}
|
|
|
+
|
|
|
#else /* CONFIG_NUMA */
|
|
|
|
|
|
static nodemask_t *zlc_setup(struct zonelist *zonelist, int alloc_flags)
|
|
@@ -1632,6 +1647,10 @@ static int zlc_zone_worth_trying(struct zonelist *zonelist, struct zoneref *z,
|
|
|
static void zlc_mark_zone_full(struct zonelist *zonelist, struct zoneref *z)
|
|
|
{
|
|
|
}
|
|
|
+
|
|
|
+static void zlc_clear_zones_full(struct zonelist *zonelist)
|
|
|
+{
|
|
|
+}
|
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
|
|
/*
|
|
@@ -1963,6 +1982,10 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order,
|
|
|
if (unlikely(!(*did_some_progress)))
|
|
|
return NULL;
|
|
|
|
|
|
+ /* After successful reclaim, reconsider all zones for allocation */
|
|
|
+ if (NUMA_BUILD)
|
|
|
+ zlc_clear_zones_full(zonelist);
|
|
|
+
|
|
|
retry:
|
|
|
page = get_page_from_freelist(gfp_mask, nodemask, order,
|
|
|
zonelist, high_zoneidx,
|