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 974903659F4 for ; Wed, 1 Apr 2026 07:05:55 +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=1775027155; cv=none; b=T1KxSn9mk6l+9MxifNA6qTZ0MYtQRog5/s5OpvKRWvv6qNrmVwB0dzaz7MzMjgQqyUe6r/TEWuPxOJwhaw1sC5ggFdunLI958/rvt0u5zsrDx15Giw5cerHIC4pRcCjfU2evCvrRI7eV3GQZVKYA2AJal2iLXV99Fm24pgIROMs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775027155; c=relaxed/simple; bh=c3l6MPA4k0TQ0xyReyvOamQy+3h8kUAjazcvuAgobGE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=EhMrbgacQuWUe5thK0QqdNH7H45uaTJ+RJdyBlrtG9DS2iZJVqVHp0vYX+BNahktjB+1xDg3xz2FuEiyB0obLNS1Pv3PgXVCiE5TD4nes3nLkpniO3198STk5RwiC9PBD+cprKopqOvhTnG2+QSueKSBqC83MhNqkiXmo6kJEMc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TkQVQASh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TkQVQASh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01500C2BC9E; Wed, 1 Apr 2026 07:05:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775027155; bh=c3l6MPA4k0TQ0xyReyvOamQy+3h8kUAjazcvuAgobGE=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=TkQVQASh19TdIE+kSJCQVylESD/gh9WNHjm+1ZaxFTtvW/Tm88WijUSmhVopEuP7Q P6m9W2moTIeXZcx1kzsNkFvwnT3ubCqFs19USnBKKTEJLVv16VDsR0kGy/II0S177L AcXrm4yLCQudSpD3y/RjZ86rarGElt+/x5rynEI1oUKEODe6e0HQu/odmnwT5yS67v H6CsFr+QoA7JliPDDu5IWdSAKfRyD17zHFHS/M1C8X1wMFeXs54/stDLEdaa/SFhoc gnJnjlK1S1Il7UJuIZyssypjNbnuk9h/BtAAfLphXMqayX1r9Y1Rcavw/NIH3yjJM1 Yyg6bBB8fMPxw== Message-ID: <1cdec848-4822-402d-91fb-50237488aec3@kernel.org> Date: Wed, 1 Apr 2026 09:05:39 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH mm-unstable v4 5/5] mm/khugepaged: unify khugepaged and madv_collapse with collapse_single_pmd() To: Nico Pache , Andrew Morton Cc: "Lorenzo Stoakes (Oracle)" , 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 References: <20260325114022.444081-1-npache@redhat.com> <20260325114022.444081-6-npache@redhat.com> <7760c811-e100-4d40-9217-0813c28314be@lucifer.local> <0223d45b-e8b4-49a7-882b-477250d0c14d@kernel.org> <26fcec86-ee78-4f5c-8ca5-0e6230699cfd@kernel.org> <20260331143538.f41a5fef4201a7384388f31c@linux-foundation.org> From: "David Hildenbrand (Arm)" Content-Language: en-US Autocrypt: addr=david@kernel.org; keydata= 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 qIws/H2t In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 3/31/26 23:49, Nico Pache wrote: > On Tue, Mar 31, 2026 at 3:35 PM Andrew Morton wrote: >> >> On Tue, 31 Mar 2026 22:00:58 +0200 "David Hildenbrand (Arm)" wrote: >> >>> >>> Right. >>> >>> The original code used >>> >>> bool mmap_locked = true; >>> >>> If the fix get squashed, maybe we should revert to that handling to >>> minimize the churn? >>> >>> (this is not in stable, right?) >> >> "mm/khugepaged: unify khugepaged and madv_collapse with >> collapse_single_pmd(): is presently in mm-stable. >> >> Doing a big rebase&rework isn't the done thing, I believe. So queue it >> afterwards, add the Fixes: and tolerate the minor runtime bisection >> hole. It ends up looking like a later hotfix. >> >> >> Below is what I added to mm-unstable. I added a note-to-self to check >> in on Nico's question at >> https://lore.kernel.org/all/CAA1CXcCYLGQBy9nT-MSTPVK=XgWWtD6Af-QiA_6pXtM_2pybPg@mail.gmail.com/T/#u >> >> >> From: "Lorenzo Stoakes (Oracle)" >> Subject: mm/khugepaged: fix issue with tracking lock >> Date: Tue, 31 Mar 2026 13:11:18 +0100 >> >> We are incorrectly treating lock_dropped to track both whether the lock is >> currently held and whether or not the lock was ever dropped. >> >> Update this change to account for this. >> >> Link: https://lkml.kernel.org/r/7760c811-e100-4d40-9217-0813c28314be@lucifer.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 >> ... >> Signed-off-by: Andrew Morton >> --- >> >> mm/khugepaged.c | 12 ++++++++---- >> 1 file changed, 8 insertions(+), 4 deletions(-) >> >> --- a/mm/khugepaged.c~mm-khugepaged-fix-issue-with-tracking-lock >> +++ a/mm/khugepaged.c >> @@ -2828,6 +2828,7 @@ int madvise_collapse(struct vm_area_stru >> unsigned long hstart, hend, addr; >> enum scan_result last_fail = SCAN_FAIL; >> int thps = 0; >> + bool mmap_unlocked = false; >> >> BUG_ON(vma->vm_start > start); >> BUG_ON(vma->vm_end < end); >> @@ -2850,10 +2851,11 @@ int madvise_collapse(struct vm_area_stru >> for (addr = hstart; addr < hend; addr += HPAGE_PMD_SIZE) { >> enum scan_result result = SCAN_FAIL; >> >> - if (*lock_dropped) { >> + if (mmap_unlocked) { >> cond_resched(); >> mmap_read_lock(mm); >> - *lock_dropped = false; >> + mmap_unlocked = false; >> + *lock_dropped = true; >> result = hugepage_vma_revalidate(mm, addr, false, &vma, >> cc); >> if (result != SCAN_SUCCEED) { >> @@ -2864,7 +2866,7 @@ int madvise_collapse(struct vm_area_stru >> hend = min(hend, vma->vm_end & HPAGE_PMD_MASK); >> } >> >> - result = collapse_single_pmd(addr, vma, lock_dropped, cc); >> + result = collapse_single_pmd(addr, vma, &mmap_unlocked, cc); >> >> switch (result) { >> case SCAN_SUCCEED: >> @@ -2893,8 +2895,10 @@ int madvise_collapse(struct vm_area_stru >> >> out_maybelock: >> /* Caller expects us to hold mmap_lock on return */ >> - if (*lock_dropped) >> + if (mmap_unlocked) { >> + *lock_dropped = true; > > Hmm this was =false in David's example and = true here? Now i am also > confused hahaha. It seems Lorenzo's code is correct. I think i > responded to my own code changes, when I thought David was replying to > Lorenzo's. I think I messed up that in my posting when manually applying :) So this here is correct. -- Cheers, David