From: "David Hildenbrand (Arm)" <david@kernel.org>
To: "Tal Zussman" <tz2294@columbia.edu>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Mike Rapoport" <rppt@kernel.org>, "Peter Xu" <peterx@redhat.com>,
"James Houghton" <jthoughton@google.com>,
"Andrea Arcangeli" <aarcange@redhat.com>,
"Suren Baghdasaryan" <surenb@google.com>,
"Balbir Singh" <balbirs@nvidia.com>,
"Liam R. Howlett" <liam@infradead.org>,
"Lorenzo Stoakes" <ljs@kernel.org>,
"Vlastimil Babka" <vbabka@kernel.org>,
"Jann Horn" <jannh@google.com>,
"Pedro Falcato" <pfalcato@suse.de>,
"Michal Hocko" <mhocko@suse.com>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"Andrei Vagin" <avagin@gmail.com>,
"Muhammad Usama Anjum" <usama.anjum@arm.com>,
"Stephen Rothwell" <sfr@canb.auug.org.au>,
"Arnd Bergmann" <arnd@arndb.de>, "Zi Yan" <ziy@nvidia.com>,
"Matthew Brost" <matthew.brost@intel.com>,
"Joshua Hahn" <joshua.hahnjy@gmail.com>,
"Byungchul Park" <byungchul@sk.com>,
"Gregory Price" <gourry@gourry.net>,
"Ying Huang" <ying.huang@linux.alibaba.com>,
"Alistair Popple" <apopple@nvidia.com>,
"Baolin Wang" <baolin.wang@linux.alibaba.com>,
"Nico Pache" <nico.pache@linux.dev>,
"Ryan Roberts" <ryan.roberts@arm.com>,
"Dev Jain" <dev.jain@arm.com>, "Barry Song" <baohua@kernel.org>,
"Lance Yang" <lance.yang@linux.dev>,
"Usama Arif" <usama.arif@linux.dev>,
"Kiryl Shutsemau" <kas@kernel.org>,
"Muchun Song" <muchun.song@linux.dev>,
"Oscar Salvador" <osalvador@suse.de>,
"Mikołaj Lenczewski" <miko.lenczewski@arm.com>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH v2 1/9] userfaultfd: use anonymous memory for UFFDIO_ZEROPAGE on private file mappings
Date: Tue, 17 Nov 2026 10:55:05 +0100 [thread overview]
Message-ID: <91aadb5b-53a7-41eb-a0fa-4fce804a35e6@kernel.org> (raw)
In-Reply-To: <eba4fb71-6baa-455f-8899-87567af898aa@columbia.edu>
On 11/16/26 23:27, Tal Zussman wrote:
> 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@vger.kernel.org
>>> Acked-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
>>> Signed-off-by: Tal Zussman <tz2294@columbia.edu>
>>> ---
>>> 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.
Yes please. We need to convert all of that code to not check fiddly VMA flags.
Cow mapping in uffd -> anon folios only.
--
Cheers,
David
next prev parent reply other threads:[~2026-11-17 9:55 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 20:02 [PATCH v2 0/9] userfaultfd: assorted fixes (part 1) Tal Zussman
2026-11-16 20:02 ` Tal Zussman
2026-11-16 20:02 ` [PATCH v2 1/9] userfaultfd: use anonymous memory for UFFDIO_ZEROPAGE on private file mappings Tal Zussman
2026-11-16 20:15 ` David Hildenbrand (Arm)
2026-11-16 20:16 ` David Hildenbrand (Arm)
2026-11-16 22:27 ` Tal Zussman
2026-11-17 9:55 ` David Hildenbrand (Arm) [this message]
2026-11-16 20:02 ` [PATCH v2 2/9] userfaultfd: refuse UFFDIO_MOVE into a non-present huge destination PMD Tal Zussman
2026-11-16 20:18 ` David Hildenbrand (Arm)
2026-11-16 20:02 ` [PATCH v2 3/9] fs/proc/task_mmu: downgrade writable migration entries in PAGEMAP_SCAN write-protect Tal Zussman
2026-11-16 20:21 ` David Hildenbrand (Arm)
2026-11-16 20:02 ` [PATCH v2 4/9] mm/migrate: keep the uffd bit when restoring a writable migration entry Tal Zussman
2026-11-16 20:23 ` David Hildenbrand (Arm)
2026-11-16 22:42 ` Tal Zussman
2026-11-17 9:55 ` David Hildenbrand (Arm)
2026-11-16 20:02 ` [PATCH v2 5/9] fs/proc/task_mmu: write-protect device-private THPs in PAGEMAP_SCAN Tal Zussman
2026-11-16 20:26 ` David Hildenbrand (Arm)
2026-11-16 22:48 ` Tal Zussman
2026-11-17 9:56 ` David Hildenbrand (Arm)
2026-11-16 20:02 ` [PATCH v2 6/9] mm/huge_memory: build the moved huge zero PMD from the destination VMA Tal Zussman
2026-11-16 20:32 ` David Hildenbrand (Arm)
2026-11-16 20:02 ` [PATCH v2 7/9] mm/mremap: resolve uffd state when the context is dropped, not during the move Tal Zussman
2026-11-16 20:41 ` David Hildenbrand (Arm)
2026-11-16 23:00 ` Tal Zussman
2026-11-16 20:02 ` [PATCH v2 8/9] mm/migrate_device: do not migrate a uffd-protected zero page Tal Zussman
2026-11-16 20:02 ` Tal Zussman
2026-11-16 20:45 ` David Hildenbrand (Arm)
2026-11-16 20:45 ` David Hildenbrand (Arm)
2026-11-16 23:06 ` Tal Zussman
2026-11-16 23:06 ` Tal Zussman
2026-11-17 9:58 ` David Hildenbrand (Arm)
2026-11-17 9:58 ` David Hildenbrand (Arm)
2026-11-16 20:02 ` [PATCH v2 9/9] mm/userfaultfd: check hugetlb end alignment in UFFDIO_UNREGISTER pre-scan Tal Zussman
2026-11-16 20:56 ` David Hildenbrand (Arm)
2026-11-16 23:14 ` Tal Zussman
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=91aadb5b-53a7-41eb-a0fa-4fce804a35e6@kernel.org \
--to=david@kernel.org \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=apopple@nvidia.com \
--cc=arnd@arndb.de \
--cc=avagin@gmail.com \
--cc=balbirs@nvidia.com \
--cc=baohua@kernel.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=byungchul@sk.com \
--cc=dev.jain@arm.com \
--cc=gourry@gourry.net \
--cc=jannh@google.com \
--cc=joshua.hahnjy@gmail.com \
--cc=jthoughton@google.com \
--cc=kas@kernel.org \
--cc=lance.yang@linux.dev \
--cc=liam@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=ljs@kernel.org \
--cc=matthew.brost@intel.com \
--cc=mhocko@suse.com \
--cc=miko.lenczewski@arm.com \
--cc=mirq-linux@rere.qmqm.pl \
--cc=muchun.song@linux.dev \
--cc=nico.pache@linux.dev \
--cc=osalvador@suse.de \
--cc=peterx@redhat.com \
--cc=pfalcato@suse.de \
--cc=rppt@kernel.org \
--cc=ryan.roberts@arm.com \
--cc=sfr@canb.auug.org.au \
--cc=stable@vger.kernel.org \
--cc=surenb@google.com \
--cc=tz2294@columbia.edu \
--cc=usama.anjum@arm.com \
--cc=usama.arif@linux.dev \
--cc=vbabka@kernel.org \
--cc=ying.huang@linux.alibaba.com \
--cc=ziy@nvidia.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.