From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 86F9E37DE89 for ; Tue, 7 Apr 2026 21:43:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775598182; cv=none; b=TyCJG+4q8LrxAAhTV5FmMMSzEHAjSLvzXuPxL9/VWeP7kWndiOlqKXYej4ANawfmTk3TwvzDbUQQEZU5pyQYcFcBrGEkmCpF0Ny2T8zAoxod1uU2AbOudagYby6tVnHJsXq6DVNAeRgI6yWEJ8v+zBG+O5d/7dFaLtt7baD+Y1A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775598182; c=relaxed/simple; bh=Jzj9VL/ne4HAC8Uu0kWPWPs9BChKAOI+YBOIl8kJd7A=; h=Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References: Mime-Version:Content-Type; b=ZvkrVSDTHmC7tf0HwsidQHH20s4EzMkAmF6jVG6GNDJFbyEM0ZAmX4AIdG13wOBXFpjMRs6Nye1vf5Gqg2NQP8zalNP+u2ydV63zmE2nxkMEPxtJMSit5qgimsx272DbM4jRoO/ukNL2q7wNZx3MT8LPLPgSaX+FJyJY2X5Nmts= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=D26D8gOg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="D26D8gOg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C8C8C19421; Tue, 7 Apr 2026 21:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1775598182; bh=Jzj9VL/ne4HAC8Uu0kWPWPs9BChKAOI+YBOIl8kJd7A=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=D26D8gOgBYtI9taH8eQ4kzyi2d8YxkZt8dSUwKgAIsKyai5Pvavyf/lTEVNg0+rSx qXAiAuDFxir6oTPrOR+KcHn93C4TOIONsOi6a9mfJaFjrtAXVoEHVVpTDpDfwaCinp zB6ialuk5Pk2obvLcr9QSOS73hKuFBvypa2DqZMU= Date: Tue, 7 Apr 2026 14:42:59 -0700 From: Andrew Morton To: "Lorenzo Stoakes (Oracle)" Cc: Nico Pache , "David Hildenbrand (Arm)" , linux-kernel@vger.kernel.org, linux-mm@kvack.org, aarcange@redhat.com, anshuman.khandual@arm.com, apopple@nvidia.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, byungchul@sk.com, catalin.marinas@arm.com, cl@gentwo.org, corbet@lwn.net, dave.hansen@linux.intel.com, dev.jain@arm.com, gourry@gourry.net, hannes@cmpxchg.org, hughd@google.com, jackmanb@google.com, jack@suse.cz, jannh@google.com, jglisse@google.com, joshua.hahnjy@gmail.com, kas@kernel.org, lance.yang@linux.dev, Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, mathieu.desnoyers@efficios.com, matthew.brost@intel.com, mhiramat@kernel.org, mhocko@suse.com, peterx@redhat.com, pfalcato@suse.de, rakie.kim@sk.com, raquini@redhat.com, rdunlap@infradead.org, richard.weiyang@gmail.com, rientjes@google.com, rostedt@goodmis.org, rppt@kernel.org, ryan.roberts@arm.com, shivankg@amd.com, sunnanyong@huawei.com, surenb@google.com, thomas.hellstrom@linux.intel.com, tiwai@suse.de, usamaarif642@gmail.com, vbabka@suse.cz, vishal.moola@gmail.com, wangkefeng.wang@huawei.com, will@kernel.org, willy@infradead.org, yang@os.amperecomputing.com, ying.huang@linux.alibaba.com, ziy@nvidia.com, zokeefe@google.com Subject: Re: [PATCH mm-unstable v4 5/5] mm/khugepaged: unify khugepaged and madv_collapse with collapse_single_pmd() Message-Id: <20260407144259.011a26666eff9c96d74e39a2@linux-foundation.org> In-Reply-To: References: <7760c811-e100-4d40-9217-0813c28314be@lucifer.local> <0223d45b-e8b4-49a7-882b-477250d0c14d@kernel.org> <26fcec86-ee78-4f5c-8ca5-0e6230699cfd@kernel.org> <440d6b8a-d299-43eb-83b5-6625f9468e5e@lucifer.local> <37132e09-9c03-4afc-bc73-4bca416c5343@kernel.org> <9d5a4703-a15e-4be6-926b-af2d98db40c0@kernel.org> <87b83f7b-f0b1-4184-93a0-3b4b574c813b@lucifer.local> <20260401133145.90b094a7b87bdceb0013b5af@linux-foundation.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Tue, 7 Apr 2026 09:38:19 +0100 "Lorenzo Stoakes (Oracle)" wrote: > On Wed, Apr 01, 2026 at 01:31:45PM -0700, Andrew Morton wrote: > > On Wed, 1 Apr 2026 09:14:35 +0100 "Lorenzo Stoakes (Oracle)" wrote: > > > > > From: "Lorenzo Stoakes (Oracle)" > > > Date: Tue, 31 Mar 2026 13:11:18 +0100 > > > Subject: [PATCH] mm/khugepaged: fix issue with tracking lock > > > > > > We are incorrectly treating lock_dropped to track both whether the lo= ck is > > > currently held and whether or not the lock was ever dropped. > > > > > > Update this change to account for this. > > > > > > Signed-off-by: Lorenzo Stoakes (Oracle) > > > > Not sure if I should add this? > > > > Should it have > > > > Fixes: 330f3758a3bc ("mm/khugepaged: unify khugepaged and madv_collapse > > with collapse_single_pmd()")? >=20 > (Sorry only just noticed this) >=20 > I mean we do need this patch, if you plan to do this as a fix follow up t= hen > should have a fixed tag, but I do worry about bisection hazard by leaving= this > as-is. >=20 > We definitely either need this patch folded in or as a fix that gets sent > alongside the change. I added this to mm-stable a couple of days ago as 5a62019807da ("mm/khugepaged: fix issue with tracking lock"), below. It does have the Fixes: so I think we're good. commit 5a62019807da4a7add0717c962ac83b23dd12b2c Author: Lorenzo Stoakes (Oracle) Date: Tue Mar 31 13:11:18 2026 +0100 mm/khugepaged: fix issue with tracking lock =20 We are incorrectly treating lock_dropped to track both whether the lock= is currently held and whether or not the lock was ever dropped. =20 Update this change to account for this. =20 Link: https://lkml.kernel.org/r/7760c811-e100-4d40-9217-0813c28314be@lu= cifer.local Fixes: 330f3758a3bc ("mm/khugepaged: unify khugepaged and madv_collapse= with collapse_single_pmd()") Signed-off-by: Lorenzo Stoakes (Oracle) Reviewed-by: Lance Yang Reviewed-by: Nico Pache Cc: Alistair Popple Cc: Andrea Arcangeli Cc: Anshuman Khandual Cc: Baolin Wang Cc: Barry Song Cc: Brendan Jackman Cc: Byungchul Park Cc: Catalin Marinas Cc: David Hildenbrand Cc: David Rientjes Cc: Dev Jain Cc: Gregory Price Cc: "Huang, Ying" Cc: Hugh Dickins Cc: Jan Kara Cc: Jann Horn Cc: Johannes Weiner Cc: Jonathan Corbet Cc: Joshua Hahn Cc: Kefeng Wang Cc: Liam Howlett Cc: "Masami Hiramatsu (Google)" Cc: Mathieu Desnoyers Cc: Matthew Brost Cc: Matthew Wilcox (Oracle) Cc: Michal Hocko Cc: Mike Rapoport Cc: Nanyong Sun Cc: Pedro Falcato Cc: Peter Xu Cc: Rafael Aquini Cc: Rakie Kim Cc: Randy Dunlap Cc: Ryan Roberts Cc: Shivank Garg Cc: Steven Rostedt Cc: Suren Baghdasaryan Cc: Takashi Iwai (SUSE) Cc: Thomas Hellstr=F6m Cc: Usama Arif Cc: Vishal Moola (Oracle) Cc: Vlastimil Babka Cc: Wei Yang Cc: Will Deacon Cc: Yang Shi Cc: Zach O'Keefe Cc: Zi Yan Signed-off-by: Andrew Morton diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d21348b85a59..b8452dbdb043 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2828,6 +2828,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsi= gned long start, unsigned long hstart, hend, addr; enum scan_result last_fail =3D SCAN_FAIL; int thps =3D 0; + bool mmap_unlocked =3D false; =20 BUG_ON(vma->vm_start > start); BUG_ON(vma->vm_end < end); @@ -2850,10 +2851,11 @@ int madvise_collapse(struct vm_area_struct *vma, un= signed long start, for (addr =3D hstart; addr < hend; addr +=3D HPAGE_PMD_SIZE) { enum scan_result result =3D SCAN_FAIL; =20 - if (*lock_dropped) { + if (mmap_unlocked) { cond_resched(); mmap_read_lock(mm); - *lock_dropped =3D false; + mmap_unlocked =3D false; + *lock_dropped =3D true; result =3D hugepage_vma_revalidate(mm, addr, false, &vma, cc); if (result !=3D SCAN_SUCCEED) { @@ -2864,7 +2866,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsi= gned long start, hend =3D min(hend, vma->vm_end & HPAGE_PMD_MASK); } =20 - result =3D collapse_single_pmd(addr, vma, lock_dropped, cc); + result =3D collapse_single_pmd(addr, vma, &mmap_unlocked, cc); =20 switch (result) { case SCAN_SUCCEED: @@ -2893,8 +2895,10 @@ int madvise_collapse(struct vm_area_struct *vma, uns= igned long start, =20 out_maybelock: /* Caller expects us to hold mmap_lock on return */ - if (*lock_dropped) + if (mmap_unlocked) { + *lock_dropped =3D true; mmap_read_lock(mm); + } out_nolock: mmap_assert_locked(mm); mmdrop(mm);