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 32DEAC83030 for ; Fri, 4 Jul 2025 04:20:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7310A8E0019; Fri, 4 Jul 2025 00:20:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6BAA98E0009; Fri, 4 Jul 2025 00:20:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 582938E0019; Fri, 4 Jul 2025 00:20:35 -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 451188E0009 for ; Fri, 4 Jul 2025 00:20:35 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C1C151090E7 for ; Fri, 4 Jul 2025 04:20:34 +0000 (UTC) X-FDA: 83625280788.05.FAFE7B2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 7436F1A0003 for ; Fri, 4 Jul 2025 04:20:32 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W2xRCDsJ; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751602832; a=rsa-sha256; cv=none; b=hMz6N6fZgDM7Rbj4qDLdFDVEzMvRpDzgVh2t0aJ3+KTXR+IfhsKO3YxoheLBA9Jqizhlsr 5tmX2oPW31eZDLc9jJCFI/9Wk4MXcUn2KhpYupCyzBGIHdLapvSwfNhxg4OP6RZ3Mf3tsN hsQhWyVaHYpL2OTFqmOTQBjBzvBpdjY= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W2xRCDsJ; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751602832; 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=JYMNYv3akYsSWq5hIrlEh3zSlZe35V5o/c+Z5lpwL/g=; b=XhuUwNbll18WxjxRLpdtldXt42n4uJIq+J/9Z8Uwh4WVXY4tSBH5O6wWKPNDRL1XCLhNGn FfvsAQL6hgWkkO27s5tPf1xfBAz5B75Fmto4UfdD5Pd+umyUb0By7t1PlkXARAFT2kALSZ Lr7sCM5ymPFTyB1ctr/RIRiPu/ovi1I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751602831; 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=JYMNYv3akYsSWq5hIrlEh3zSlZe35V5o/c+Z5lpwL/g=; b=W2xRCDsJFoX7Rqp1DzrYgHVaYLDY2OePqlIjafP2Msv7TLgFjbznmQKzUeAt7NMHxNSyQp 1MkKI2/SvF2yDWp/0gqVKS9mRXP4qJEmcy0Om2X8Z0kWsEEyoiAuiuMEdikcfSIZDtUrWW 6btbLfeeXz7L2fiKQWyMrB3wwea1PdE= 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-169-RgN_1KRTPXCoSJgWDxwD-g-1; Fri, 04 Jul 2025 00:20:28 -0400 X-MC-Unique: RgN_1KRTPXCoSJgWDxwD-g-1 X-Mimecast-MFC-AGG-ID: RgN_1KRTPXCoSJgWDxwD-g_1751602828 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-710ee127c79so7286077b3.2 for ; Thu, 03 Jul 2025 21:20:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751602828; x=1752207628; 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=JYMNYv3akYsSWq5hIrlEh3zSlZe35V5o/c+Z5lpwL/g=; b=lM8vmiwLQZA2Y2UjWjYZkMycy5ZIxTrNaeYe+FvMq6HBSIMzR5C8z8yv905PdPCqE2 nPWcnLp5d/vrsbcVnP/TOKyuCE5Hg+Bw3GifhRN5m0hw66Mt5iH+qL7/bjjsMU4SGMj7 ir0pKTEhU/l3WXmpHbfMMM1kkwEA47r7HtCI4mUCVs6DchqF5QRznCmL51C1zb4xNHiW 7CcOJpzf8fqZH3tVMtbGF5GEZdab7YjmU1KDnSTrsk4p+/NrROJB2D13SjmRmDaMNyM+ 67Ajzd5PHDJwc7y8FLG2aLMAaLH4te7OBj4LaZgmLPLUD4+8h3t9BfmA8FBLUHeNBQHh cqbA== X-Gm-Message-State: AOJu0YxvNVqxHIIqNHOcvebsxlqEbp2156PAOv5LuT9/Q49XkWw/D3vQ pF03Q2dxLNC6h12lmSxonTZ8ebizz1cKZl+WiiHljR+v67OtFTED69P/Sf5P1pRpDDy9arCmZAu /9ckyPmJr30kQRT8/l16CSx4oFzfvK+eP2DW4+4KApLhUhTtuC0ZrqoAtzguqmucQF/W2R71BUG u210Vvcy9Th3H7nbO1t96/SsI0z5w= X-Gm-Gg: ASbGnctL6uW9zDVVbQ4xnTBRyCM+FBViwYFNjXoUX8ruaB4WsP6UIUlHpnKS+n8+lg3 u70mh/WOHGqBZP1Oewn2vrfMyx5KO6MGX52Ay7A+0Pn5tTXfXKMgFXIYhChYXZKaSTsSey7M3vd S6WscpjA== X-Received: by 2002:a05:690c:315:b0:70e:7ff6:9ff3 with SMTP id 00721157ae682-71668d48d52mr14813657b3.35.1751602827895; Thu, 03 Jul 2025 21:20:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpWlttfaGVsemdXIFRiuyrfeV4wU2Oua20HKATYd8vQpxrAJPi7JNRE9ipCBD5L0WC9KAT+/YYm56OkcAzJRs= X-Received: by 2002:a05:690c:315:b0:70e:7ff6:9ff3 with SMTP id 00721157ae682-71668d48d52mr14813187b3.35.1751602827474; Thu, 03 Jul 2025 21:20:27 -0700 (PDT) MIME-Version: 1.0 References: <20250702055742.102808-1-npache@redhat.com> <20250702055742.102808-3-npache@redhat.com> In-Reply-To: From: Nico Pache Date: Thu, 3 Jul 2025 22:20:01 -0600 X-Gm-Features: Ac12FXx0uN0QDJdFTa4DutceQ0LVRzGL8hH9npRx5BwNbhAuyhn2wB7v9-pBvwk Message-ID: Subject: Re: [PATCH v8 02/15] introduce khugepaged_collapse_single_pmd to unify khugepaged and madvise_collapse To: Baolin Wang , 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 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Gvjg3Pz_hoM-4Vaq3z3s7nwDW6gbXlmCh7ByExx7kqo_1751602828 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7436F1A0003 X-Stat-Signature: 8w66sixa9buhz5zt3fqtf36om8dmuecx X-Rspam-User: X-HE-Tag: 1751602832-116666 X-HE-Meta: U2FsdGVkX1+oqRNac9l//Vn6x2ChUKusN12dKN5dSMUADEZGl1THOSUCkM31ySXvrF6EnYO5dgYwGsLigU7MWA1+s3PubWPltdW74ZwLbaj8PsCfJR+mn3kyGi+Pcm916lUgEoxUpIVXuK+cpXF/2iqZ6sVREZda8NyZeugzzp9iElnOytcCuGwRKlTc0+Fqd7uz89ii5iWAkglB+K+YxukMWVx0yYcWSmeDxYCG9LVw/rdwiWgomQa0Fz/PDI8V31pg+tncBA/m99ZzOKVIsmiUFv5ed4WwnLo9VahRNywo/cU2Hog7zktDOxk63IsUZCrNsWM3JtP7JQw2dUTIW3rwY1Jm8dU3ii7yYgMkKGtNUn5xJ4XSOjWQDScCtArnfLmFVGb54tXcJ+xQwf31HpTrfWR45C7njsJYmgVzGp7TQg/emfb5n89HIvrQm1qJZQDzg4owcJOyetCZWZOX3a6g8jV2Vqr74gM4YIRqNtQmJzXcfzB1nsYysH5D6jKuZuF2OlU5jy2lUEPxcA/jyDK/zApdyoYMSrzTgncL/yiL4gmBaJ9wFkMa2HmB3awI8R3TdNADIL3gRxScqlLO0YmmUcCuehOMdCoDSn6bUhHngYqbIE/M/bwvSeCUhbEzH3blAMt3LLrc26PF+m3MqHFpYwBeXyY6o5SzK2OuiRpA5lg09ZBKi0lOBVmUU/MC7MqWM3eY9+NRP6gZCMVcfYGfHPAEMCUj1uLUjkyxroFLhy2hgcYSeDJxzxo4qDD+0cclKvhHgKXNZNT29QQjUNPnolahSTJ5pV9hIRcBK41YuXBh9TR3OGX0lw+HvokHDCKb+Frv8gMHX5I2Thde3kb8AawvZtjPxN6j+GlYmQdsa0j0Vyj7t2exZG5JTdSP8jugf+aLl6uxxoq10v0YcAhE0dpYabsuaeR5UyNK9zqkXDRVTf7FVQ3DwZKE5LpoDomJ0SjADgExtQsXGoq qC/Rcyj1 orW6zysdWF1IarbwmKo7XtvXOGF1/0+7lbp413nsOKTGLJGBzuaGVe49GR4JAqXB2SRpQlWLMsh3jaD2qTsDoRueUAkz9NfHF5ENLCg6NmcKZvBSwpBYUwa+3i0t6AglD7dSDFF6mvFn0aAZqswjR4qT1PRfQqrW/eavS3BEF9r/IrOMcRJr2kHXSHeWI5D7eL6YfObAwOTErULJ3vFJVDaHM/KPRCpTZIhRvaxogcH12V8RjU/792/KY+ZSJF0ZYf2Rs1gXcMvLN7jN7RpeIG7+rjEC+jvOPcWoc5Bb2upv5CE+rRTbZZonRbShhVvQTvIWSYrfTzHQQEgRTc41Mm/+KW0pOUxL8qQd2h7RdMk4xQmZl37YHX3wV//VGigBP16/Yif05tJiKs+Qya9RN1woOZsLPLrcHClY+vVJwm+TxGF+vv8ie1cO30eXenzGTfjasAk8x64dcehY= 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 Thu, Jul 3, 2025 at 9:51=E2=80=AFPM 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 th= e > > 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 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)) { > > 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...) 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. >