Re: [PATCH v2 1/9] userfaultfd: use anonymous memory for UFFDIO_ZEROPAGE on private file mappings

From: Tal Zussman

Date: Mon Nov 16 2026 - 17:27:34 EST


On 11/16/26 3:16 PM, David Hildenbrand (Arm) wrote:
> On 11/16/26 21:02, Tal Zussman wrote:
>> If the mm cannot map the shared zero page, UFFDIO_ZEROPAGE falls back to
>> mfill_atomic_pte_zeroed_folio(), which allocates a zeroed folio and
>> installs it through vma_uffd_ops(), no matter what kind of mapping it
>> is. An s390 KVM guest with storage keys or protected virtualization is
>> such an mm.
>>
>> For a MAP_PRIVATE shmem mapping, that adds the zeroed folio to the page
>> cache of the file. That is wrong: a private mapping must never modify
>> the file it maps, and the file might even be mapped from a read-only fd.
>>
>> The ioctl can also fail where it should succeed. A missing fault is only
>> delivered for a hole in the file, but UFFDIO_ZEROPAGE can be called on
>> an address that did not fault, or can race with a write to the file. If
>> the file has a page at that offset by then, inserting the zeroed folio
>> fails and the ioctl returns -EEXIST although nothing is mapped at the
>> destination address.
>>
>> What we want is what UFFDIO_ZEROPAGE does on a private mapping when the
>> shared zero page can be used, and what UFFDIO_COPY does: only check that
>> nothing is mapped at the destination address, map zeroed memory there,
>> and leave the page cache alone. The zeroed folio path did that before it
>> was moved to vm_uffd_ops.
>>
>> To fix it, pick the ops in the common folio path, as
>> mfill_atomic_pte_copy() did for UFFDIO_COPY: anon_uffd_ops for a private
>> mapping, the ops of the VMA otherwise. That makes
>> mfill_atomic_pte_copy() and mfill_atomic_pte_zeroed_folio() redundant,
>> so remove them and rename __mfill_atomic_pte() to
>> mfill_atomic_pte_folio().
>>
>> UFFDIO_ZEROPAGE no longer modifies the file, and only fails with -EEXIST
>> if something is already mapped at the destination address.
>>
>> Fixes: f74991b4e383 ("shmem, userfaultfd: implement shmem uffd operations using vm_uffd_ops")
>> Cc: stable@xxxxxxxxxxxxxxx
>> Acked-by: Lorenzo Stoakes (ARM) <ljs@xxxxxxxxxx>
>> Signed-off-by: Tal Zussman <tz2294@xxxxxxxxxxxx>
>> ---
>> mm/userfaultfd.c | 46 ++++++++++++++++------------------------------
>> 1 file changed, 16 insertions(+), 30 deletions(-)
>>
>> diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
>> index d65184d9a480..61a712e1f9f5 100644
>> --- a/mm/userfaultfd.c
>> +++ b/mm/userfaultfd.c
>> @@ -531,15 +531,27 @@ static int mfill_copy_folio_retry(struct mfill_state *mfill_state,
>> return 0;
>> }
>>
>> -static int __mfill_atomic_pte(struct mfill_state *state,
>> - const struct vm_uffd_ops *ops)
>> +static int mfill_atomic_pte_folio(struct mfill_state *state)
>> {
>> + const struct vm_uffd_ops *ops = vma_uffd_ops(state->vma);
>> unsigned long dst_addr = state->dst_addr;
>> unsigned long src_addr = state->src_addr;
>> uffd_flags_t flags = state->flags;
>> struct folio *folio;
>> int ret;
>>
>> + /*
>> + * The normal page fault path for a MAP_PRIVATE mapping in a
>> + * file-backed VMA will invoke the fault, fill the hole in the file and
>> + * COW it right away. The result generates plain anonymous memory.
>> + * So when we are asked to fill a hole in a MAP_PRIVATE mapping, we'll
>> + * generate anonymous memory directly without actually filling the
>> + * hole. For the MAP_PRIVATE case the robustness check only happens in
>> + * the pagetable (to verify it's still none) and not in the page cache.
>> + */
>> + if (!(state->vma->vm_flags & VM_SHARED))
>> + ops = &anon_uffd_ops;
>
> Oh, but one comment: why not check for actual cow mappings?
>
> vma_is_cow_mapping()
>
> is your friend :)
>

Probably because I didn't know about it :)

This is already equivalent since uffd registration rejects VMAs without
VM_MAYWRITE, but I can switch it over for consistency.

> --
> Cheers,
>
> David
>