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 1E2C9C83030 for ; Fri, 4 Jul 2025 05:51:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53C3D6B00F0; Fri, 4 Jul 2025 01:51:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4EC586B8002; Fri, 4 Jul 2025 01:51:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DB026B00F7; Fri, 4 Jul 2025 01:51:42 -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 2B0546B00F0 for ; Fri, 4 Jul 2025 01:51:42 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6A3D95FF8B for ; Fri, 4 Jul 2025 05:51:41 +0000 (UTC) X-FDA: 83625510402.24.74E3017 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by imf07.hostedemail.com (Postfix) with ESMTP id B0C6240008 for ; Fri, 4 Jul 2025 05:51:37 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=TF5RUF2n; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.98 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=1751608298; 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=TX9+9h0KSjwgkpYF/X1VMPdbIjBum8fWzahSSY+SukQ=; b=7EZ76xO+8JE0ejVT7Zw/tyG1SS2SLnPhPbmvqJaw9xbCv21n5nKDctwHcFlcrTBFsqD0/0 75yNbbRYUOC/2m5gXveBlIkBSSKF3WsP8NzSI8H74NO4O1/gY86JD/79zQQn5ZI7SR4ZBI j/gDhV20sevkuSsZ14HLrs86uNY1VHM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=TF5RUF2n; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.98 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=1751608298; a=rsa-sha256; cv=none; b=1ILNgewbKcRW3UJ4xp6/03q0faHDE4j7FIVhss6nQaRwrjZfIfd/l0VBd1Le08iJgoTW72 1obd55OMXQqrt/ufzbdnaJM5PuM93ysdBX+T9Hk//vhmVfSURyd2A2B/DfRRD6A1JfJA2I cTHM6FSxZGjq/2/K5oHTOY3SznXJTWs= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1751608293; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=TX9+9h0KSjwgkpYF/X1VMPdbIjBum8fWzahSSY+SukQ=; b=TF5RUF2nWReB276DvweYTL42FLPeBkfPbuClkAKco2tV6FjlsZ4ifETQy65fUqFlUpIJOFtKkXYarZ4ia5Gbq8R2PS0RoXCUHcmS2k9IVYPTIYTv73HB2BgOdpLgW0vaMtTyK+vkDanXaB63cip7C/YjNCRVd0MlPf8WntUSlOw= Received: from 30.74.144.116(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WhBmuXj_1751608290 cluster:ay36) by smtp.aliyun-inc.com; Fri, 04 Jul 2025 13:51:31 +0800 Message-ID: <28917c0a-a58c-4d19-bcc3-aef1c1969e8c@linux.alibaba.com> Date: Fri, 4 Jul 2025 13:51:29 +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 , akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, 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, 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: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B0C6240008 X-Stat-Signature: sf5ezsh67qfzw364cb51xr7qawtocsu1 X-Rspam-User: X-HE-Tag: 1751608297-941441 X-HE-Meta: U2FsdGVkX1/FBVCZ0neSKhlOnYGrRzwF3bGq+DAZYnoq2A8aN8ZjzkuY2KX5VuMp0tdZztFFw+u3mSYk50QaSIf86syY8WfK8u1m0L01y5T51wds0Ll9uEVRC6oS8UnKzz+aDO9gD086dl2BWTtdrPAXuO5TMAI0twM4xc22aoaFzUqnSl77L2LRxqtGiHZY+Q+vvqxsso01OpaGRKVhLsmjCbBGYTGPPUGFDpXNFaUq5OYicfKLWuQL4n34+NFs1jSFLW2dRC+EhBpnBy/W2TzQL5L28y/SqoOH3bYrD4HuSNIXsffHB7SrlG6XtjnhNZlnIl2BB89zyQDYEjoohbk1rNL7JwqbtXnQcRcocZEZLHZ8zK+oHjyGc5JzxDyddhG8AGtbaH1Y9oa04cPbVcEYW+OzZiCqRDQxahBq+eeyV2t68fg6QKfLFc9bJZLeIOvnLuXGBVPtRSsSMkFzou05sprPrMZQHTXOlgSSOEs6uOKn+90vj3ZkSp7Ef+CQpl/bM7on5xNNiVUSNkYEUsh5mQ0+Q5iEVUiXprlhN+AZQqxkB+v9KLt2bugdQB2KH0uysoZLBl4Ad7DxAcX+pmIWCnV6hzz9/KuBHmrplKKfZElsuFoBlyzlH+x4zlvq503+CkFcmMOUhjgpxOWXTdhdi6BE6sC5ETT1RoSk4oZDofx6IyO1xZH7rJ1MsEP5wJVxOgU8exwFsYPZgrvQZOsXLvlmiyuH3+c44lbzgBBsOeeSpvE2VFlRfDCR5/8dEI6bJIYCiyT3vRiie15FM8wtbeI3rHe0R6zTIBHuAkbtV81ilklqTEC7VyZ0tEstQeLc7rUJjx9EPpjh6MTh1Kfv0O4SNe5cEFtoeYt1N3i2DGeWg2rFF/PefJgLQZTNp8ZXD980kC9LwVAwIXYJNXLTCS9g7WrdYdyh31vNg/Fjsw1UtfDFudXbPSCqfD51qCz/FdfcXN/bkUK0Qro e4svImhq zWS3nB1QgyZ4iXPtCLimNKfn3KJ/A6Mu0OpahTaA3+kI5ylp9g7/e57CakYgZEFi3LZRJDgH8O3G/LsDa7i/LKetQgi8TMI/G6NSPpBrdrQiZVPLJgcoFOW0n0xHxgwE4eqKIAFP//y6IXPo50bwtujWxtWrBHuHrvF6xk/0Rr9cJdBjBrkoMhxo76Q2E7QvUknxHvEfi/4u8sPbnisVVzF5am6s0slgeCDSBXg9gtEmoOTiwl7K9Dsze7HUpYdl0LU2Q91Xxhn9vwJSzYy3hZBQIPEbZIXcL/EhFSMkQTqsevLNzx5FoU52JqAUhIxW0OgAi9KvGDvEDCdpXnZx0JHYa+0f/UfGmCbkbyUdbZxfMNd81xcEENcdTZM5zhjUAFMiza22nhAPdD3D5kwrHJyDdiddhRK5SzPEAYGOKPiioVYokG46WNUUU4uSI+9SU+ajtvZmUcOCuO1tuyfujEDoOHqENdK9upPy1 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/4 12:20, Nico Pache wrote: > On Thu, Jul 3, 2025 at 9:51 PM Baolin Wang > wrote: >> >> >> >> 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)' :) > Hi Baolin, > > You had me questioning my sanity for a moment because I SWEAR I did do > this! but now I see the issue, I accidentally merged the fixup into > patch 6 (not entirely sure how or why I would have done that given my > notes say it belongs in this patch...) Ah, yes. > I'm sorry about that :< I'll see if I can work with Andrew to get some > fixups into mm-new (this was merged a few hours ago) for this patch > and patch 6. OK. Thanks.