From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 200E636BCED; Mon, 12 Oct 2026 18:23:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791829433; cv=none; b=hajHjVNxXCOCLTRSRR1oUkbg2jbLu3aYDQ30XTSkTSLHAIVXvoweF/MzKs8Tkex1xCInEn+SnufDGik50tWVlNEvIcEHmhT5zBeyMGyXn7bKUiK7FsZlo4rtKwXNaBqAKoiB3ZJMd4HDc50Z3x2jUp0H3fV5yxYSOT51d5tKNPI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791829433; c=relaxed/simple; bh=xv2Q1TJi8hnNms4cqWT9i9BVf1bf9w2qMHTXDpopIoI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Cf0DiA5WjcFxLmDykB/qEOcBMZgS1nhu2LkesMJ8FGTqgzzzC8EXf6/FYFjg/lgE/6EhVuII+37CLuusEkQJCBaA68JAkX8M5910ZmvXcSyDks1VRAWmZ61oAW0QgkrIQxMNAvFTnj1M7L7aHqhnwytv8TfgmKh/I8H3pa93c8M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AYF/F7fq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AYF/F7fq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECC841F0089B; Mon, 12 Oct 2026 18:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1791829431; bh=37WCeVdlLTRveaVJsSPOSKQC2Vppgq3a3iTQ8o/4uyA=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=AYF/F7fqLNd7h6e/tgtw1sUNYW18ddEXw/2rEyAeYmwhh102XwKLctA9bL9zaPya4 ynOK3Nw2RwXvwkGNGFmbVO4r+0v1EZXqh4DY9tZyMbh3SG3hn/Ud6M0IKSPvCePMhY zJxoop/oPTaRAsS1MG3Ax3decQ4U+Xt67Z93r5JYsn0iPPqDOCHxaVesVM58eSfPr4 1fJrwl8WiJqz2PSFhVE7ES1tqCpJRFbOQ/WClqMcVpVdCtBB9xKVbDUDY8fR4bB8+n eAo53kC+TloDeXdisLy9hXAVc/lOE3GDoP8OC/3GC2sBJ2G1q+vh30Dpaiz0XXBlNd PkM7H9/ss4GSg== Message-ID: <50c967fb-b6de-4189-9430-5455c26a5385@kernel.org> Date: Mon, 12 Oct 2026 20:23:15 +0200 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 23/38] mm/mlock: eliminate weird VMA_IO_BIT abuse and simplify To: "Lorenzo Stoakes (ARM)" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Jonathan Corbet , Greg Kroah-Hartman , Dennis Dalessandro , Jason Gunthorpe , Leon Romanovsky , Paul Moore , Stephen Smalley , Jaroslav Kysela , Takashi Iwai , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Usama Arif , Kiryl Shutsemau , Doug Gilbert , "James E.J. Bottomley" , "Martin K. Petersen" , Simona Vetter , Helge Deller , Sebastian Reichel , John Hubbard , Peter Xu , Masami Hiramatsu , Oleg Nesterov , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Rik van Riel , Harry Yoo , Juri Lelli , Vincent Guittot , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Will Deacon , "Aneesh Kumar K.V" , Nick Piggin , Arnd Bergmann , Muchun Song , Oscar Salvador , "Matthew Wilcox (Oracle)" , Jan Kara , Marc Zyngier , Oliver Upton , Catalin Marinas , Madhavan Srinivasan , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , "David S. Miller" , Andreas Larsson , Alexander Viro , Christian Brauner , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Youngjun Park , Johannes Weiner , Qi Zheng , Shakeel Butt , Axel Rasmussen , Yuanchu Xie , Wei Xu , Chengming Zhou , Michal Hocko , Miklos Szeredi , Xu Xin Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-usb@vger.kernel.org, linux-rdma@vger.kernel.org, selinux@vger.kernel.org, linux-sound@vger.kernel.org, bpf@vger.kernel.org, linux-scsi@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, fuse-devel@lists.linux.dev, Ihor Solodrai , Bert Karwatzki References: <20261009-b4-mmap-prepare-vma-flag-sanify-v5-0-923b70125b1e@kernel.org> <20261009-b4-mmap-prepare-vma-flag-sanify-v5-23-923b70125b1e@kernel.org> From: "David Hildenbrand (Arm)" Content-Language: en-US Autocrypt: addr=david@kernel.org; keydata= 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 qIws/H2t In-Reply-To: <20261009-b4-mmap-prepare-vma-flag-sanify-v5-23-923b70125b1e@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 10/9/26 20:04, Lorenzo Stoakes (ARM) wrote: > When performing mlock() or munlock() otherwise normal VMAs have VMA_IO_BIT > solely to fix a race with migration which might otherwise double-count > mlock VMAs. > > This is unnecessary - at the point of applying folio mlock state, whether > setting or clearing PG_mlocked, we know whether or not we are locking. > > Solve this in two ways - thread a boolean through the page table walk > indicating whether a lock or unlock is being performed, and run a locking > walk with VMA_LOCKONFAULT_BIT set and VMA_LOCKED_BIT cleared. > > This state never occurs otherwise, as VMA_LOCKONFAULT_BIT always implies > VMA_LOCKED_BIT. These are also always cleared together. > > Then, update folio_add_lru_vma() and mlock_folio() to check only for > VMA_LOCKED_BIT, and update try_to_unmap_one() to check for VMA_LOCKED_MASK > instead. > > Also remove the useless invocation of allow_mlock_munlock() which simply > returns true if unlocking and instead rename it to allow_mlock() and only > call it when locking. > > With the other mlock abuse of VMA_IO_BIT addressed, update > mlock_vma_folio() and folio_add_lru_vma() to simply test for > VMA_LOCKED_BIT. > > The munlock_vma_folio() function tests VMA_LOCKED_MASK instead, as an > unmap racing with the locking walk must still munlock folios the walk has > already counted. > > Additionally, in order to ensure a racing unmap/migration releases the > reference munlock_folio() took (whose put was batched), check > VMA_LOCKED_MASK before calling mlock_drain_local() in try_to_unmap_one() > and try_to_migrate_one(). > > While here, also replace some deprecated VMA flag predicates. > > Reviewed-by: Zi Yan > Signed-off-by: Lorenzo Stoakes (ARM) > --- > mm/folio.c | 2 +- > mm/internal.h | 10 +++++++--- > mm/mlock.c | 51 +++++++++++++++++++-------------------------------- > mm/rmap.c | 8 +++++--- > 4 files changed, 32 insertions(+), 39 deletions(-) > > diff --git a/mm/folio.c b/mm/folio.c > index 47a437e0f7fd..35e242b48870 100644 > --- a/mm/folio.c > +++ b/mm/folio.c > @@ -505,7 +505,7 @@ void folio_add_lru_vma(struct folio *folio, struct vm_area_struct *vma) > { > VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); > > - if (unlikely((vma->vm_flags & (VM_LOCKED | VM_SPECIAL)) == VM_LOCKED)) > + if (vma_test(vma, VMA_LOCKED_BIT)) > mlock_new_folio(folio); > else > folio_add_lru(folio); > diff --git a/mm/internal.h b/mm/internal.h > index 4ae08fedffff..ea8fa94ebe1b 100644 > --- a/mm/internal.h > +++ b/mm/internal.h > @@ -970,8 +970,7 @@ void mlock_folio(struct folio *folio); > static inline void mlock_vma_folio(struct folio *folio, > struct vm_area_struct *vma) > { > - /* The VM_IO check prevents migration from double-counting during mlock. */ > - if (unlikely((vma->vm_flags & (VM_LOCKED|VM_SPECIAL)) == VM_LOCKED)) > + if (vma_test(vma, VMA_LOCKED_BIT)) > mlock_folio(folio); > } > > @@ -988,7 +987,12 @@ static inline void munlock_vma_folio(struct folio *folio, > * always munlock the folio and page reclaim will correct it > * if it's wrong. > */ > - if (unlikely(vma->vm_flags & VM_LOCKED)) > + /* > + * VMA_LOCKONFAULT_BIT alone marks an mlock walk in progress, see > + * mlock_vma_pages_range(). An unmap racing with the walk must still > + * munlock folios the walk has already counted. > + */ > + if (unlikely(vma_test_any_mask(vma, VMA_LOCKED_MASK))) > munlock_folio(folio); > } > > diff --git a/mm/mlock.c b/mm/mlock.c > index 39215a3eab1f..4235a1518fc9 100644 > --- a/mm/mlock.c > +++ b/mm/mlock.c > @@ -316,22 +316,10 @@ static inline unsigned int folio_mlock_step(struct folio *folio, > return folio_pte_batch(folio, pte, ptent, count); > } > > -static inline bool allow_mlock_munlock(struct folio *folio, > +static inline bool allow_mlock(struct folio *folio, > struct vm_area_struct *vma, unsigned long start, > unsigned long end, unsigned int step) > { > - /* > - * For unlock, allow munlock large folio which is partially > - * mapped to VMA. As it's possible that large folio is > - * mlocked and VMA is split later. > - * > - * During memory pressure, such kind of large folio can > - * be split. And the pages are not in VM_LOCKed VMA > - * can be reclaimed. > - */ > - if (!vma_test(vma, VMA_LOCKED_BIT)) > - return true; > - > /* folio_within_range() cannot take KSM, but any small folio is OK */ > if (!folio_test_large(folio)) > return true; > @@ -352,6 +340,7 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, > > { > struct vm_area_struct *vma = walk->vma; > + const bool lock = walk->private; > spinlock_t *ptl; > pte_t *start_pte, *pte; > pte_t ptent; > @@ -368,7 +357,7 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, > folio = pmd_folio(*pmd); > if (folio_is_zone_device(folio)) > goto out; > - if (vma_test(vma, VMA_LOCKED_BIT)) > + if (lock) > mlock_folio(folio); > else > munlock_folio(folio); > @@ -390,10 +379,10 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, > continue; > > step = folio_mlock_step(folio, pte, addr, end); > - if (!allow_mlock_munlock(folio, vma, start, end, step)) > + if (lock && !allow_mlock(folio, vma, start, end, step)) > goto next_entry; > > - if (vma_test(vma, VMA_LOCKED_BIT)) > + if (lock) > mlock_folio(folio); > else > munlock_folio(folio); > @@ -428,31 +417,29 @@ static void mlock_vma_pages_range(struct vm_area_struct *vma, > .pmd_entry = mlock_pte_range, > .walk_lock = PGWALK_WRLOCK_VERIFY, > }; > + const bool lock = vma_flags_test(new_vma_flags, VMA_LOCKED_BIT); > + vma_flags_t walk_flags = *new_vma_flags; > > /* > - * There is a slight chance that concurrent page migration, > - * or page reclaim finding a page of this now-VMA_LOCKED_BIT vma, > - * will call mlock_vma_folio() and raise page's mlock_count: > - * double counting, leaving the page unevictable indefinitely. > - * Communicate this danger to mlock_vma_folio() with VMA_IO_BIT, > - * which is a VMA_SPECIAL_FLAGS flag not allowed on VMA_LOCKED_BIT vmas. > - * mmap_lock is held in write mode here, so this weird > - * combination should not be visible to other mmap_lock users; > - * but WRITE_ONCE so rmap walkers must see VMA_IO_BIT if VMA_LOCKED_BIT. > + * LOCKONFAULT without LOCKED never otherwise occurs: it marks a walk in > + * progress so that rmap-side callers, which test VMA_LOCKED_BIT, do not > + * count folios, while try_to_unmap_one(), which tests VMA_LOCKED_MASK, > + * still refuses to unmap them. > */ > - if (vma_flags_test(new_vma_flags, VMA_LOCKED_BIT)) > - vma_flags_set(new_vma_flags, VMA_IO_BIT); > + if (lock) { > + vma_flags_clear(&walk_flags, VMA_LOCKED_BIT); > + vma_flags_set(&walk_flags, VMA_LOCKONFAULT_BIT); > + } > + > vma_start_write(vma); > - vma_flags_reset_once(vma, new_vma_flags); > + vma_flags_reset_once(vma, &walk_flags); > > lru_add_drain(); > - walk_page_range_vma(vma, start, end, &mlock_walk_ops, NULL); > + walk_page_range_vma(vma, start, end, &mlock_walk_ops, (void *)lock); > lru_add_drain(); > > - if (vma_flags_test(new_vma_flags, VMA_IO_BIT)) { > - vma_flags_clear(new_vma_flags, VMA_IO_BIT); > + if (lock) > vma_flags_reset_once(vma, new_vma_flags); > - } > } > > /* > diff --git a/mm/rmap.c b/mm/rmap.c > index 5332c52909be..b4a4b3929044 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -2239,9 +2239,11 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, > > /* > * If the folio is in an mlock()d vma, we must not swap it out. > + * VMA_LOCKONFAULT_BIT alone marks an mlock walk in progress, see > + * mlock_vma_pages_range(). > */ > if (!(flags & TTU_IGNORE_MLOCK) && > - (vma->vm_flags & VM_LOCKED)) { > + vma_test_any_mask(vma, VMA_LOCKED_MASK)) { > ptes++; > > /* > @@ -2395,7 +2397,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, > } > finish_unmap: > folio_remove_rmap_ptes(folio, page, nr_pages, vma); > - if (vma->vm_flags & VM_LOCKED) > + if (vma_test_any_mask(vma, VMA_LOCKED_MASK)) > mlock_drain_local(); > folio_put_refs(folio, nr_pages); > > @@ -2770,7 +2772,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, > hugetlb_remove_rmap(folio); > else > folio_remove_rmap_pte(folio, subpage, vma); > - if (vma->vm_flags & VM_LOCKED) > + if (vma_test_any_mask(vma, VMA_LOCKED_MASK)) > mlock_drain_local(); > folio_put(folio); > } > The mlock.c changes are a bit over my head (mostly the old VM_IO handling ...), but it looks good from what I can tell (hoping Hugh could review ...) Acked-by: David Hildenbrand (Arm) -- Cheers, David