All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lance Yang <lance.yang@linux.dev>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org,
	"Samarth Narang" <samarth.colleges@gmail.com>,
	"Andrew Morton" <akpm@linux-foundation.org>,
	"Lorenzo Stoakes (ARM)" <ljs@kernel.org>,
	"Kiryl Shutsemau (Meta)" <kas@kernel.org>,
	"David Hildenbrand (Arm)" <david@kernel.org>,
	"Mel Gorman" <mgorman@techsingularity.net>,
	"Xu Xin" <xu.xin@linux.dev>,
	"Chengming Zhou" <chengming.zhou@linux.dev>,
	"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>,
	"Jérôme Glisse" <jglisse@redhat.com>,
	"Andrea Arcangeli" <aarcange@redhat.com>,
	"Peter Xu" <peterx@redhat.com>,
	"Bobby Powers" <bobbypowers@gmail.com>,
	"Brian Geffon" <bgeffon@google.com>,
	"Denis Plotnikov" <dplotnikov@virtuozzo.com>,
	"Doug Gilbert" <dgilbert@interlog.com>,
	"Hugh Dickins" <hughd@google.com>,
	"Johannes Weiner" <hannes@cmpxchg.org>,
	"Martin Cracauer" <cracauer@cons.org>,
	"Marty McFadden" <mcfadden8@llnl.gov>,
	"Maya Gokhale" <gokhale2@llnl.gov>,
	"Pavel Emelyanov" <xemul@openvz.org>,
	"Rik van Riel" <riel@surriel.com>, "Shaohua Li" <shli@fb.com>,
	"James Houghton" <jthoughton@google.com>,
	"Jonathan Corbet" <corbet@lwn.net>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Sean Christopherson" <seanjc@google.com>,
	"SJ Park" <sj@kernel.org>, "Zi Yan" <ziy@nvidia.com>,
	"Mohammed EL Kadiri" <med08elkadiri@gmail.com>
Subject: Re: [PATCH 6.12.y] mm/ksm: fix userfaultfd protection during merge and unmerge
Date: Wed, 18 Nov 2026 22:33:53 +0800	[thread overview]
Message-ID: <3b705a3e-cbc5-42f1-b715-d407c08cdf87@linux.dev> (raw)
In-Reply-To: <2026111802-facial-asparagus-d380@gregkh>



