Commit a41f24ea9fd6169b147c53c2392e2887cc1d9247

Authored by Nishanth Aravamudan
Committed by Linus Torvalds
1 parent ab857d0938

page allocator: smarter retry of costly-order allocations

Because of page order checks in __alloc_pages(), hugepage (and similarly
large order) allocations will not retry unless explicitly marked
__GFP_REPEAT. However, the current retry logic is nearly an infinite
loop (or until reclaim does no progress whatsoever). For these costly
allocations, that seems like overkill and could potentially never
terminate. Mel observed that allowing current __GFP_REPEAT semantics for
hugepage allocations essentially killed the system. I believe this is
because we may continue to reclaim small orders of pages all over, but
never have enough to satisfy the hugepage allocation request. This is
clearly only a problem for large order allocations, of which hugepages
are the most obvious (to me).

Modify try_to_free_pages() to indicate how many pages were reclaimed.
Use that information in __alloc_pages() to eventually fail a large
__GFP_REPEAT allocation when we've reclaimed an order of pages equal to
or greater than the allocation's order. This relies on lumpy reclaim
functioning as advertised. Due to fragmentation, lumpy reclaim may not
be able to free up the order needed in one invocation, so multiple
iterations may be requred. In other words, the more fragmented memory
is, the more retry attempts __GFP_REPEAT will make (particularly for
higher order allocations).

This changes the semantics of __GFP_REPEAT subtly, but *only* for
allocations > PAGE_ALLOC_COSTLY_ORDER. With this patch, for those size
allocations, we will try up to some point (at least 1<<order reclaimed
pages), rather than forever (which is the case for allocations <=
PAGE_ALLOC_COSTLY_ORDER).

This change improves the /proc/sys/vm/nr_hugepages interface with a
follow-on patch that makes pool allocations use __GFP_REPEAT. Rather
than administrators repeatedly echo'ing a particular value into the
sysctl, and forcing reclaim into action manually, this change allows for
the sysctl to attempt a reasonable effort itself. Similarly, dynamic
pool growth should be more successful under load, as lumpy reclaim can
try to free up pages, rather than failing right away.

Choosing to reclaim only up to the order of the requested allocation
strikes a balance between not failing hugepage allocations and returning
to the caller when it's unlikely to every succeed. Because of lumpy
reclaim, if we have freed the order requested, hopefully it has been in
big chunks and those chunks will allow our allocation to succeed. If
that isn't the case after freeing up the current order, I don't think it
is likely to succeed in the future, although it is possible given a
particular fragmentation pattern.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Tested-by: Mel Gorman <mel@csn.ul.ie>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 22 additions and 7 deletions Side-by-side Diff

... ... @@ -1461,7 +1461,8 @@
1461 1461 struct task_struct *p = current;
1462 1462 int do_retry;
1463 1463 int alloc_flags;
1464   - int did_some_progress;
  1464 + unsigned long did_some_progress;
  1465 + unsigned long pages_reclaimed = 0;
1465 1466  
1466 1467 might_sleep_if(wait);
1467 1468  
1468 1469  
1469 1470  
1470 1471  
1471 1472  
... ... @@ -1611,15 +1612,26 @@
1611 1612 * Don't let big-order allocations loop unless the caller explicitly
1612 1613 * requests that. Wait for some write requests to complete then retry.
1613 1614 *
1614   - * In this implementation, either order <= PAGE_ALLOC_COSTLY_ORDER or
1615   - * __GFP_REPEAT mean __GFP_NOFAIL, but that may not be true in other
  1615 + * In this implementation, order <= PAGE_ALLOC_COSTLY_ORDER
  1616 + * means __GFP_NOFAIL, but that may not be true in other
1616 1617 * implementations.
  1618 + *
  1619 + * For order > PAGE_ALLOC_COSTLY_ORDER, if __GFP_REPEAT is
  1620 + * specified, then we retry until we no longer reclaim any pages
  1621 + * (above), or we've reclaimed an order of pages at least as
  1622 + * large as the allocation's order. In both cases, if the
  1623 + * allocation still fails, we stop retrying.
1617 1624 */
  1625 + pages_reclaimed += did_some_progress;
1618 1626 do_retry = 0;
1619 1627 if (!(gfp_mask & __GFP_NORETRY)) {
1620   - if ((order <= PAGE_ALLOC_COSTLY_ORDER) ||
1621   - (gfp_mask & __GFP_REPEAT))
  1628 + if (order <= PAGE_ALLOC_COSTLY_ORDER) {
1622 1629 do_retry = 1;
  1630 + } else {
  1631 + if (gfp_mask & __GFP_REPEAT &&
  1632 + pages_reclaimed < (1 << order))
  1633 + do_retry = 1;
  1634 + }
1623 1635 if (gfp_mask & __GFP_NOFAIL)
1624 1636 do_retry = 1;
1625 1637 }
... ... @@ -1299,6 +1299,9 @@
1299 1299 * hope that some of these pages can be written. But if the allocating task
1300 1300 * holds filesystem locks which prevent writeout this might not work, and the
1301 1301 * allocation attempt will fail.
  1302 + *
  1303 + * returns: 0, if no pages reclaimed
  1304 + * else, the number of pages reclaimed
1302 1305 */
1303 1306 static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
1304 1307 struct scan_control *sc)
... ... @@ -1347,7 +1350,7 @@
1347 1350 }
1348 1351 total_scanned += sc->nr_scanned;
1349 1352 if (nr_reclaimed >= sc->swap_cluster_max) {
1350   - ret = 1;
  1353 + ret = nr_reclaimed;
1351 1354 goto out;
1352 1355 }
1353 1356  
... ... @@ -1370,7 +1373,7 @@
1370 1373 }
1371 1374 /* top priority shrink_caches still had more to do? don't OOM, then */
1372 1375 if (!sc->all_unreclaimable && scan_global_lru(sc))
1373   - ret = 1;
  1376 + ret = nr_reclaimed;
1374 1377 out:
1375 1378 /*
1376 1379 * Now that we've scanned all the zones at this priority level, note