Skip to content

Commit 348ea79

Browse files
akpm00sfrothwell
authored andcommitted
mm-oom-rework-oom-detection-checkpatch-fixes
Cc: David Rientjes <[email protected]> WARNING: line over 80 characters torvalds#99: FILE: mm/page_alloc.c:2965: + * zone list (with a backoff mechanism which is a function of no_progress_loops). WARNING: line over 80 characters torvalds#129: FILE: mm/page_alloc.c:2995: + * Keep reclaiming pages while there is a chance this will lead somewhere. WARNING: line over 80 characters torvalds#134: FILE: mm/page_alloc.c:3000: + for_each_zone_zonelist_nodemask(zone, z, ac->zonelist, ac->high_zoneidx, ac->nodemask) { WARNING: line over 80 characters torvalds#138: FILE: mm/page_alloc.c:3004: + available -= DIV_ROUND_UP(no_progress_loops * available, MAX_RECLAIM_RETRIES); WARNING: line over 80 characters torvalds#142: FILE: mm/page_alloc.c:3008: + * Would the allocation succeed if we reclaimed the whole available? WARNING: line over 80 characters torvalds#146: FILE: mm/page_alloc.c:3012: + /* Wait for some write requests to complete then retry */ total: 0 errors, 6 warnings, 202 lines checked ./patches/mm-oom-rework-oom-detection.patch has style problems, please review. NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: David Rientjes <[email protected]> Cc: Hillf Danton <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: KAMEZAWA Hiroyuki <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Tetsuo Handa <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent f851a4e commit 348ea79

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

mm/page_alloc.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3007,7 +3007,8 @@ static inline bool is_thp_gfp_mask(gfp_t gfp_mask)
30073007
* the last reclaim round), pages_reclaimed (cumulative number of reclaimed
30083008
* pages) and no_progress_loops (number of reclaim rounds without any progress
30093009
* in a row) is considered as well as the reclaimable pages on the applicable
3010-
* zone list (with a backoff mechanism which is a function of no_progress_loops).
3010+
* zone list (with a backoff mechanism which is a function of
3011+
* no_progress_loops).
30113012
*
30123013
* Returns true if a retry is viable or false to enter the oom path.
30133014
*/
@@ -3037,24 +3038,27 @@ should_reclaim_retry(gfp_t gfp_mask, unsigned order,
30373038
}
30383039

30393040
/*
3040-
* Keep reclaiming pages while there is a chance this will lead somewhere.
3041-
* If none of the target zones can satisfy our allocation request even
3042-
* if all reclaimable pages are considered then we are screwed and have
3043-
* to go OOM.
3041+
* Keep reclaiming pages while there is a chance this will lead
3042+
* somewhere. If none of the target zones can satisfy our allocation
3043+
* request even if all reclaimable pages are considered then we are
3044+
* screwed and have to go OOM.
30443045
*/
3045-
for_each_zone_zonelist_nodemask(zone, z, ac->zonelist, ac->high_zoneidx, ac->nodemask) {
3046+
for_each_zone_zonelist_nodemask(zone, z, ac->zonelist,
3047+
ac->high_zoneidx, ac->nodemask) {
30463048
unsigned long available;
30473049

30483050
available = zone_reclaimable_pages(zone);
3049-
available -= DIV_ROUND_UP(no_progress_loops * available, MAX_RECLAIM_RETRIES);
3051+
available -= DIV_ROUND_UP(no_progress_loops * available,
3052+
MAX_RECLAIM_RETRIES);
30503053
available += zone_page_state_snapshot(zone, NR_FREE_PAGES);
30513054

30523055
/*
3053-
* Would the allocation succeed if we reclaimed the whole available?
3056+
* Would the allocation succeed if we reclaimed the whole
3057+
* available?
30543058
*/
30553059
if (__zone_watermark_ok(zone, order, min_wmark_pages(zone),
30563060
ac->high_zoneidx, alloc_flags, available)) {
3057-
/* Wait for some write requests to complete then retry */
3061+
/* Wait for some writes to complete then retry */
30583062
wait_iff_congested(zone, BLK_RW_ASYNC, HZ/50);
30593063
return true;
30603064
}

0 commit comments

Comments
 (0)