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 A3319C3ABC9 for ; Fri, 16 May 2025 11:59:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD9426B014F; Fri, 16 May 2025 07:59:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A876F6B0150; Fri, 16 May 2025 07:59:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 94FFE6B0151; Fri, 16 May 2025 07:59:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 77C586B014F for ; Fri, 16 May 2025 07:59:55 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 321DB801DF for ; Fri, 16 May 2025 11:59:55 +0000 (UTC) X-FDA: 83448627150.29.0DD90CF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 0FE6C1C000E for ; Fri, 16 May 2025 11:59:52 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iDRJncNL; spf=pass (imf21.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747396793; 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=jV3TfuTBMPGuPU48cWyK877zQ+ap+DzX8iP1e9/vVHE=; b=BlRi8DQ9o+PvRYy1EVqyxK3Xp9cmMMSQ9xhPD1ouQHY8n2UzCgvHLx75IyPanDRsl1Ah1x Kfrwu4WLbEer9NfxfywXduRWjFAoL9+9I1t5/6Upf2lJB1+hj2pxOEBkertUmwzBDIRwVq h/ZlLXSjY6srDoTjir54bPukRXEuhVY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iDRJncNL; spf=pass (imf21.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747396793; a=rsa-sha256; cv=none; b=6/nIV7vrlheTWZgdLxFUeM04QrseyZ9tghMQAmfMQ35aTKpOXto6hMMaech7bDOZVOK0b0 FonQLaopchoyfAOHYNNu8WQCftuL8cw/FvRvBhgL/BcVXTo1R8kgmMyuXFuQXQ6hXhIq+o 46ZjjKx7KoSffvZz8v1dm7hI08dVfyw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747396792; h=from:from: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; bh=jV3TfuTBMPGuPU48cWyK877zQ+ap+DzX8iP1e9/vVHE=; b=iDRJncNL8zxbAM2QsbK/laUhH9WaFPz5kLtlijCak8OOdjJnU9YiEdq4v6qcrbrRltgGjf zMcqaX8U9+1jbfN9iepYMg0REcDSF99iUfW6khh/oa5rwA3I5i3TTXQ/qH8WFmYAzfsBhO H6lQZUcL1m6do53WB5RyHzyEZ4atemo= Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-620-26Oe6TW7MLOu0sLdk6K2VA-1; Fri, 16 May 2025 07:59:51 -0400 X-MC-Unique: 26Oe6TW7MLOu0sLdk6K2VA-1 X-Mimecast-MFC-AGG-ID: 26Oe6TW7MLOu0sLdk6K2VA_1747396791 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-70ca932f93fso13226587b3.1 for ; Fri, 16 May 2025 04:59:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747396791; x=1748001591; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jV3TfuTBMPGuPU48cWyK877zQ+ap+DzX8iP1e9/vVHE=; b=itnKBIb79L9lk1HgIVMhiPsbkwv8iopH6g0izw1BooPIkx1VQNTRhwA79YUeM/XoXk Px6sWpYn3Dtard/xRaf0SkNwcUWgcGPpxN5owZIutDfmdlPsDw8DzkFQbmWxnRH50vvP VyCxJzQdR2QKDyeno/s1gRFt5KH7qq0NjCqecIyItdsXwdM0y8HKnD/XILE78Ddv3xiS QGDI2zEmDvSEexIwAl5HN2B1uGj8XDM8JNqyln1G+O6t0lX3LY5Ib+too+vH8WZ16j3w EoKMdjOh5xvavRVXKtIsOyUOk3O+WQWADjhps6s1difTViRcjVeHWeunR/KPSFS6KD2/ 4VFw== X-Gm-Message-State: AOJu0YxD1xYIvCJWFrTep5qZkvjw5k79bTUid0TNDbu2JCUpp4Yn5fnY apDgDH+D2XhsX+99Xx+buaqftyJykHaSxwoj4fn8xvQU2OVaIMYCMqHBdd7qg6ND90NSF+yxCrk N8pGBSsOhm3ZM+QZyOa26fnLZB4kNSvbVnTN+BTcSyXNWBgG+qGT4Bjo8WqAKJiBJ2DorfIMaBi M6SY35Goq5xIfyLWX2kHI9OLoGVKA= X-Gm-Gg: ASbGncsY+de92Xpv3N+3qiaeYHP7gBhnrMB0ANJ3Y3UvUs/O+INTGwqct5fCxEFZEyp Sqq4MMDpK+ay0Kl+2Q38eePc6QRmdwRVgUkiEjP2aGYoLJ338wVgoOpeJWnI5uFPbvbSJxOo= X-Received: by 2002:a05:690c:2902:b0:708:39f0:e673 with SMTP id 00721157ae682-70cab099541mr32559047b3.26.1747396790716; Fri, 16 May 2025 04:59:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFcYYv1aKngeTdy5ir8TbnMDL+aYvllbV4F5smezS9aZSJthiJS0se5fLpqvHuQKj9tO3mUUquimR8mFmse0lE= X-Received: by 2002:a05:690c:2902:b0:708:39f0:e673 with SMTP id 00721157ae682-70cab099541mr32558767b3.26.1747396790429; Fri, 16 May 2025 04:59:50 -0700 (PDT) MIME-Version: 1.0 References: <20250515032226.128900-1-npache@redhat.com> <20250515032226.128900-3-npache@redhat.com> <4e00b5df-e9ce-40fa-8da0-9c66fe18bfd7@linux.alibaba.com> In-Reply-To: <4e00b5df-e9ce-40fa-8da0-9c66fe18bfd7@linux.alibaba.com> From: Nico Pache Date: Fri, 16 May 2025 05:59:24 -0600 X-Gm-Features: AX0GCFt3NyCdj_YZyS35SoBcI6yDKLZwAnHKx4ZKJFM0r8cs98JHtyZCbongSjc Message-ID: Subject: Re: [PATCH v7 02/12] introduce khugepaged_collapse_single_pmd to unify khugepaged and madvise_collapse To: Baolin Wang 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, 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 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 7lVnbVOhaHeDQlAn17dHEkykmG2ykB8kdtr-pRDKOVE_1747396791 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam10 X-Stat-Signature: fz5n9fiiy1e6d8p6nu1i31opaxs1yqk4 X-Rspamd-Queue-Id: 0FE6C1C000E X-Rspam-User: X-HE-Tag: 1747396792-964601 X-HE-Meta: U2FsdGVkX1+zB/B9y2/A8AS7N+M6gYxWTsbuhTedeFxCkzmyiVYA1WbY7k2ehD+KaWOrH3IBr08QP9CYt9TVeJdGWH/qHAz5pMFqVLzRtF8qa7d08sA2lwnUZdwNY2qN0lcGZueibskSxl0C19wOYO/T2TxyPOUFUgF5b50GC9oM0BZi+w+bA6KFJGGWxMCdmDNn2vgq/RTlkUcy8xSgpmFyBwjySqLqcnzDJtmx3xE9du4EhSRAkYpE4Inl65iP0QBztji0blyjGgI8/yjzFKIL4D9bR3dkHhTGXh8ztNoLWYQi6klnUoo5vadS0YfS7bd9yEQRxD3k1TDe5/pqVyXkbMKikKhDizWhKSku0BI35nydXgnoMGpWCW0dn8Y0UTPvXR1vdcgoYXv2pn7Lmt6EotAJoUC71PEkLGnJYw6rrJd/SB6KDoPBx0nenWxNYq4uMK1dZsedqEfhfcYmjanS/Efxl1UfkAjDHtN0vcVSJTuHEzlypMmKRRc+FO0QXW+rH6cFHX98fef2ToFOzxhoNp7eRZjl8AxULRm9jgIoXW2uSXNX92Xh7VdZQ6pbazSm+YUGoY/N6wkYPhoZAHIo6o2Cj8d78V2n8cJiNGVrM4Psun1XY4cn5ufZwtPCyyxTZpFGgtkKSs6TAO07KIwos2G0Gs3sm7olmqbeN7XGk27UrjZlaI3yKw0j/iQhUy0gCEDJZ2AphY6a+Vsw1CZI2sAo3qWyqzPknMYTiXScHDEwnNR7MGps7ym0IuLpGtd0oUN2MlkvP/7NTphxWJcO0eoCzgU1JraMPxK2Boy0vxMewuKqsLW8H9+M1fmTShndiUf9f4VX7rcIBSDSV6M6GcsViHJA4wpjomW2loBXY8w7/wl23lTyxusbTJLdWW8SsK7uWE6/UpXinXEMggfSksa/aFA0ww20iRrqvxV7j5Om15iIFdUItUQnY/PV/oO3Cz829wD/qm7UkF+ bOfK8NFe TCQQlPSjKFsUZUTpGjKVY2T0D2LrwUBdhMjKKK4dcLhO7zDSA7TT8v75DUrO7ug7oeUhlm2d6ZBT+UnY= 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 Wed, May 14, 2025 at 11:50=E2=80=AFPM Baolin Wang wrote: > > > > 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 re= turn > > + * 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 =3D SCAN_FAIL; > > + struct mm_struct *mm =3D 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. Sorry I handled the conflict on the removal parts, forgot to handle the addition part... my bad. > > [1] > https://lore.kernel.org/all/ce5c2314e0368cf34bda26f9bacf01c982d4da17.1747= 119309.git.baolin.wang@linux.alibaba.com/ >