From: "Lorenzo Stoakes (ARM)" <ljs@kernel.org>
To: "David Hildenbrand (Arm)" <david@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
"Mike Rapoport (Microsoft)" <rppt@kernel.org>,
Peter Xu <peterx@redhat.com>,
"Liam R. Howlett" <liam@infradead.org>,
Vlastimil Babka <vbabka@kernel.org>,
Jann Horn <jannh@google.com>, Pedro Falcato <pfalcato@suse.de>,
Qi Zheng <qi.zheng@linux.dev>, Tal Zussman <tz2294@columbia.edu>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH] mm/mprotect: don't skip uffd marker install when racing with PTE table reclaim
Date: Thu, 19 Nov 2026 14:24:48 +0000 [thread overview]
Message-ID: <av8EisTx8vlYID0b@gremlin> (raw)
In-Reply-To: <20261107-uffd_shmem_marker-v1-1-91fa2d653cfe@kernel.org>
On Sat, Nov 07, 2026 at 12:28:55AM +0100, David Hildenbrand (Arm) wrote:
> change_pmd_range() populates PTE tables before installing uffd-wp
> markers. An empty PTE table can be removed after change_pmd_prepare()
> returns but before the pmd_none() check.
These *** wp markers man :)
>
> That check then skips the range, allowing UFFDIO_WRITEPROTECT to report
> success without installing the required markers. Subsequent writes by
> userspace to these areas will not trigger uffd events.
>
> PTE table reclaim during MADV_DONTNEED and page table retraction during
> khugepaged can trigger this.
>
> Retry page-table allocation in that case. Simplify the code, getting
> rid of change_pmd_prepare() by routing all code through the "again" label.
>
> It's a small race though, so likely this is not very urgent.
>
> Fixes: fe2567eb5521 ("mm/shmem: allow uffd wr-protect none pte for file-backed mem")
> Fixes: 6375e95f381e ("mm: pgtable: reclaim empty PTE page in madvise(MADV_DONTNEED)")
> Cc: stable@vger.kernel.org
> Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>
LGTM, so:
Reviewed-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
> ---
> I expect Andrew to pick this up.
> ---
> mm/mprotect.c | 48 +++++++++++-------------------------------------
> 1 file changed, 11 insertions(+), 37 deletions(-)
>
> diff --git a/mm/mprotect.c b/mm/mprotect.c
> index e18d4e12fc341..ef4e7188e24da 100644
> --- a/mm/mprotect.c
> +++ b/mm/mprotect.c
> @@ -470,25 +470,8 @@ pgtable_populate_needed(struct vm_area_struct *vma, unsigned long cp_flags)
> }
>
> /*
> - * Populate the pgtable underneath for whatever reason if requested.
> - * When {pte|pmd|...}_alloc() failed we treat it the same way as pgtable
> - * allocation failures during page faults by kicking OOM and returning
> - * error.
> - */
> -#define change_pmd_prepare(vma, pmd, cp_flags) \
> - ({ \
> - long err = 0; \
> - if (unlikely(pgtable_populate_needed(vma, cp_flags))) { \
> - if (pte_alloc(vma->vm_mm, pmd)) \
> - err = -ENOMEM; \
> - } \
> - err; \
> - })
> -
Oh lord... glad to see the back of this!
> -/*
> - * This is the general pud/p4d/pgd version of change_pmd_prepare(). We need to
> - * have separate change_pmd_prepare() because pte_alloc() returns 0 on success,
> - * while {pmd|pud|p4d}_alloc() returns the valid pointer on success.
> + * Populate the lower-level page table if marker installation requires it.
> + * Return -ENOMEM on allocation failure.
> */
> #define change_prepare(vma, high, low, addr, cp_flags) \
> ({ \
> @@ -517,30 +500,21 @@ static inline long change_pmd_range(struct mmu_gather *tlb,
> again:
> next = pmd_addr_end(addr, end);
>
> - ret = change_pmd_prepare(vma, pmd, cp_flags);
> - if (ret) {
> - pages = ret;
> - break;
> - }
> -
> - if (pmd_none(*pmd))
> + if (unlikely(pgtable_populate_needed(vma, cp_flags))) {
> + if (pte_alloc(vma->vm_mm, pmd)) {
> + pages = -ENOMEM;
> + break;
> + }
> + } else if (pmd_none(*pmd)) {
> goto next;
> + }
>
> _pmd = pmdp_get_lockless(pmd);
> if (pmd_is_huge(_pmd)) {
> if ((next - addr != HPAGE_PMD_SIZE) ||
> pgtable_split_needed(vma, cp_flags)) {
> __split_huge_pmd(vma, pmd, addr, false);
> - /*
> - * For file-backed, the pmd could have been
> - * cleared; make sure pmd populated if
> - * necessary, then fall-through to pte level.
> - */
> - ret = change_pmd_prepare(vma, pmd, cp_flags);
> - if (ret) {
> - pages = ret;
> - break;
> - }
> + goto again;
> } else {
> ret = change_huge_pmd(tlb, vma, pmd,
> addr, newprot, cp_flags);
> @@ -554,7 +528,7 @@ static inline long change_pmd_range(struct mmu_gather *tlb,
> goto next;
> }
> }
> - /* fall through, the trans huge pmd just split */
> + /* The PMD might have been split. */
> }
>
> ret = change_pte_range(tlb, vma, pmd, addr, next, newprot,
>
> ---
>
> base-commit: a3d27154a205f6b32000e7e2734b2a6a4d22c65b
>
> change-id: 20261107-uffd_shmem_marker-a0b9869d783c
>
> --
>
> Cheers,
>
> David
>
--
Cheers, Lorenzo
next prev parent reply other threads:[~2026-11-19 14:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-06 23:28 David Hildenbrand (Arm)
2026-11-08 8:40 ` Lance Yang
2026-11-09 12:53 ` David Hildenbrand (Arm)
2026-11-19 14:24 ` Lorenzo Stoakes (ARM) [this message]
2026-11-19 16:46 ` David Hildenbrand (Arm)
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=av8EisTx8vlYID0b@gremlin \
--to=ljs@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=jannh@google.com \
--cc=liam@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=peterx@redhat.com \
--cc=pfalcato@suse.de \
--cc=qi.zheng@linux.dev \
--cc=rppt@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tz2294@columbia.edu \
--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
all inboxes | Powered by JetHome®