mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Oscar Salvador (SUSE)" <osalvador@kernel.org>
To: "David Hildenbrand (Arm)" <david@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>,
	Oscar Salvador <osalvador@suse.de>,
	Naoya Horiguchi <nao.horiguchi@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Mel Gorman <mgorman@suse.de>, Andy Whitcroft <apw@canonical.com>,
	Miaohe Lin <linmiaohe@huawei.com>, Michal Hocko <mhocko@suse.com>,
	Rik van Riel <riel@surriel.com>, Hugh Dickins <hughd@google.com>,
	Baolin Wang <baolin.wang@linux.alibaba.com>,
	Vivek Kasireddy <vivek.kasireddy@intel.com>,
	Dave Airlie <airlied@redhat.com>, Jason Gunthorpe <jgg@ziepe.ca>,
	Lorenzo Stoakes <ljs@kernel.org>,
	"Liam R. Howlett" <liam@infradead.org>,
	Vlastimil Babka <vbabka@kernel.org>,
	Mike Rapoport <rppt@kernel.org>,
	Suren Baghdasaryan <surenb@google.com>,
	Jonathan Corbet <corbet@lwn.net>,
	Shuah Khan <skhan@linuxfoundation.org>,
	Randy Dunlap <rdunlap@infradead.org>,
	Peter Xu <peterx@redhat.com>, Breno Leitao <leitao@debian.org>,
	Will Deacon <will@kernel.org>,
	"Aneesh Kumar K.V" <aneesh.kumar@kernel.org>,
	Nick Piggin <npiggin@gmail.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Heiko Carstens <hca@linux.ibm.com>,
	Vasily Gorbik <gor@linux.ibm.com>,
	Alexander Gordeev <agordeev@linux.ibm.com>,
	Christian Borntraeger <borntraeger@linux.ibm.com>,
	Sven Schnelle <svens@linux.ibm.com>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	Gerd Hoffmann <kraxel@redhat.com>,
	linux-doc@vger.kernel.org, linux-arch@vger.kernel.org,
	linux-s390@vger.kernel.org, stable@kernel.org,
	Josef Bacik <josef@toxicpanda.com>
Subject: Re: [PATCH v2 08/15] mm/hugetlb: serialize page-cache allocations with truncation
Date: Thu, 19 Nov 2026 10:09:48 +0100	[thread overview]
Message-ID: <av683B0FDj-xB-7w@localhost.localdomain> (raw)
In-Reply-To: <20261116-fixes_hugetlb-v2-8-4dd9e94ea9ac@kernel.org>

On Mon, Nov 16, 2026 at 07:29:29PM +0100, David Hildenbrand (Arm) wrote:
> Truncation can remove an inode reservation while a fault is still
> allocating its folio. UFFDIO_COPY and memfd pinning can also consume
> reservations beyond the new i_size. This can underflow resv_huge_pages
> and leave folios beyond EOF.
> 
> The main issue is that truncation takes the fault mutex for folios in
> the page-cache, but it has no clue about faults that are still being
> processed concurrently.
> 
> Matthew Wilcox raised mapping->invalidate_lock in a different upstream
> hugetlb locking discussion:
> 
>   "although I wonder if we still need the fault mutex array, given that we
>    now have mapping->invalidate_lock?"
> 
> While it likely cannot remove the mutex array entirely (concurrent page
> faults have to sync ... ), we can at least use it to fix this problem.
> 
> Hold mapping->invalidate_lock shared across the size check, allocation
> and page cache insertion or reservation rollback. Truncation takes it
> exclusively around i_size_write() only for now: it waits for concurrent
> allocations to finish updating the page-cache or rolling back reservations
> before changing the size. Subsequent allocations see the updated i_size.
> 
> Let truncation release the lock for now before unmapping and removing
> folios to preserve the existing lock ordering. Cached-folio faults and
> private allocations do not acquire the new lock.
> 
> Use it to synchronize with truncation, keeping the fault mutexes to
> serialize allocations for the same index.
> 
> Locking order is now:
> 
>   fault mutex -> hugetlb VMA lock (read) -> invalidate lock (read) ->
>   folio lock -> PTE lock
> 
> And on truncation:
> 
>   i_rwsem (write) -> invalidate lock (write)
> 
> Add hugetlb_pgoff_valid() to not repeat the same size check multiple
> times. Memfd needs a bit of care, as it traditionally allowed partial
> folios to be pinned: the size check in memfd_pin_folios() allows for
> that.
> 
> Fixes: 1c9e8def43a3 ("userfaultfd: hugetlbfs: add UFFDIO_COPY support for shared mappings")
> Fixes: 188a39725ad7 ("hugetlbfs: revert use i_mmap_rwsem to address page fault/truncate race")
> Fixes: 89c1905d9c14 ("mm/gup: introduce memfd_pin_folios() for pinning memfd folios")
> Cc: stable@kernel.org
> Reported-by: Josef Bacik <josef@toxicpanda.com>
> Link: https://lore.kernel.org/all/ajMfdQf-Fspwmstr@casper.infradead.org/
> Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>

