diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2016-03-30 10:05:29 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-03-30 10:05:29 +1100 |
commit | 87f08302d8ea1187eae4d83c00b4d59d60ff1289 (patch) | |
tree | fcfc884b45e423052e736f117e6ca37dc2044225 | |
parent | ddd63f27863cf9023976bc7efa00828153faab7f (diff) | |
download | linux-87f08302d8ea1187eae4d83c00b4d59d60ff1289.tar.gz linux-87f08302d8ea1187eae4d83c00b4d59d60ff1289.tar.xz |
mm-oom-rework-oom-detection-checkpatch-fixes
Cc: David Rientjes <rientjes@google.com>
WARNING: line over 80 characters
#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
#129: FILE: mm/page_alloc.c:2995:
+ * Keep reclaiming pages while there is a chance this will lead somewhere.
WARNING: line over 80 characters
#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
#138: FILE: mm/page_alloc.c:3004:
+ available -= DIV_ROUND_UP(no_progress_loops * available, MAX_RECLAIM_RETRIES);
WARNING: line over 80 characters
#142: FILE: mm/page_alloc.c:3008:
+ * Would the allocation succeed if we reclaimed the whole available?
WARNING: line over 80 characters
#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 <rientjes@google.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r-- | mm/page_alloc.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 757322064a9b..b6b272fb00bf 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3122,7 +3122,8 @@ static inline bool is_thp_gfp_mask(gfp_t gfp_mask) * the last reclaim round), pages_reclaimed (cumulative number of reclaimed * pages) 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). + * zone list (with a backoff mechanism which is a function of + * no_progress_loops). * * Returns true if a retry is viable or false to enter the oom path. */ @@ -3152,24 +3153,27 @@ should_reclaim_retry(gfp_t gfp_mask, unsigned order, } /* - * Keep reclaiming pages while there is a chance this will lead somewhere. - * If none of the target zones can satisfy our allocation request even - * if all reclaimable pages are considered then we are screwed and have - * to go OOM. + * Keep reclaiming pages while there is a chance this will lead + * somewhere. If none of the target zones can satisfy our allocation + * request even if all reclaimable pages are considered then we are + * screwed and have to go OOM. */ - for_each_zone_zonelist_nodemask(zone, z, ac->zonelist, ac->high_zoneidx, ac->nodemask) { + for_each_zone_zonelist_nodemask(zone, z, ac->zonelist, + ac->high_zoneidx, ac->nodemask) { unsigned long available; available = zone_reclaimable_pages(zone); - available -= DIV_ROUND_UP(no_progress_loops * available, MAX_RECLAIM_RETRIES); + available -= DIV_ROUND_UP(no_progress_loops * available, + MAX_RECLAIM_RETRIES); 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 the whole + * available? */ if (__zone_watermark_ok(zone, order, min_wmark_pages(zone), ac->high_zoneidx, alloc_flags, available)) { - /* Wait for some write requests to complete then retry */ + /* Wait for some writes to complete then retry */ wait_iff_congested(zone, BLK_RW_ASYNC, HZ/50); return true; } |