The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: "Luiz Capitulino (Red Hat)" <luiz.capitulino@linux.dev>
To: "David Hildenbrand (Arm)" <david@kernel.org>,
	Lorenzo Stoakes <ljs@kernel.org>,
	"Liam R. Howlett" <liam@infradead.org>,
	Vlastimil Babka <vbabka@kernel.org>,
	Mike Rapoport <rppt@kernel.org>,
	Suren Baghdasaryan <surenb@google.com>,
	Michal Hocko <mhocko@suse.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Shivank Garg <shivankg@amd.com>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	Shao Mingyin <shao.mingyin@zte.com.cn>
Subject: Re: [PATCH] mm/util: fix retry detection and handling in snapshot_page()
Date: Mon, 16 Nov 2026 16:03:39 -0500	[thread overview]
Message-ID: <32c5f583-1b2c-4ca2-864d-bc98cd24cb73@linux.dev> (raw)
In-Reply-To: <20261116-snapshot_page_fix-v1-1-8e425984e8d1@kernel.org>



On 11/16/26 9:12 AM, David Hildenbrand (Arm) wrote:
> snapshot_page() detects races with concurrent folio split+construction by
> checking whether the given page still falls into the folio. Unfortunately,
> we have an off-by-one error in there, and we should be checking for
> "ps->idx >= nr_pages", because idx 0 is valid.
> 
> For example, we might currently report a tail page at idx 1 as faithful,
> although the snapshotted folio is now a small folio.
> 
> However, there is one complication: As we don't hold a folio reference,
> folio_nr_pages() can return 0 on races (or when called from page freeing
> code). Handle that by just setting it to 1 in that case, so we don't
> wrongly report a head page as "page does not match folio".
> 
> In addition, we should reset ps->flags when retrying, by just resetting
> it to PAGE_SNAPSHOT_FAITHFUL. Otherwise, PAGE_SNAPSHOT_PG_BUDDY and
> PAGE_SNAPSHOT_PG_IDLE from a failed attempt could stick around.
> 
> These races are fairly rare, so this is not really critical, we simply
> report something slightly wrong. No need to CC stable.
> 
> Fixes: d863a12108f2 ("mm/util: introduce snapshot_page()")
> Reported-by: Shao Mingyin <shao.mingyin@zte.com.cn>
> Closes: https://lore.kernel.org/r/20261115004657890Pz8ERDf5nCtE-B6M7KFzu@zte.com.cn
> Reviewed-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
> Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>

Acked-by: Luiz Capitulino (Red Hat) <luiz.capitulino@linux.dev>

> ---
>   mm/util.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/mm/util.c b/mm/util.c
> index 80f6c714844f2..338f259b00351 100644
> --- a/mm/util.c
> +++ b/mm/util.c
> @@ -1406,9 +1406,9 @@ void snapshot_page(struct page_snapshot *ps, const struct page *page)
>   	int loops = 5;
>   
>   	ps->pfn = page_to_pfn(page);
> -	ps->flags = PAGE_SNAPSHOT_FAITHFUL;
>   
>   again:
> +	ps->flags = PAGE_SNAPSHOT_FAITHFUL;
>   	memset(&ps->folio_snapshot, 0, sizeof(struct folio));
>   	memcpy(&ps->page_snapshot, page, sizeof(*page));
>   	info = ps->page_snapshot.compound_info;
> @@ -1437,14 +1437,15 @@ void snapshot_page(struct page_snapshot *ps, const struct page *page)
>   
>   	if (ps->idx < MAX_FOLIO_NR_PAGES) {
>   		memcpy(&ps->folio_snapshot, foliop, 2 * sizeof(struct page));
> -		nr_pages = folio_nr_pages(&ps->folio_snapshot);
> +		/* On races, or when freeing pages, we can read 0. */
> +		nr_pages = folio_nr_pages(&ps->folio_snapshot) ?: 1;
>   		if (nr_pages > 2)
>   			memcpy(&ps->folio_snapshot.__page_2, &foliop->__page_2,
>   			       sizeof(struct page));
>   		set_ps_flags(ps, foliop, page);
>   	}
>   
> -	if (ps->idx > nr_pages) {
> +	if (ps->idx >= nr_pages) {
>   		if (loops-- > 0)
>   			goto again;
>   		clear_compound_head(&ps->page_snapshot);
> 
> ---
> base-commit: d164c7d754f0e1f020298366ea92430e62476089
> change-id: 20261116-snapshot_page_fix-fae185e61c94
> 
> Best regards,
> --
> David Hildenbrand (Arm) <david@kernel.org>

      reply	other threads:[~2026-11-16 21:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 14:12 [PATCH] mm/util: fix retry detection and handling in snapshot_page() David Hildenbrand (Arm)
2026-11-16 21:03 ` Luiz Capitulino (Red Hat) [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=32c5f583-1b2c-4ca2-864d-bc98cd24cb73@linux.dev \
    --to=luiz.capitulino@linux.dev \
    --cc=akpm@linux-foundation.org \
    --cc=david@kernel.org \
    --cc=liam@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=ljs@kernel.org \
    --cc=mhocko@suse.com \
    --cc=rppt@kernel.org \
    --cc=shao.mingyin@zte.com.cn \
    --cc=shivankg@amd.com \
    --cc=surenb@google.com \
    --cc=vbabka@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox