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 519B1C2D0CD for ; Thu, 15 May 2025 05:50:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 804916B00D3; Thu, 15 May 2025 01:50:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B2336B00D6; Thu, 15 May 2025 01:50:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 652036B00DA; Thu, 15 May 2025 01:50:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 42F336B00D3 for ; Thu, 15 May 2025 01:50:42 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 93D70E2EDE for ; Thu, 15 May 2025 05:50:42 +0000 (UTC) X-FDA: 83444067924.10.ADFAC4C Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by imf16.hostedemail.com (Postfix) with ESMTP id 2D3C5180002 for ; Thu, 15 May 2025 05:50:39 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=V5EJpsft; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 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=1747288241; 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=HILIMbJqqtRZliu8YocTP5oOqJzv4jTqKfUw91ehmtU=; b=ewRMhvhUlREOX+aBUOmZIDa0NZoEOoHPtQgo2PhtaFACOQkxkoL3wDTa5oIx02qswJhQNH 6g8xKcnxoUXkKY0nImCUX6d/tFqKvUvsEdIQY0MDzNcSUfnubA7QcXKTxA1c+6UtjHGX7L R3Z6KNmg+zraGEHpPcsQT2wGqLhozoI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747288241; a=rsa-sha256; cv=none; b=ecmfI5cuCNVE9QZJck97Hj6ViroRb8IlQ/68UxGw8L8J+9vlxZ+MVc7bMx/rJdliRUbWIm qHqFB+GkrBOu5zr7xPhNlr/PyWFQhSu9E5O3pVsnlhUV8jGJg/69siPLe6L5R4IpKQUcyi eaXS68wtLPEEpZv81BWOlpfRaVWV9e0= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=V5EJpsft; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1747288236; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=HILIMbJqqtRZliu8YocTP5oOqJzv4jTqKfUw91ehmtU=; b=V5EJpsftnAE/w8XyzWSEnKgOUtTvCO4qgeaDz8SQ18ssCRVYb/BNJkJTnrl+GLPFKlmFSKLG5X5jPQV1BJ/tI4ivtC1Pw4xOuSma6UVQMMpVZMzUUrsl8KShEkawRcx72XZHfdV0VOAD47skUgLWV6pUUJ2S1wgnH7+SAjnNeQc= Received: from 30.74.144.114(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WapcxTY_1747288232 cluster:ay36) by smtp.aliyun-inc.com; Thu, 15 May 2025 13:50:34 +0800 Message-ID: <4e00b5df-e9ce-40fa-8da0-9c66fe18bfd7@linux.alibaba.com> Date: Thu, 15 May 2025 13:50:32 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 02/12] 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: <20250515032226.128900-1-npache@redhat.com> <20250515032226.128900-3-npache@redhat.com> From: Baolin Wang In-Reply-To: <20250515032226.128900-3-npache@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 2D3C5180002 X-Stat-Signature: 7pqh4mrp7j3j5d6g7oj8pmq9wqgbicjz X-Rspam-User: X-HE-Tag: 1747288239-198212 X-HE-Meta: U2FsdGVkX199QYSzbjE0Cc8T9/5XoSHi+F97ZqOCAySWX+HHlI1tDh/6ebs0jxYq5wav0xewUXWIyBJSlYfWm9ux0m/u0GkhpEWBmTL3V6aak5Yj4vw1MxrLoSAGB2ynmZo/2F0+79vMzc7HGy+RSvscpUtgfK+/QIZyCsc67T22H5XQXCAAMNtLSvny123kNj33hcagmJnbfu61VsT1fJ9LCyajKJoH4DtbqUm3EJgU0M2uB/ERX9MllD+CQ5cW2EozPA93qOX+5DtEUoOdxABDyFV3CPjPFSxSHVCGsFDspLsgmq1WfshTSSJsW9KjDFzRBNprBMA8VBFCLL0v/xPuILsE8uNVYOYxgPD83bl610GbqC8tNVJnBdGN4s2IxL4uYBUfX7fbcrq13vH3LMJExqVqKn92KYrKiUPAeiIsj0x0UvW0AhLVkQZ/3D3/b1ZpXTcePaiS72wmtGLnOnexLxcm0SlorOk55f85BrwOcDCTbGeHdQmLD+SkG3aNeN/GLJMFbCCtCrDmRkqV9mtRXHQoF8FraotNhHEgkd26BZgWSexDBHHT1tFs3i/PkBPYBxz3z6CGZptlkmKHKJTAWQfctEbACi2wFSck382DFV2OplFdCM3K6t7lJb3+oFK1VDh+NQKlErlJIbl5wB6Oia1oVcSQrvsujF8qW2asxDb28/MAlVxUbwLl2yzPwMpZ+m/bEoMQlqk5TC341ZyGQEORat3PIu+eMGCKG3jZK9d054uGTaBoO5eFw7mKcbpSiBSZ49GPwRFn1xpRo0FSBiT5ndfy/Qviel7O0SzvfEzhfkLqYoFF7H3DYs8Nl5llUgClvhIte2RJYoD0/2+c1VFqqXxK9QJDGz55hBMd0Ge+6HAoVJdLQY95OP69yb9lx4nujbvUJSAKiygF24ZXg3UlQvNXFJzFa9d0LlrZSVZVUdx7Q/eCcIMw4AtILlejMmLt+S03LkNCBur +qxTxdMn OUMy+ikOGOTFVRTlNk6bSX7n1lkaESfESCr8Y8bwGW3ctWLuMk9ZvwM+sYA== 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/5/15 11:22, 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 for future khugepaged changes. > > Refactor madvise_collapse and khugepaged_scan_mm_slot to use > the new khugepaged_collapse_single_pmd function. > > Reviewed-by: Baolin Wang > Signed-off-by: Nico Pache > --- > mm/khugepaged.c | 96 +++++++++++++++++++++++++------------------------ > 1 file changed, 49 insertions(+), 47 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 806bcd8c5185..5457571d505a 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -2353,6 +2353,48 @@ 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)) { I've removed the CONFIG_SHMEM dependency[1], please do not add it again. [1] https://lore.kernel.org/all/ce5c2314e0368cf34bda26f9bacf01c982d4da17.1747119309.git.baolin.wang@linux.alibaba.com/