|
@@ -3515,11 +3515,10 @@ bool gfp_pfmemalloc_allowed(gfp_t gfp_mask)
|
|
/*
|
|
/*
|
|
* Checks whether it makes sense to retry the reclaim to make a forward progress
|
|
* Checks whether it makes sense to retry the reclaim to make a forward progress
|
|
* for the given allocation request.
|
|
* for the given allocation request.
|
|
- * The reclaim feedback represented by did_some_progress (any progress during
|
|
|
|
- * the last reclaim round) and no_progress_loops (number of reclaim rounds without
|
|
|
|
- * any progress in a row) is considered as well as the reclaimable pages on the
|
|
|
|
- * applicable zone list (with a backoff mechanism which is a function of
|
|
|
|
- * no_progress_loops).
|
|
|
|
|
|
+ *
|
|
|
|
+ * We give up when we either have tried MAX_RECLAIM_RETRIES in a row
|
|
|
|
+ * without success, or when we couldn't even meet the watermark if we
|
|
|
|
+ * reclaimed all remaining pages on the LRU lists.
|
|
*
|
|
*
|
|
* Returns true if a retry is viable or false to enter the oom path.
|
|
* Returns true if a retry is viable or false to enter the oom path.
|
|
*/
|
|
*/
|
|
@@ -3564,13 +3563,11 @@ should_reclaim_retry(gfp_t gfp_mask, unsigned order,
|
|
bool wmark;
|
|
bool wmark;
|
|
|
|
|
|
available = reclaimable = zone_reclaimable_pages(zone);
|
|
available = reclaimable = zone_reclaimable_pages(zone);
|
|
- available -= DIV_ROUND_UP((*no_progress_loops) * available,
|
|
|
|
- MAX_RECLAIM_RETRIES);
|
|
|
|
available += zone_page_state_snapshot(zone, NR_FREE_PAGES);
|
|
available += zone_page_state_snapshot(zone, NR_FREE_PAGES);
|
|
|
|
|
|
/*
|
|
/*
|
|
- * Would the allocation succeed if we reclaimed the whole
|
|
|
|
- * available?
|
|
|
|
|
|
+ * Would the allocation succeed if we reclaimed all
|
|
|
|
+ * reclaimable pages?
|
|
*/
|
|
*/
|
|
wmark = __zone_watermark_ok(zone, order, min_wmark,
|
|
wmark = __zone_watermark_ok(zone, order, min_wmark,
|
|
ac_classzone_idx(ac), alloc_flags, available);
|
|
ac_classzone_idx(ac), alloc_flags, available);
|