Acked-by: Oscar Salvador (SUSE) <osalvador@kernel.org>

Just one thing:

mm/rmap.c has a description of the lock ordering for hugetlb:

 "
   * hugetlbfs PageHuge() take locks in this order:
   *   hugetlb_fault_mutex (hugetlbfs specific page fault mutex)
   *     vma_lock (hugetlb specific lock for pmd_sharing)
   *       mapping->i_mmap_rwsem (also used for hugetlb pmd sharing)
   *         folio_lock
 "

We should update it to reflect the updated locking order, right?

 

-- 
Oscar Salvador
SUSE Labs

  reply	other threads:[~2026-11-19  9:10 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 18:29 [PATCH v2 00/15] mm/hugetlb: various fixes David Hildenbrand (Arm)
2026-11-16 18:29 ` [PATCH v2 01/15] hugetlbfs: fix integer overflow in fallocate() David Hildenbrand (Arm)
2026-11-16 18:29 ` [PATCH v2 02/15] mm/hugetlb: compare against persistent count when freeing lowmem folios David Hildenbrand (Arm)
2026-11-16 22:24   ` Rik van Riel
2026-11-17 10:11   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 03/15] mm/hugetlb: preserve reservations when shrinking on HIGHMEM David Hildenbrand (Arm)
2026-11-16 22:43   ` Rik van Riel
2026-11-17 10:13   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 04/15] mm/hugetlb: account temporary folios separately David Hildenbrand (Arm)
2026-11-17  8:14   ` Gregory Price (Meta)
2026-11-17 10:16   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 05/15] mm/hugetlb: keep surplus folios when the pool shrinks David Hildenbrand (Arm)
2026-11-18  9:01   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 06/15] mm/hugetlb: fix mremap() racing with page migration David Hildenbrand (Arm)
2026-11-17  8:42   ` Gregory Price (Meta)
2026-11-18  9:02   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 07/15] hugetlbfs: fix unmapping folios from private VMAs David Hildenbrand (Arm)
2026-11-17  8:31   ` Gregory Price (Meta)
2026-11-18  9:03   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 08/15] mm/hugetlb: serialize page-cache allocations with truncation David Hildenbrand (Arm)
2026-11-19  9:09   ` Oscar Salvador (SUSE) [this message]
2026-11-16 18:29 ` [PATCH v2 09/15] mm/memfd: recheck the page cache before allocating a hugetlb folio David Hildenbrand (Arm)
2026-11-17  8:34   ` Gregory Price (Meta)
2026-11-19  9:11   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 10/15] mm/hugetlb: count again if the reserve map shrank David Hildenbrand (Arm)
2026-11-16 18:29 ` [PATCH v2 11/15] hugetlbfs: do not grow a sealed file in mmap() David Hildenbrand (Arm)
2026-11-19  9:19   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 12/15] mm/hugetlb: keep surplus folios that are reserved David Hildenbrand (Arm)
2026-11-19  9:21   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 13/15] mm/hugetlb: fix reservation leak on min_size= mounts David Hildenbrand (Arm)
2026-11-19  9:25   ` Oscar Salvador (SUSE)
2026-11-16 18:29 ` [PATCH v2 14/15] mm/hugetlb: account restored reservations before freeing folios David Hildenbrand (Arm)
2026-11-16 18:29 ` [PATCH v2 15/15] mm/hugetlb: delay anon folio rmap removal until after the TLB flush David Hildenbrand (Arm)
2026-11-17  9:12 ` [PATCH v2 00/15] mm/hugetlb: various fixes 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=av683B0FDj-xB-7w@localhost.localdomain \
    --to=osalvador@kernel.org \
    --cc=agordeev@linux.ibm.com \
    --cc=airlied@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=aneesh.kumar@kernel.org \
    --cc=apw@canonical.com \
    --cc=arnd@arndb.de \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=corbet@lwn.net \
    --cc=david@kernel.org \
    --cc=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=hughd@google.com \
    --cc=jgg@ziepe.ca \
    --cc=josef@toxicpanda.com \
    --cc=kraxel@redhat.com \
    --cc=leitao@debian.org \
    --cc=liam@infradead.org \
    --cc=linmiaohe@huawei.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=ljs@kernel.org \
    --cc=mgorman@suse.de \
    --cc=mhocko@suse.com \
    --cc=muchun.song@linux.dev \
    --cc=nao.horiguchi@gmail.com \
    --cc=npiggin@gmail.com \
    --cc=osalvador@suse.de \
    --cc=peterx@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rdunlap@infradead.org \
    --cc=riel@surriel.com \
    --cc=rppt@kernel.org \
    --cc=skhan@linuxfoundation.org \
    --cc=stable@kernel.org \
    --cc=surenb@google.com \
    --cc=svens@linux.ibm.com \
    --cc=vbabka@kernel.org \
    --cc=vivek.kasireddy@intel.com \
    --cc=will@kernel.org \
    /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

all inboxes | Powered by JetHome®