Linux-mm Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "David Hildenbrand (Arm)" <david@kernel.org>
To: "Lorenzo Stoakes (ARM)" <ljs@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>,
	Shuah Khan <skhan@linuxfoundation.org>,
	Randy Dunlap <rdunlap@infradead.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	"Liam R. Howlett" <liam@infradead.org>,
	Vlastimil Babka <vbabka@kernel.org>, Jann Horn <jannh@google.com>,
	Pedro Falcato <pfalcato@suse.de>, Mike Rapoport <rppt@kernel.org>,
	Suren Baghdasaryan <surenb@google.com>,
	Michal Hocko <mhocko@suse.com>, Peter Xu <peterx@redhat.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
	Zi Yan <ziy@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>,
	Axel Rasmussen <axelrasmussen@google.com>,
	linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-doc@vger.kernel.org, linux-mm@kvack.org,
	linux-trace-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] mm/userfaultfd: prevent poison marker loss
Date: Mon, 16 Nov 2026 15:26:33 +0100	[thread overview]
Message-ID: <02e6240c-78ac-48a2-8bf8-36a2327e9de8@kernel.org> (raw)
In-Reply-To: <avij463DZ_tSwgKy@gremlin>

On 11/14/26 19:40, Lorenzo Stoakes (ARM) wrote:
> On Sat, Nov 07, 2026 at 12:51:05AM +0100, David Hildenbrand (Arm) wrote:
>> Unregistering userfaultfd leaves poison markers in the page tables.
>> However, once unregistered, hugetlb PMD tables can be shared again.
>>
>> Further, shmem page-table retraction can discard poison markers even
>> while registered in missing mode, and fork() can skip copying page
>> tables containing poison markers.
>>
>> To fix it, add VM_MAYBE_UFFD_POISON and set it before installing poison
>> markers. Preserve it across unregistration, splits, merges and fork(),
>> just like we do with guard markers.
>>
>> Use the new atomic VMA flag to disable PMD sharing and page-table
>> retraction, and to force page-table copying during fork().
>>
>> Move VM_UFFD_WP to bit 44 and make HAVE_ARCH_USERFAULTFD_WP depend on
>> 64BIT, freeing bit 12 for the new flag on both 32-bit and 64-bit systems.
>> Expose the flag as "up" in smaps.
>>
>> Losing poison markers, while unpleasant, is not really fatal, and the
>> use case is rather a niche thing. In addition, we rely on the atomic
>> VMA flags infrastructure ... so let's not CC stable.
>>
>> Fixes: fc71884a5f59 ("mm: userfaultfd: add new UFFDIO_POISON ioctl")
>> Fixes: 8a13897fb0da ("mm: userfaultfd: support UFFDIO_POISON for hugetlbfs")
> 
> Are we looking to cc: stable or this something for newer kernels only?

Per above:

"Losing poison markers, while unpleasant, is not really fatal, and the
use case is rather a niche thing. In addition, we rely on the atomic
VMA flags infrastructure ... so let's not CC stable."

We cannot really backport to the pre MADV_GUARD fixes that handle the atomic flag correctly.

We could easily backport to stable kernels that have it.

Thoughts?


[...]

