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 E7E6DC3ABDA for ; Thu, 15 May 2025 03:05:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D46D76B0106; Wed, 14 May 2025 23:05:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCD6D6B0107; Wed, 14 May 2025 23:05:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B45A16B0108; Wed, 14 May 2025 23:05:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 91F0C6B0106 for ; Wed, 14 May 2025 23:05:53 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D833FBEEFE for ; Thu, 15 May 2025 03:05:53 +0000 (UTC) X-FDA: 83443652586.15.0714802 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf10.hostedemail.com (Postfix) with ESMTP id EF88AC0017 for ; Thu, 15 May 2025 03:05:51 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XZnnlwHW; spf=pass (imf10.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1747278352; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OrKdsqD76fFlVfD/sTRJDFrWM3KIaHlqn6po5lq3sK8=; b=WljyxuByJSZDs1DLQt4pgS6lrsC9XdJbhoCsBAK0d/1mocQd+lrzVtMrlI64jMmR52eDO+ c7Cr0AyQTXdCIAu4nFu7NBObcXiE3yD9yXZeq78v5KkofTAleY1v7Yk1PqTnV6DTu2+05g ZcT2XHJk4uhPT65UBVT8fle3+vw3jB8= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XZnnlwHW; spf=pass (imf10.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1747278352; a=rsa-sha256; cv=none; b=EL3CQHj4WFFfqvpxGXnJVhlVRshz1wFSMypfaZEDhdk620TVzNwBzLzbTLkDVTHeYzzDn4 f0VDiExSBiVHCPZNs9kpfQy3IX4vrhNfEikWhgLrLD+cryYLFCvfKMEdPMCRrSsbBX5gY0 Ka9nlfvT7JMiKrO2vb9AThxLR5dKp+A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747278351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OrKdsqD76fFlVfD/sTRJDFrWM3KIaHlqn6po5lq3sK8=; b=XZnnlwHWGP3T9sTF3kTCwIA9lT1VvL473pxvbJ7YeIS4yCXEvkhvBzg1gaR4I30CEIQhTz EMm2OT5J+0AlDmLcLYM2jIwtbKi/v06EGir+rrRpLSAEaw80iUAIdlSMkpAtbvU4iaCCeD gK3zfGbx1GE57TFAB6oaA1z4KjXozLc= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-pckoVNStNzCBKLY7OttxnA-1; Wed, 14 May 2025 23:05:47 -0400 X-MC-Unique: pckoVNStNzCBKLY7OttxnA-1 X-Mimecast-MFC-AGG-ID: pckoVNStNzCBKLY7OttxnA_1747278343 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2BD99180036F; Thu, 15 May 2025 03:05:43 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 012751800268; Thu, 15 May 2025 03:05:27 +0000 (UTC) From: Nico Pache To: 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, baolin.wang@linux.alibaba.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 Subject: [PATCH v6 08/12] khugepaged: skip collapsing mTHP to smaller orders Date: Wed, 14 May 2025 21:03:08 -0600 Message-ID: <20250515030312.125567-9-npache@redhat.com> In-Reply-To: <20250515030312.125567-8-npache@redhat.com> References: <20250515030312.125567-1-npache@redhat.com> <20250515030312.125567-2-npache@redhat.com> <20250515030312.125567-3-npache@redhat.com> <20250515030312.125567-4-npache@redhat.com> <20250515030312.125567-5-npache@redhat.com> <20250515030312.125567-6-npache@redhat.com> <20250515030312.125567-7-npache@redhat.com> <20250515030312.125567-8-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspamd-Server: rspam10 X-Stat-Signature: q9rykxrpreuhec6uwxnyrfkwed8pw73b X-Rspamd-Queue-Id: EF88AC0017 X-Rspam-User: X-HE-Tag: 1747278351-389795 X-HE-Meta: U2FsdGVkX19zTeQoMgNQnqew0iXs29Kk/0XCwJMqqtx/CP3DT/xuWhtDGXOi1SmQu3DshAs0Y/cbYmgLmK/40doYeDLaDL/BEf79LDJFYFTjYSo1ueS23K/kuhSWhzGCYMek+7KXGSsb9bI4p9IDYPW2t4SGpzJbAdHDA6SyCrfJPKQZtKdG3oB7VFVP+UDuox00oSo87izB4ObY6zMgPqn/ZFLJkWZA5QM2g9b5w0tDyFna9a5TkD3UNAXBojy+HXjJ29lO13R/eBTQtVqilqXMlk0Op3EZmWAUY3tbYzSO3BwwblpieNrSk6KJ1r1dZwvKogXm1feWR/iO70NsY9fHabnLrHnOk/bdSCqFjfK0BlUr/WalOUv7JF3oHhJLDQbAoO3JYdT94mivT2Z2RtZMoMdoITgasR17+R/QWBkxMlgADlJbDiZO11gYwrRP++dodUJQSlp4C2iffj48TxDuun96mE4w0f6KrDvGwtRoxaiA/i6HT1aK9nDzr+fLUZNVr9aFwlk7S64pQOB1BXBaUVRdYu5E4wz+7BZJk8KJsKIZs9AJIPK8ICdZyHGKV6JiXTZJ7lP3MGTVr4hyTEQkmMV1kj4JJwPcaOka6HCPRcWLJKNKT/EN3KFgbHJ2IIyzTbANsig6RDGqJuerp8kH0U/OhkrSkzeDGAEBc6lz5s/3R498QszDePj8QeRB/U8jDHueIoZY/4KDY1Q1+rdL9oAl7HWoxiphYSPu9kPnkYfy2WcpAAAXJG1aB8aiil9ffDg1Y8jVZELo8LMuIJYzYUMQOvmcNyf4NJa+9XbmsYVrIVuKQVkomKGSdug24SsUQOrwwM3JIM7OdvvivSz9Z60TMgYa0HTqA/WUB7JI3A7/0jlNsH4YAmtHo3cippAp720rf3FxvFmp6fg8QNTZZaRqSckYTBr6jq9k2LSIcMhojSkdV4fHXiva6ETcPLY0hnG7BRzKbB+68hN XOrtBm3z tb3vrBQzDb17bCfKFBwRfhTPwm6RqSK54HDyoqZ016Xq+XlzbkORPkpdxcwbqLvtZ5iC4bVkip21k06/M6OMe+Xm8ZndTks6bP/tw+KO06Q2tkHy04/sAJDujLsDU+YPYLSmbYStNMP7bZgBafQtGK41aJjlYB3WTCmfhkFLB9AsNL+X+SzOARqFacRZN3GJVKsD1pYFHGVuu+kUKDfLHCIwrCA6ZS7Lpmq3a/0ynEPFF/2/prVeiWYj6moOGeBEQ0KuAfZVANbW1qVmMBHMo+eGJ497PDq7Yg1SvCUMpUDafXeuzXBBgtN6ADqFN59Ldu//Vrbxs63CmmPrYU2bjn83OCynHYDDlaazuJuRDgayrfJx4weECw4LnZF3H/2EwaMID3bNqKdFA9Na2ekuf1Bxf6birwsPntKyawXolE8pKXU8esuFyqzDSFftkNAGfijGPZaFrrYE1VKjhijjDvLf5Sa7M9RYO3T+hCHqJvtuydZj478l/19geLz90tUb7Zy5L 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: khugepaged may try to collapse a mTHP to a smaller mTHP, resulting in some pages being unmapped. Skip these cases until we have a way to check if its ok to collapse to a smaller mTHP size (like in the case of a partially mapped folio). This patch is inspired by Dev Jain's work on khugepaged mTHP support [1]. [1] https://lore.kernel.org/lkml/20241216165105.56185-11-dev.jain@arm.com/ Reviewed-by: Baolin Wang Co-developed-by: Dev Jain Signed-off-by: Dev Jain Signed-off-by: Nico Pache --- mm/khugepaged.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index afad75fc01b7..5920d4715a11 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -625,7 +625,12 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, folio = page_folio(page); VM_BUG_ON_FOLIO(!folio_test_anon(folio), folio); - /* See hpage_collapse_scan_pmd(). */ + if (order != HPAGE_PMD_ORDER && folio_order(folio) >= order) { + result = SCAN_PTE_MAPPED_HUGEPAGE; + goto out; + } + + /* See khugepaged_scan_pmd(). */ if (folio_maybe_mapped_shared(folio)) { ++shared; if (order != HPAGE_PMD_ORDER || (cc->is_khugepaged && -- 2.49.0