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 AE672C83013 for ; Wed, 2 Jul 2025 06:01:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 523CA6B008A; Wed, 2 Jul 2025 02:01:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4FB0A6B00CC; Wed, 2 Jul 2025 02:01:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C4786B009C; Wed, 2 Jul 2025 02:01:34 -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 2821B6B00CC for ; Wed, 2 Jul 2025 02:01:34 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C728F124773 for ; Wed, 2 Jul 2025 06:01:33 +0000 (UTC) X-FDA: 83618277666.06.4F5EDF0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 1654F40009 for ; Wed, 2 Jul 2025 06:01:31 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=H5fbS9dO; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.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=1751436092; a=rsa-sha256; cv=none; b=Xr1ZR3XvaKXwz4BJ2hUzdEyjiDwjKOP+BN1vNccObwA6HPPRgPUywhrjh7dwzW5RajWXpJ PSRiP2BlKSIaao4h+WuKSRmZJWlk/DLGZzRZt9eXZLQ4K3AEtxPP56ZRr94DGpgVZiFLQQ xCqUvfCiq6B211UGxDYWToh/PdGOcwA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=H5fbS9dO; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf27.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=1751436092; 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=pClnkwE28GE4qFvtDIHtCpJBujOjEEnlN0VFfKLLmHs=; b=vxhNPXOGxHRbC6ZJoyL5bcKDmUDKzOF/9DdlOxtccZtT3c44sg2YvFL7W/wDr4D4KJg2hl hQfDp2F3IWUy5mDhwzz5G8Dvc/TebEwfe+Ibot9X6Sabza+7VmWmycnVo1thH4KV8UeLXe niQC/XZPWZe4YFzYvmYupN/MRKGli8E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751436091; 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=pClnkwE28GE4qFvtDIHtCpJBujOjEEnlN0VFfKLLmHs=; b=H5fbS9dOLvqP006C12msiqd3sYf9wu0Es+JWprBdy0oTbCjkDuhfzyYN6bS2ru4lH/n6+i nWIlPvmLxeSl3HYGhTGI0SF5TQRbxg7vXvYGE674J6z8R0FPTW78hopHpnt1bqcupGLeu8 Rhudzx2G0iw9bnz8R5pj8iThWMAOPXc= Received: from mx-prod-mc-06.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-511-vEXaRJnlMOeMD53K8UT_uA-1; Wed, 02 Jul 2025 02:01:28 -0400 X-MC-Unique: vEXaRJnlMOeMD53K8UT_uA-1 X-Mimecast-MFC-AGG-ID: vEXaRJnlMOeMD53K8UT_uA_1751436081 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 39E1C180120D; Wed, 2 Jul 2025 06:01:19 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.112]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5241B18003FC; Wed, 2 Jul 2025 06:01:04 +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 v8 11/15] khugepaged: allow madvise_collapse to check all anonymous mTHP orders Date: Tue, 1 Jul 2025 23:57:38 -0600 Message-ID: <20250702055742.102808-12-npache@redhat.com> In-Reply-To: <20250702055742.102808-1-npache@redhat.com> References: <20250702055742.102808-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Stat-Signature: sf4ehdyf65aj6tdb7a3mriw717ubs4rn X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 1654F40009 X-Rspam-User: X-HE-Tag: 1751436091-122439 X-HE-Meta: U2FsdGVkX1/E/Q6wR1SI1uHZHnO8dBFr7Dw0uGDMCLSHMXi834EnW+ccOBmZ9xFqCGumlbRd/AmwiTbk60mukyXhE6w5IvwHvJYjs0arBh+cDyJtD0EgSWyDF5mPz1LiGI0jQW8YYD6tmnkZijSeZhPvzks6nhHYK7OakPzX1Hukdw6KplSdhQRGXkbpokHgBy0oMmK/rfUJ5OEB8Pox8aZ1aP9G93BAp2olfYVyG672hIY6zxT72/QyoCQtqaIllBUc9zN3/XCF6wKjQ+G5B60Xb8+BXRHeJO7ldOWdS4FUTqRUKR7onlNBVGtxoluzXOkSE/fU0EtVxenStfajLsGKwiFeRuuhJKdeR24ba7QLlvslL/jo3YP/CQOLaPUM/tosTrSzJCi6scI6qhJavzQ5E5qgJxOxe44VusHVj324lzyhiarpA4l0NYvk8d/SgPdj1JQ8PpdtnLMtNyJ8LsJAsoDgBOE1uOTWTMj9TW+9ozbjymUuW8uHOCqajJ7GeijBOfT2DJqLt2ZebNpovmmBQqg5O1m1hrkPzfBtfB3vSuSRMoIygplV99FQkGfiPaXITDskYHmLKw0YyyFmFZx2bUkmG7mTz21ExeezGGKCLdsG5I5IjSznBJIXCWqNalOQIFFOI5PZI7GXWdWY/Vk5abcXno3ZAZT7QIjMzqTYlBbiVo2iWyIxY5Wo2b0Qy27hdQc+PgafO//lNLT/t2WzzQyPLdrRj99Rz/oh+6Pza+E0SRvGzJY2C68oLPgMkkmp0n1gwOTjaXycgw9WmyksJx5wO4TzAUCfHRkdxk6MuUVQ/99kAS3UjBuPYXu2b38JM/QaCJF5k2LM7XUYLCdwYFTVnknQyYYhUQpvut+BW8NHze4G1Iz3i/E/Vnd7CAIwYWpxciUI3VEf/O+R3FgLFXiPvr/7hiXW6TPxAFo/wY0N49ac4ihozkq3eDMA97yEjMmuWGgttGWNDeq SK6r8kQF BfPjFmgTv1bl1wzOH3MFugKgpGwVsX5air7WkeT+46WPJrKeU8yFhoCag4XO1LfBUgydnhIQjGiMy4HUCxtC0a69K6kuG7k42bR3UztYui0KC4GO0PL0ja2ym+t9AmUTqhrlJIKDZDWfM+W7mSBnPEwtExvPXn1dRdFsRZ4IQbkExr+sUNbd3ywbKdqzd6ZJyF7zI4Gfq0uW/4q97E/HIlgcIuojnFjzGxhSJYYJqW8VCB+iv5VtwdgVl/b1jI1vkS32eW4O7YXrCb2rXJVCDTGkxgHeOaAJrr2kxLmWKym9ZL/rJQW/cZwfDZrCHmdvOqTNMN73l4jtpSNhRbLsbsgp69MJH2F7+AdeKZI2jqqV0dw2n2d/x+HVH90y0/YdGoPpj1nLiPGtvVvSL6FUYFc3vpDFqUR9unMANVucaNY3CmxWbdqbfQL9t66y3lgeCWN0upQ1QqlyPcv4= 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: Allow madvise_collapse to scan/collapse all mTHP orders without the strict requirement of needing the PMD-order enabled. Signed-off-by: Nico Pache --- mm/khugepaged.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index b96a7327b9c0..6ea681b81647 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2930,11 +2930,13 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start, unsigned long hstart, hend, addr; int thps = 0, last_fail = SCAN_FAIL; bool mmap_locked = true; + unsigned long orders = vma_is_anonymous(vma) ? + THP_ORDERS_ALL_ANON : BIT(PMD_ORDER); BUG_ON(vma->vm_start > start); BUG_ON(vma->vm_end < end); - if (!thp_vma_allowable_order(vma, vma->vm_flags, 0, PMD_ORDER)) + if (!thp_vma_allowable_orders(vma, vma->vm_flags, 0, orders)) return -EINVAL; cc = kmalloc(sizeof(*cc), GFP_KERNEL); @@ -2956,7 +2958,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start, mmap_read_lock(mm); mmap_locked = true; result = hugepage_vma_revalidate(mm, addr, false, &vma, - cc, BIT(HPAGE_PMD_ORDER)); + cc, orders); if (result != SCAN_SUCCEED) { last_fail = result; goto out_nolock; -- 2.49.0