mm-add-an-explicit-smp_wmb-to-uffdio_continue.patch removed from -mm tree
The quilt patch titled
Subject: mm: add an explicit smp_wmb() to UFFDIO_CONTINUE
has been removed from the -mm tree. Its filename was
mm-add-an-explicit-smp_wmb-to-uffdio_continue.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: James Houghton <[email protected]>
Subject: mm: add an explicit smp_wmb() to UFFDIO_CONTINUE
Date: Thu, 7 Mar 2024 01:02:50 +0000
Users of UFFDIO_CONTINUE may reasonably assume that a write memory barrier is included as part of UFFDIO_CONTINUE. That is, a user may believe that all writes it has done to a page that it is now UFFDIO_CONTINUE'ing are guaranteed to be visible to anyone subsequently reading the page through the newly mapped virtual memory region.
Today, such a user happens to be correct. mmget_not_zero(), for example, is called as part of UFFDIO_CONTINUE (and comes before any PTE updates), and it implicitly gives us a write barrier.
To be resilient against future changes, include an explicit smp_wmb(). While we're at it, optimize the smp_wmb() that is already incidentally present for the HugeTLB case.
Merely making a syscall does not generally imply the memory ordering constraints that we need (including on x86).
---
mm/hugetlb.c | 17 +++++++++++++---- mm/userfaultfd.c | 9 +++++++++ 2 files changed, 22 insertions(+), 4 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-add-an-explicit-smp_wmb-to-uffdio_continue +13 -4
@@ -6780,11 +6780,20 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_ }/* -* The memory barrier inside __folio_mark_uptodate makes sure that -* preceding stores to the page contents become visible before -* the set_pte_at() write. +* If we just allocated a new page, we need a memory barrier to ensure +* that preceding stores to the page become visible before the +* set_pte_at() write. The memory barrier inside __folio_mark_uptodate +* is what we need. +* +* In the case where we have not allocated a new page (is_continue), +* the page must already be uptodate. UFFDIO_CONTINUE already includes +* an earlier smp_wmb() to ensure that prior stores will be visible +* before the set_pte_at() write. */ -__folio_mark_uptodate (folio); +if (!is_continue) +__folio_mark_uptodate (folio); +else +WARN_ON_ONCE (!folio_test_uptodate (folio));/* Add shared, newly allocated pages to the page cache. */ if (vm_shared && !is_continue) {
mm/userfaultfd.c renamed from mm/userfaultfd.c~mm-add-an-explicit-smp_wmb-to-uffdio_continue +9 -0
@@ -845,6 +845,15 @@ ssize_t mfill_atomic_zeropage(struct usessize_t mfill_atomic_continue (struct userfaultfd_ctx *ctx,unsigned long start,unsigned long len,uffd_flags_t flags) { + +/* +* A caller might reasonably assume that UFFDIO_CONTINUE contains an +* smp_wmb() to ensure that any writes to the about-to-be-mapped page by +* the thread doing the UFFDIO_CONTINUE are guaranteed to be visible to +* subsequent loads from the page through the newly mapped address range. +*/ +smp_wmb (); +return mfill_atomic (ctx, start,0 , len,uffd_flags_set_mode (flags,MFILL_ATOMIC_CONTINUE )); }
_
Patches currently in -mm which might be from [email protected] are