Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-17 18:36:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm: compaction: have compaction_suitable() return bool

Browse Source 
Since it only returns COMPACT_CONTINUE or COMPACT_SKIPPED now, a bool
return value simplifies the callsites.

Link: https://lkml.kernel.org/r/20230602151204.GD161817@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Suggested-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Johannes Weiner 2023-06-02 11:12:04 -04:00 committed by Andrew Morton
parent 1c9568e806
commit 3cf0493752
3 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/compaction.h
View File

@ -89,7 +89,7 @@ extern enum compact_result try_to_compact_pages(gfp_t gfp_mask,
const struct alloc_context *ac, enum compact_priority prio, const struct alloc_context *ac, enum compact_priority prio,
struct page **page); struct page **page);
extern void reset_isolation_suitable(pg_data_t *pgdat); extern void reset_isolation_suitable(pg_data_t *pgdat);
extern enum compact_result compaction_suitable(struct zone *zone, int order, extern bool compaction_suitable(struct zone *zone, int order,
int highest_zoneidx); int highest_zoneidx);
extern void compaction_defer_reset(struct zone *zone, int order, extern void compaction_defer_reset(struct zone *zone, int order,
@ -107,10 +107,10 @@ static inline void reset_isolation_suitable(pg_data_t *pgdat)
{ {
} }
static inline enum compact_result compaction_suitable(struct zone *zone, int order, static inline bool compaction_suitable(struct zone *zone, int order,
int highest_zoneidx) int highest_zoneidx)
{ {
return COMPACT_SKIPPED; return false;
} }
static inline void kcompactd_run(int nid) static inline void kcompactd_run(int nid)

64
mm/compaction.c
View File

@ -2193,9 +2193,9 @@ static enum compact_result compact_finished(struct compact_control *cc)
return ret; return ret;
} }
static enum compact_result __compaction_suitable(struct zone *zone, int order, static bool __compaction_suitable(struct zone *zone, int order,
int highest_zoneidx, int highest_zoneidx,
unsigned long wmark_target) unsigned long wmark_target)
{ {
unsigned long watermark; unsigned long watermark;
/* /*
@ -2215,27 +2215,20 @@ static enum compact_result __compaction_suitable(struct zone *zone, int order,
watermark = (order > PAGE_ALLOC_COSTLY_ORDER) ? watermark = (order > PAGE_ALLOC_COSTLY_ORDER) ?
low_wmark_pages(zone) : min_wmark_pages(zone); low_wmark_pages(zone) : min_wmark_pages(zone);
watermark += compact_gap(order); watermark += compact_gap(order);
if (!__zone_watermark_ok(zone, 0, watermark, highest_zoneidx, return __zone_watermark_ok(zone, 0, watermark, highest_zoneidx,
ALLOC_CMA, wmark_target)) ALLOC_CMA, wmark_target);
return COMPACT_SKIPPED;
return COMPACT_CONTINUE;
} }
/* /*
* compaction_suitable: Is this suitable to run compaction on this zone now? * compaction_suitable: Is this suitable to run compaction on this zone now?
* Returns
* COMPACT_SKIPPED - If there are too few free pages for compaction
* COMPACT_CONTINUE - If compaction should run now
*/ */
enum compact_result compaction_suitable(struct zone *zone, int order, bool compaction_suitable(struct zone *zone, int order, int highest_zoneidx)
int highest_zoneidx)
{ {
enum compact_result ret; enum compact_result compact_result;
int fragindex; bool suitable;
ret = __compaction_suitable(zone, order, highest_zoneidx, suitable = __compaction_suitable(zone, order, highest_zoneidx,
zone_page_state(zone, NR_FREE_PAGES)); zone_page_state(zone, NR_FREE_PAGES));
/* /*
* fragmentation index determines if allocation failures are due to * fragmentation index determines if allocation failures are due to
* low memory or external fragmentation * low memory or external fragmentation
@ -2252,17 +2245,24 @@ enum compact_result compaction_suitable(struct zone *zone, int order,
* excessive compaction for costly orders, but it should not be at the * excessive compaction for costly orders, but it should not be at the
* expense of system stability. * expense of system stability.
*/ */
if (ret == COMPACT_CONTINUE && (order > PAGE_ALLOC_COSTLY_ORDER)) { if (suitable) {
fragindex = fragmentation_index(zone, order); compact_result = COMPACT_CONTINUE;
if (fragindex >= 0 && fragindex <= sysctl_extfrag_threshold) if (order > PAGE_ALLOC_COSTLY_ORDER) {
ret = COMPACT_NOT_SUITABLE_ZONE; int fragindex = fragmentation_index(zone, order);
if (fragindex >= 0 &&
fragindex <= sysctl_extfrag_threshold) {
suitable = false;
compact_result = COMPACT_NOT_SUITABLE_ZONE;
}
}
} else {
compact_result = COMPACT_SKIPPED;
} }
trace_mm_compaction_suitable(zone, order, ret); trace_mm_compaction_suitable(zone, order, compact_result);
if (ret == COMPACT_NOT_SUITABLE_ZONE)
ret = COMPACT_SKIPPED;
return ret; return suitable;
} }
bool compaction_zonelist_suitable(struct alloc_context *ac, int order, bool compaction_zonelist_suitable(struct alloc_context *ac, int order,
@ -2288,7 +2288,7 @@ bool compaction_zonelist_suitable(struct alloc_context *ac, int order,
available = zone_reclaimable_pages(zone) / order; available = zone_reclaimable_pages(zone) / order;
available += zone_page_state_snapshot(zone, NR_FREE_PAGES); available += zone_page_state_snapshot(zone, NR_FREE_PAGES);
if (__compaction_suitable(zone, order, ac->highest_zoneidx, if (__compaction_suitable(zone, order, ac->highest_zoneidx,
available) == COMPACT_CONTINUE) available))
return true; return true;
} }
@ -2329,11 +2329,10 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
cc->highest_zoneidx, cc->alloc_flags)) cc->highest_zoneidx, cc->alloc_flags))
return COMPACT_SUCCESS; return COMPACT_SUCCESS;
ret = compaction_suitable(cc->zone, cc->order,
cc->highest_zoneidx);
/* Compaction is likely to fail */ /* Compaction is likely to fail */
if (ret == COMPACT_SKIPPED) if (!compaction_suitable(cc->zone, cc->order,
return ret; cc->highest_zoneidx))
return COMPACT_SKIPPED;
} }
/* /*
@ -2845,7 +2844,7 @@ static bool kcompactd_node_suitable(pg_data_t *pgdat)
continue; continue;
if (compaction_suitable(zone, pgdat->kcompactd_max_order, if (compaction_suitable(zone, pgdat->kcompactd_max_order,
highest_zoneidx) == COMPACT_CONTINUE) highest_zoneidx))
return true; return true;
} }
@ -2887,8 +2886,7 @@ static void kcompactd_do_work(pg_data_t *pgdat)
min_wmark_pages(zone), zoneid, 0)) min_wmark_pages(zone), zoneid, 0))
continue; continue;
if (compaction_suitable(zone, cc.order, if (!compaction_suitable(zone, cc.order, zoneid))
zoneid) != COMPACT_CONTINUE)
continue; continue;
if (kthread_should_stop()) if (kthread_should_stop())

6
mm/vmscan.c
View File

@ -6404,8 +6404,7 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat,
sc->reclaim_idx, 0)) sc->reclaim_idx, 0))
return false; return false;
if (compaction_suitable(zone, sc->order, if (compaction_suitable(zone, sc->order, sc->reclaim_idx))
sc->reclaim_idx) == COMPACT_CONTINUE)
return false; return false;
} }
@ -6601,8 +6600,7 @@ static inline bool compaction_ready(struct zone *zone, struct scan_control *sc)
return true; return true;
/* Compaction cannot yet proceed. Do reclaim. */ /* Compaction cannot yet proceed. Do reclaim. */
if (compaction_suitable(zone, sc->order, if (!compaction_suitable(zone, sc->order, sc->reclaim_idx))
sc->reclaim_idx) == COMPACT_SKIPPED)
return false; return false;
/* /*