>>  #define VM_LOCKED	INIT_VM_FLAG(LOCKED)
>>  #define VM_IO		INIT_VM_FLAG(IO)
>>  #define VM_SEQ_READ	INIT_VM_FLAG(SEQ_READ)
>> @@ -502,13 +508,17 @@ enum {
>>  #endif
>>
>>  /*
>> - * vma_flags_t masks for the userfaultfd VMA flags. The two high-bit modes are
>> - * gated on the same configs as their VM_* flags above -- both of which imply
>> + * vma_flags_t masks for the userfaultfd VMA flags. The three high-bit modes are
>> + * gated on the same configs as their VM_* flags above -- all of which imply
>>   * 64BIT -- so an out-of-range bit is never fed to mk_vma_flags() on a build
>>   * whose bitmap cannot hold it.
>>   */
>>  #define VMA_UFFD_MISSING	mk_vma_flags(VMA_UFFD_MISSING_BIT)
>> +#ifdef CONFIG_HAVE_ARCH_USERFAULTFD_WP
>>  #define VMA_UFFD_WP		mk_vma_flags(VMA_UFFD_WP_BIT)
>> +#else
>> +#define VMA_UFFD_WP		EMPTY_VMA_FLAGS
>> +#endif
> 
> Could you just move these up to the block above to match the convention here?
> 

Did you have the following change on top of my changes in mind?

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 6cd9d86f7adac..fa56d9e9f3ebd 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -410,8 +410,10 @@ enum {
 #define VM_MAYBE_UFFD_POISON   INIT_VM_FLAG(MAYBE_UFFD_POISON)
 #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_WP
 #define VM_UFFD_WP     INIT_VM_FLAG(UFFD_WP)
+#define VMA_UFFD_WP    mk_vma_flags(VMA_UFFD_WP_BIT)
 #else
 #define VM_UFFD_WP     VM_NONE
+#define VMA_UFFD_WP    EMPTY_VMA_FLAGS
 #endif
 #define VM_LOCKED      INIT_VM_FLAG(LOCKED)
 #define VM_IO          INIT_VM_FLAG(IO)
@@ -508,17 +510,12 @@ enum {
 #endif

 /*
- * vma_flags_t masks for the userfaultfd VMA flags. The three high-bit modes are
- * gated on the same configs as their VM_* flags above -- all of which imply
+ * vma_flags_t masks for the userfaultfd VMA flags. The two high-bit modes are
+ * gated on the same configs as their VM_* flags above -- both of which imply
  * 64BIT -- so an out-of-range bit is never fed to mk_vma_flags() on a build
  * whose bitmap cannot hold it.
  */
 #define VMA_UFFD_MISSING       mk_vma_flags(VMA_UFFD_MISSING_BIT)
-#ifdef CONFIG_HAVE_ARCH_USERFAULTFD_WP
-#define VMA_UFFD_WP            mk_vma_flags(VMA_UFFD_WP_BIT)
-#else
-#define VMA_UFFD_WP            EMPTY_VMA_FLAGS
-#endif
 #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR
 #define VMA_UFFD_MINOR         mk_vma_flags(VMA_UFFD_MINOR_BIT)
 #else
diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h
index b8b7cc2f00388..75c3e9270b62a 100644
--- a/include/linux/userfaultfd_k.h
+++ b/include/linux/userfaultfd_k.h
@@ -201,7 +201,7 @@ static inline bool userfaultfd_missing(struct vm_area_struct *vma)

 static inline bool userfaultfd_wp(struct vm_area_struct *vma)
 {
-       return vma_test_any_mask(vma, VMA_UFFD_WP);
+       return vma_test_single_mask(vma, VMA_UFFD_WP);
 }

 static inline bool userfaultfd_minor(struct vm_area_struct *vma)

-- 
Cheers,

David


  reply	other threads:[~2026-11-16 14:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-06 23:51 [PATCH 0/2] mm/userfaultfd: prevent poison marker loss David Hildenbrand (Arm)
2026-11-06 23:51 ` [PATCH 1/2] " David Hildenbrand (Arm)
2026-11-14 15:39   ` David Hildenbrand (Arm)
2026-11-14 17:58     ` Lorenzo Stoakes (ARM)
2026-11-14 18:40   ` Lorenzo Stoakes (ARM)
2026-11-16 14:26     ` David Hildenbrand (Arm) [this message]
2026-11-16 14:39       ` Lorenzo Stoakes (ARM)
2026-11-15  5:42   ` Mike Rapoport
2026-11-16 13:59   ` Kiryl Shutsemau (Meta)
2026-11-06 23:51 ` [PATCH 2/2] mm/khugepaged: check for empty PTE tables before retracting David Hildenbrand (Arm)
2026-11-07 23:51   ` sashiko-bot
2026-11-09 15:08     ` David Hildenbrand (Arm)
2026-11-10 17:08       ` Lorenzo Stoakes (ARM)
2026-11-11  8:17         ` 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=02e6240c-78ac-48a2-8bf8-36a2327e9de8@kernel.org \
    --to=david@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=axelrasmussen@google.com \
    --cc=baohua@kernel.org \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=corbet@lwn.net \
    --cc=dev.jain@arm.com \
    --cc=jannh@google.com \
    --cc=kas@kernel.org \
    --cc=lance.yang@linux.dev \
    --cc=liam@infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-trace-kernel@vger.kernel.org \
    --cc=ljs@kernel.org \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mhiramat@kernel.org \
    --cc=mhocko@suse.com \
    --cc=nico.pache@linux.dev \
    --cc=peterx@redhat.com \
    --cc=pfalcato@suse.de \
    --cc=rdunlap@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=rppt@kernel.org \
    --cc=ryan.roberts@arm.com \
    --cc=skhan@linuxfoundation.org \
    --cc=surenb@google.com \
    --cc=usama.arif@linux.dev \
    --cc=vbabka@kernel.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox