On Tue 31-05-16 15:08:17, Vlastimil Babka wrote:
> The compaction_ready() is used during direct reclaim for costly order
> allocations to skip reclaim for zones where compaction should be attempted
> instead. It's combining the standard compaction_suitable() check with its own
> watermark check based on high watermark with extra gap, and the result is
> confusing at best.
>
> This patch attempts to better structure and document the checks involved.
> First, compaction_suitable() can determine that the allocation should either
> succeed already, or that compaction doesn't have enough free pages to proceed.
> The third possibility is that compaction has enough free pages, but we still
> decide to reclaim first - unless we are already above the high watermark with
> gap. This does not mean that the reclaim will actually reach this watermark
> during single attempt, this is rather an over-reclaim protection. So document
> the code as such. The check for compaction_deferred() is removed completely,
> as
> it in fact had no proper role here.
>
> The result after this patch is mainly a less confusing code. We also skip some
> over-reclaim in cases where the allocation should already succed.
Yes this is indeed more understandable
> Signed-off-by: Vlastimil Babka <vba...@suse.cz>
Acked-by: Michal Hocko <mho...@suse.com>
> ---
> mm/vmscan.c | 49 +++++++++++++++++++++++--------------------------
> 1 file changed, 23 insertions(+), 26 deletions(-)
>
> diff --git a/mm/vmscan.c b/mm/vmscan.c
> index 00034ec9229b..640d2e615c36 100644
> --- a/mm/vmscan.c
> +++ b/mm/vmscan.c
> @@ -2456,40 +2456,37 @@ static bool shrink_zone(struct zone *zone, struct
> scan_control *sc,
> }
>
> /*
> - * Returns true if compaction should go ahead for a high-order request, or
> - * the high-order allocation would succeed without compaction.
> + * Returns true if compaction should go ahead for a costly-order request, or
> + * the allocation would already succeed without compaction. Return false if
> we
> + * should reclaim first.
> */
> static inline bool compaction_ready(struct zone *zone, int order, int
> classzone_idx)
> {
> - unsigned long balance_gap, watermark;
> - bool watermark_ok;
> + unsigned long watermark;
> + enum compact_result suitable;
>
> - /*
> - * Compaction takes time to run and there are potentially other
> - * callers using the pages just freed. Continue reclaiming until
> - * there is a buffer of free pages available to give compaction
> - * a reasonable chance of completing and allocating the page
> - */
> - balance_gap = min(low_wmark_pages(zone), DIV_ROUND_UP(
> - zone->managed_pages, KSWAPD_ZONE_BALANCE_GAP_RATIO));
> - watermark = high_wmark_pages(zone) + balance_gap + compact_gap(order);
> - watermark_ok = zone_watermark_ok_safe(zone, 0, watermark,
> classzone_idx);
> -
> - /*
> - * If compaction is deferred, reclaim up to a point where
> - * compaction will have a chance of success when re-enabled
> - */
> - if (compaction_deferred(zone, order))
> - return watermark_ok;
> + suitable = compaction_suitable(zone, order, 0, classzone_idx);
> + if (suitable == COMPACT_PARTIAL)
> + /* Allocation should succeed already. Don't reclaim. */
> + return true;
> + if (suitable == COMPACT_SKIPPED)
> + /* Compaction cannot yet proceed. Do reclaim. */
> + return false;
>
> /*
> - * If compaction is not ready to start and allocation is not likely
> - * to succeed without it, then keep reclaiming.
> + * Compaction is already possible, but it takes time to run and there
> + * are potentially other callers using the pages just freed. So proceed
> + * with reclaim to make a buffer of free pages available to give
> + * compaction a reasonable chance of completing and allocating the page.
> + * Note that we won't actually reclaim the whole buffer in one attempt
> + * as the target watermark in should_continue_reclaim() is lower. But if
> + * we are already above the high+gap watermark, don't reclaim at all.
> */
> - if (compaction_suitable(zone, order, 0, classzone_idx) ==
> COMPACT_SKIPPED)
> - return false;
> + watermark = high_wmark_pages(zone) + compact_gap(order);
> + watermark += min(low_wmark_pages(zone), DIV_ROUND_UP(
> + zone->managed_pages, KSWAPD_ZONE_BALANCE_GAP_RATIO));
>
> - return watermark_ok;
> + return zone_watermark_ok_safe(zone, 0, watermark, classzone_idx);
> }
>
> /*
> --
> 2.8.3
--
Michal Hocko
SUSE Labs