On 2026/11/18 18:48, Greg KH wrote:
> On Wed, Nov 11, 2026 at 04:29:01PM +0800, Lance Yang wrote:
>> KSM loses userfaultfd protection when replace_page() builds a new PTE from
>> vma->vm_page_prot.  Dropping its uffd bit lets a subsequent write go
>> through ordinary COW instead of userfaultfd write protection handling.
>> For RWP, a merged page also becomes readable without faulting.
>>
>> Keeping the uffd bit and restoring PAGE_NONE fixes merging, but we also
>> have to handle unmerging.  An existing KSM page can be protected with RWP
>> before MADV_UNMERGEABLE, so unmerging already needs fixing independently
>> of preserving RWP during merging.
>>
>> Unsharing replaces a shared page with a private one and should leave
>> userfaultfd protection in place, as do_wp_page() already does for write
>> protection.  Currently, an unshare fault reaches do_uffd_rwp() before it
>> can proceed to do_wp_page().
>>
>> - With synchronous RWP, handle_userfault() returns VM_FAULT_SIGBUS.
>>    break_ksm() then reports success with a KSM page still merged.
>>
>> - With asynchronous RWP, protection is cleared before unsharing.
>>
>> Preserve the uffd bit when merging, and restore PAGE_NONE for RWP.  Let
>> FAULT_FLAG_UNSHARE skip RWP fault handling and keep PAGE_NONE on each
>> private copy as well.  Unsharing can then complete with RWP still armed
>> for a subsequent access.
>>
>> Link: https://lore.kernel.org/20261026130054.91461-1-lance.yang@linux.dev
>> Link: https://lore.kernel.org/all/20261019010934.697895-1-samarth.colleges@gmail.com/
>> Link: https://lore.kernel.org/all/20261020055518.36087-1-lance.yang@linux.dev/
>> Fixes: 63b2d4174c4a ("userfaultfd: wp: add the writeprotect API to userfaultfd ioctl")
>> Fixes: 2d427bb01639 ("mm/userfaultfd: add RWP fault delivery and expose UFFDIO_REGISTER_MODE_RWP")
>> Signed-off-by: Samarth Narang <samarth.colleges@gmail.com>
>> Signed-off-by: Lance Yang <lance.yang@linux.dev>
>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>> Co-developed-by: Samarth Narang <samarth.colleges@gmail.com>
>> Acked-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
>> Reviewed-by: Kiryl Shutsemau (Meta) <kas@kernel.org>
>> Acked-by: David Hildenbrand (Arm) <david@kernel.org>
>> Cc: Mel Gorman <mgorman@techsingularity.net>
>> Cc: Xu Xin <xu.xin@linux.dev>"
>> Cc: Chengming Zhou <chengming.zhou@linux.dev>
>> Cc: Liam R. Howlett <liam@infradead.org>
>> Cc: Vlastimil Babka <vbabka@kernel.org>
>> Cc: Mike Rapoport <rppt@kernel.org>
>> Cc: Suren Baghdasaryan <surenb@google.com>
>> Cc: Michal Hocko <mhocko@suse.com>
>> Cc: Jérôme Glisse <jglisse@redhat.com>
>> Cc: Andrea Arcangeli <aarcange@redhat.com>
>> Cc: Peter Xu <peterx@redhat.com>
>> Cc: Bobby Powers <bobbypowers@gmail.com>
>> Cc: Brian Geffon <bgeffon@google.com>
>> Cc: Denis Plotnikov <dplotnikov@virtuozzo.com>
>> Cc: Doug Gilbert <dgilbert@interlog.com>
>> Cc: Hugh Dickins <hughd@google.com>
>> Cc: Johannes Weiner <hannes@cmpxchg.org>
>> Cc: Martin Cracauer <cracauer@cons.org>
>> Cc: Marty McFadden <mcfadden8@llnl.gov>
>> Cc: Maya Gokhale <gokhale2@llnl.gov>
>> Cc: Pavel Emelyanov <xemul@openvz.org>
>> Cc: Rik van Riel <riel@surriel.com>
>> Cc: Shaohua Li <shli@fb.com>
>> Cc: James Houghton <jthoughton@google.com>
>> Cc: Jonathan Corbet <corbet@lwn.net>
>> Cc: Paolo Bonzini <pbonzini@redhat.com>
>> Cc: Sean Christopherson <seanjc@google.com>
>> Cc: SJ Park <sj@kernel.org>
>> Cc: Zi Yan <ziy@nvidia.com>
>> Cc: Mohammed EL Kadiri <med08elkadiri@gmail.com>
>> Cc: <stable@vger.kernel.org>
>>
>> (cherry picked from commit 990d6c2194a938a19a8cf94c6cfd75171345089b)
>> ---
>> Backport to 6.12:
>> - Use the older pte_uffd_wp()/pte_mkuffd_wp() helpers.
>> - Drop the mm/memory.c changes. 6.12 has no RWP support.
> 
> Dropped as you didn't also include a 6.18 backport :(

Okay, I talked to Sasha earlier about the soft-dirty backport.

Will wait for it to land in the relevant stable branches before
sending v2 :)

Cheers, Lance


      reply	other threads:[~2026-11-18 14:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-10  1:07 FAILED: patch "[PATCH] mm/ksm: fix userfaultfd protection during merge and unmerge" failed to apply to 6.12-stable tree Sasha Levin
2026-11-11  8:29 ` [PATCH 6.12.y] mm/ksm: fix userfaultfd protection during merge and unmerge Lance Yang
2026-11-18 10:48   ` Greg KH
2026-11-18 14:33     ` Lance Yang [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=3b705a3e-cbc5-42f1-b715-d407c08cdf87@linux.dev \
    --to=lance.yang@linux.dev \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=bgeffon@google.com \
    --cc=bobbypowers@gmail.com \
    --cc=chengming.zhou@linux.dev \
    --cc=corbet@lwn.net \
    --cc=cracauer@cons.org \
    --cc=david@kernel.org \
    --cc=dgilbert@interlog.com \
    --cc=dplotnikov@virtuozzo.com \
    --cc=gokhale2@llnl.gov \
    --cc=gregkh@linuxfoundation.org \
    --cc=hannes@cmpxchg.org \
    --cc=hughd@google.com \
    --cc=jglisse@redhat.com \
    --cc=jthoughton@google.com \
    --cc=kas@kernel.org \
    --cc=liam@infradead.org \
    --cc=ljs@kernel.org \
    --cc=mcfadden8@llnl.gov \
    --cc=med08elkadiri@gmail.com \
    --cc=mgorman@techsingularity.net \
    --cc=mhocko@suse.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=riel@surriel.com \
    --cc=rppt@kernel.org \
    --cc=samarth.colleges@gmail.com \
    --cc=seanjc@google.com \
    --cc=shli@fb.com \
    --cc=sj@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=surenb@google.com \
    --cc=vbabka@kernel.org \
    --cc=xemul@openvz.org \
    --cc=xu.xin@linux.dev \
    --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.