From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9B6BC83030 for ; Fri, 4 Jul 2025 03:50:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E6C1440149; Thu, 3 Jul 2025 23:50:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5BE738E0009; Thu, 3 Jul 2025 23:50:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FC5D440149; Thu, 3 Jul 2025 23:50:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 324FA8E0009 for ; Thu, 3 Jul 2025 23:50:56 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D13915F67F for ; Fri, 4 Jul 2025 03:50:55 +0000 (UTC) X-FDA: 83625206070.03.19FC725 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by imf28.hostedemail.com (Postfix) with ESMTP id 6950DC0002 for ; Fri, 4 Jul 2025 03:50:51 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=n34oYlZR; spf=pass (imf28.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751601054; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yHDmb/fL/3il1yTYD1XOilCS3c3ADIw5upWHt8Gdf8g=; b=0sL3lHPOt1qYswEDtiboeUipEKray4gm92RIssvFhT2IU+USGaUQ7CB2E5a7gjGg+qCJAG P3qCX9jzYhgYKmW2WQHfMNv/zqEDx3UCSOoaQsAnJ8j7Vt9nBOatrH2RCRvzO/tgHwC8ax 8l1bcWqxxjTGYcsrItRGzqiIZpGW300= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=n34oYlZR; spf=pass (imf28.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751601054; a=rsa-sha256; cv=none; b=0MRc6qqdeWi1YT/YZ0TOQMn4OIEJ/O6xYAHoPWJRw9r+BNm7jmbyv7PTIpnvd8DJAvyz2Q HYR3eVF9Z7+2iS/uTKKnEDk1htmA7DUtY9mhR6VoNSwNo+CphzTo3WebkwUL5NX1mPWu1Q NusUjKGgDSQ5vp6qzDxKV/VhYa43XgM= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1751601048; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=yHDmb/fL/3il1yTYD1XOilCS3c3ADIw5upWHt8Gdf8g=; b=n34oYlZRWGrQDBAatQkogzVjpo3anB6Cs/uvPE0f4fiN50foP0KltbzczOjumhBYvEW7HFCm1j9MkDmC3uVAv2IcC1o5hOs3i1I1jQwwAOKxMk6O1bEJiVrFxU9O3/sI33aqLjTfszP+mjSvw6/ZADDpGcZqEK2Q3pfan0GAwJo= Received: from 30.74.144.116(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Wh94Dzl_1751601045 cluster:ay36) by smtp.aliyun-inc.com; Fri, 04 Jul 2025 11:50:46 +0800 Message-ID: Date: Fri, 4 Jul 2025 11:50:45 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v8 02/15] introduce khugepaged_collapse_single_pmd to unify khugepaged and madvise_collapse To: Nico Pache , linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: david@redhat.com, ziy@nvidia.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, ryan.roberts@arm.com, dev.jain@arm.com, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, akpm@linux-foundation.org, baohua@kernel.org, willy@infradead.org, peterx@redhat.com, wangkefeng.wang@huawei.com, usamaarif642@gmail.com, sunnanyong@huawei.com, vishal.moola@gmail.com, thomas.hellstrom@linux.intel.com, yang@os.amperecomputing.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, raquini@redhat.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, tiwai@suse.de, will@kernel.org, dave.hansen@linux.intel.com, jack@suse.cz, cl@gentwo.org, jglisse@google.com, surenb@google.com, zokeefe@google.com, hannes@cmpxchg.org, rientjes@google.com, mhocko@suse.com, rdunlap@infradead.org References: <20250702055742.102808-1-npache@redhat.com> <20250702055742.102808-3-npache@redhat.com> From: Baolin Wang In-Reply-To: <20250702055742.102808-3-npache@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 6950DC0002 X-Stat-Signature: rrn8cpgby5ydy6wsbjnf45qraurqjy64 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1751601051-338303 X-HE-Meta: U2FsdGVkX18tB+Trt68dEwe1+hquftm4BS8K2CnDy4L6so7Rp1At7H9aOgRoLGnXQ24vwU0G3KVca6mHJXF8FGv0yhxFUEMnnn6vau0+iDhQ/bAJpu4A80YxRHEpGluv48x6bHVQ4oc5bEbDE7muV3iy5JdFlBIv8/LqVnUAzdFwBz87uMHjNjwAk1qMS4Q7S543SWUyj1dS6OWFVPMRleRKDZVvds0OpMQD0UmdiSC5mveHVHPeuUFno+YJbTpLXXyallzQe21MWwsjr3H64K1bfPVDpicIBNcANOXjog1Q86AjYDJmf9ejuhys8vIsWqa+ZY0VOt7XS7bJz/aMAmojgXAqlKE5zw/mKi8x20RaWggfprk2pVvNknLcO0UpmXjsa6Xxtu+wzNuNdwg8xyn8rLZoJMpeKsAaYEmvtiOgucg5zd5r1Vbhy5EN6aBwQ28QuIRmNAXUI/0gza5nkKNO9oqjlD0IdrAA2GOAazRiPH6qW4S4EPbOUqSjMi6HMEmT+iBzTZcw1ikmBLRiF4CgfdYTGH3ExaUk9IwhQEntc9kqLZ3YAABM5N1VT5qBctIcTNkYOG85rK/3CIFYu8H/aRF2dKDM2BtA17drBx/Vf2O1h7YEIx9dlv/ktM9kCqwioteAlY6gFD1pq4w6J5n5KdbQ75OVqEzGVpi+LgKAIOdtZQ0LCVAhjKGJ9stvwsyZdLRQB7vBzK5//1EjktIoeRt0jlueYJ8ZxfRySDaF3sOv0vaVegJq/dWH+thfMwI+Z6suVkPwhj6voqzgMdfF7Jjah+grWyd9B57YA4JgD/3czLXMDkLQlRSbTOoSR9ls3YQ18SMDJ11dD5rXTjoJTRDENHLnYSP6vrwoqNkG25M6qDs0p6Qh1UHUEouPVsJ8Ya9SHuG9M+rfGTMsqUmYL3ABZj7FhEvBQp+DlEw78JrCGASZRn7R2aVXdodc/O5wldB5R9oanl4/8zu J+ewp4Bk wciNIwpPzJF/47vGUQzgI9HHZau8dcCD1/dUQKINn6dwMqwpRo7ldkIDzwo4IpOoS9doOPZqz4TPKBEHWdqMIb4no40JrERFsCe+/+fdbHQtfE7w1YgEnQQtoBkl96b0Sgy8MPutgVuHEWMqqNJbBx38QJ3eT42Ajmn98p/tvVXBE35LH0mdfN5TSWik271vVFx6rnz44BYmYwotL+d5yHTQSG/NXz0G4lHstz5DCRYzXXDFKVuIeVKhAZ4iOXDYRyLaWlu2922LrCgJsbCxI3szNwblTM0wqt8AR+RGCDhhkAMO/xG6rIJqqw7FvDEC33gaqtdrcUFQHRJDbHzuU0wSzw5b8fGuvTRT7enAK5XyeMkCutoJLv6c2GxSj4shRvi73zzn1RipniogLzAg9MyIJz8GBhhBqTGSgGof0gp2w9NrgnlIqYJQe4qOCvKhl4KOpJYPrvUyz9sZsL9d26EgpykAip5BZVz1pDtXY2P4LZBQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 2025/7/2 13:57, Nico Pache wrote: > The khugepaged daemon and madvise_collapse have two different > implementations that do almost the same thing. > > Create khugepaged_collapse_single_pmd to increase code reuse and create an > entry point these two users. > > Refactor madvise_collapse and khugepaged_scan_mm_slot to use the new > khugepaged_collapse_single_pmd function. This introduces a minor > behavioral change that is most likely an undiscovered bug. The current > implementation of khugepaged tests khugepaged_test_exit_or_disable > before calling khugepaged_pte_mapped_thp, but we weren't doing it in the > madvise_collapse case. By unifying these two callers madvise_collapse > now also performs this check. > > Reviewed-by: Baolin Wang > Signed-off-by: Nico Pache > --- > mm/khugepaged.c | 95 +++++++++++++++++++++++++------------------------ > 1 file changed, 49 insertions(+), 46 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index f27fe7ca9b86..bf69e81a3d82 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -2354,6 +2354,50 @@ static int khugepaged_scan_file(struct mm_struct *mm, unsigned long addr, > return result; > } > > +/* > + * Try to collapse a single PMD starting at a PMD aligned addr, and return > + * the results. > + */ > +static int khugepaged_collapse_single_pmd(unsigned long addr, > + struct vm_area_struct *vma, bool *mmap_locked, > + struct collapse_control *cc) > +{ > + int result = SCAN_FAIL; > + struct mm_struct *mm = vma->vm_mm; > + > + if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) { Seems you still forgot to drop 'IS_ENABLED(CONFIG_SHMEM)' :)