Re: [PATCH] mm/compaction: do not skip the free scanner's periodic lock drop

From: Dev Jain

Date: Tue Nov 17 2026 - 00:34:40 EST




On 16/11/26 6:27 pm, Kiryl Shutsemau (Meta) wrote:
> isolate_freepages_block() drops zone->lock, checks for a fatal signal
> and calls cond_resched() at every pfn that is a multiple of
> COMPACT_CLUSTER_MAX.
>
> With a stride above one, the scan steps over a compound page, or over a
> high-order free page it has just isolated, to a pfn that is not a
> multiple of the stride. From there it never reaches a multiple of
> COMPACT_CLUSTER_MAX, so the rest of the pageblock is scanned without the
> check, possibly with zone->lock held and interrupts off.
>
> Count probes instead, and check every COMPACT_CLUSTER_MAX of them.
>
> Fixes: 4fca9730c51d ("mm, compaction: sample pageblocks for free pages")
> Signed-off-by: Kiryl Shutsemau (Meta) <kas@xxxxxxxxxx>
> ---

Cc stable?

Reviewed-by: Dev Jain <dev.jain@xxxxxxx>


> mm/compaction.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/mm/compaction.c b/mm/compaction.c
> index f1b2060eb201..4465c1551406 100644
> --- a/mm/compaction.c
> +++ b/mm/compaction.c
> @@ -579,7 +579,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,
> unsigned int stride,
> bool strict)
> {
> - int nr_scanned = 0, total_isolated = 0;
> + int nr_scanned = 0, nr_probes = 0, total_isolated = 0;
> struct page *page;
> unsigned long flags = 0;
> bool locked = false;
> @@ -599,13 +599,15 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,
> /*
> * Periodically drop the lock (if held) regardless of its
> * contention, to give chance to IRQs. Abort if fatal signal
> - * pending.
> + * pending. Count probes rather than pfns, as the scan does not
> + * always land on a multiple of COMPACT_CLUSTER_MAX.
> */
> - if (!(blockpfn % COMPACT_CLUSTER_MAX)
> - && compact_unlock_should_abort(&cc->zone->lock, flags,
> - &locked, cc))
> + if (!(nr_probes % COMPACT_CLUSTER_MAX) &&
> + compact_unlock_should_abort(&cc->zone->lock, flags,
> + &locked, cc))

I see this is an unrelated change but I don't mind.


> break;
>
> + nr_probes++;
> nr_scanned++;
>
> /*
>
> base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4