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 94D1CC7EE30 for ; Wed, 2 Jul 2025 05:59:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 34AC36B009D; Wed, 2 Jul 2025 01:59:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FAF66B00BC; Wed, 2 Jul 2025 01:59:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1EA5F6B00BD; Wed, 2 Jul 2025 01:59:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0F2EB6B009D for ; Wed, 2 Jul 2025 01:59:24 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A625414075D for ; Wed, 2 Jul 2025 05:59:23 +0000 (UTC) X-FDA: 83618272206.27.4EB6091 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 01CE9180003 for ; Wed, 2 Jul 2025 05:59:21 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WPW9d4HM; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of npache@redhat.com designates 170.10.133.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=1751435962; 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=u+H9xfARm1u9/s+gCR3ZQc0XlTk0h8GFkMRGzqJcOrk=; b=skspnBaBiig5N/pOHuBHB52qJqacgx6Q4ULM3oVq8xPpBfdsznT5X+aY87LTH+m5KRAPra AjupGj7Z/GMVO7FbUlbm85u9GLnNU7bb7zhHw6EdjSHqZt93ErI4HAqEgVrsMeu3N2BkhQ /ySyrh525JN3Na+VrVSng4O9ldzKRbg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751435962; a=rsa-sha256; cv=none; b=2x55YpWfuJVeqJZC+57LQHtdIG/0rS4ImmFYQ5pRS9gKCHmjgRc6lg9Vz2xH+8zEy2IQ4b QY0ugqWimEoxj8/p4dgPH6rv5NeNHLAo1rGcSw7z5vxmCQEf4hEXokPbIgQUKaNvIAhdJY pVy1BZKAGuPdD1h5kbR8TkiR6gsjkOg= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WPW9d4HM; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751435961; 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=u+H9xfARm1u9/s+gCR3ZQc0XlTk0h8GFkMRGzqJcOrk=; b=WPW9d4HMOT/VxVIK1ztQAVrq0Odk+He0QRicRbu7o09PyXkoPxSAgG7iEpohhbVWkZJBMo tMJf1xLN7bAYtbx8r4cxhpu1y++01L7ZLnGY+zKvWQMQngE4do4eaopzJ8lWwuEcdudfXo 3crSkWFKdLlbRNdO1EWO/FqnpfxSjGc= 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-38-TMjt8s8HNaSsbb0b_Lkisw-1; Wed, 02 Jul 2025 01:59:18 -0400 X-MC-Unique: TMjt8s8HNaSsbb0b_Lkisw-1 X-Mimecast-MFC-AGG-ID: TMjt8s8HNaSsbb0b_Lkisw_1751435953 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 E67AB1800289; Wed, 2 Jul 2025 05:59:12 +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 B9F6918003FC; Wed, 2 Jul 2025 05:58:56 +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 03/15] khugepaged: generalize hugepage_vma_revalidate for mTHP support Date: Tue, 1 Jul 2025 23:57:30 -0600 Message-ID: <20250702055742.102808-4-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: 9odjw16iz5h9bo4dumud6k7qynw8968e X-Rspamd-Queue-Id: 01CE9180003 X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1751435961-802548 X-HE-Meta: U2FsdGVkX19RRbs+/TNSPY9RDvdEkZBhTV6Cmrhnt9il2AwJY7fxFA6yxkZ95XMAPbewgrnU50gZGFsLjCCbgcsxOgrv8RIVMtbfI/Mm+HavDwsZ4G5HNxKsy/4BfksWJiKhXEjSCD3uthQaIdMsOtlkhHclLv5MEpmXI/Hf0FsdO91aUD7jPd0oJN0gRd4UDFylUazjA19JOPKaj7BjE132HxWpvkJleP4qyZe3ndHte3SCt6Z6AJ1zOoj6R904taSNQosrWxO+yr/w6KhXx0MG3F5GuFzpqxpyI95MyiQLFq6l4Mc1CYT7KA6XLo5kpgG/3/BXUc6yizAVjqTPx6m2p11rjdL4WZ+zw6TkZmGhhRVnInBdhWqpexTBFI1hqP9VSBm8LCj5jeO3sC5qPVlGkB3bmC/8QSY2NQ575SOgxgQAw5rfwynHjvC4Li2qp9FTzDeEHWThdmpUBxCfp1Jl5SttPlel9Ao/ZGZnNgPOVhq99SB8ihjj6Pq1/lCOCNUVuOw0BXB59jOOX5O8KkFP8YGP7jNvnIhtBcsAPaRtD/SWc5Cndt/cETIT/d9650jZ5KYbFFJ3nD6Uo3YfKglXGzVnfAMYDMTfzUNJFl9kFA396sd0WCD/k4qWdwFBUQWpqxjvjKhByctxYAMRg+kJqe3sL9zEr2dYXXtPYqaIVHZaRHAERnuq5Aq17QCcFkgHuN744whAXWFm24OkXlkODIlDzYc5AO8w9OVxMCXMZ9CaVLwrPzPyDsEXvn6spmtSS6VYDOpRDJbREmYPeBcE7gV4dbEIKTRidlAavgl9tAy8G9eL0Oq0cuv4IyyA6tJ9Dgcm7N8aBuINxx99H3wXYfkqRsnf8qRnl6C0ZfODRKpy0fiGof4aodvC3sAbEM6ZtAPr/c8Tj6+Cudh9vkKcVajg+2O6xvXbMzpgO61RfbARwV2iUGFa/5PT0KKYKDT9dHaVR/KP73Q5OWa /9QMDbLx BOwIgqlboeq4+Z9ujFZqqIvvmwJ4J5qsz1XKgtVOgOo3jma8YoKMxUUIslz/9k2cVJHfTsPG1M/ZsRfEwmiSbIFEDMcokj8Sr7Z1Pj3pFlZU0DKjt1IOCFFnGMGX6OuBKNaginJ1Zyrxar2Zmj4qcKuRpOonOU/sRfJT/eqk2nSOz+egl86X+yKGtvfVn1daifFG8FYfj7H+SpfQoQVI4iO+LHIIFhz2Pt9WX7ezMd9So/Z4pGj730buF9ByYWMGx9DsuJJwxQKA5PH3sN+yMcDamhqfzei1UrKWumvJ809zazRIWy1rBnNI/tDdOH9wOxCm99KBVZTfdSEm0zKKWwrOt53yjqILzxdMp4JFe6VYWj0fcwCNSCVO3eYaGO4oVc0w2oIx+nAwgLX6P9Ss4N0dQo9DTT/VS3pk8zCa7doAl6/nH1F0d/fXyCCFirvDTJ1d/fbaNC9jBt01raM0DhJLQRCWHUkaYYUE0E9Rw/DeeNVrP4K7jG3ZN4j7mRxiM+NIoqJUa0OmLqqnvk+ah0AU/lA== 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: For khugepaged to support different mTHP orders, we must generalize this to check if the PMD is not shared by another VMA and the order is enabled. To ensure madvise_collapse can support working on mTHP orders without the PMD order enabled, we need to convert hugepage_vma_revalidate to take a bitmap of orders. No functional change in this patch. Reviewed-by: Baolin Wang Co-developed-by: Dev Jain Signed-off-by: Dev Jain Signed-off-by: Nico Pache --- mm/khugepaged.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index bf69e81a3d82..7bcd4d280c71 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -907,7 +907,7 @@ static int khugepaged_find_target_node(struct collapse_control *cc) static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, bool expect_anon, struct vm_area_struct **vmap, - struct collapse_control *cc) + struct collapse_control *cc, unsigned long orders) { struct vm_area_struct *vma; unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; @@ -919,9 +919,10 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, if (!vma) return SCAN_VMA_NULL; + /* Always check the PMD order to insure its not shared by another VMA */ if (!thp_vma_suitable_order(vma, address, PMD_ORDER)) return SCAN_ADDRESS_RANGE; - if (!thp_vma_allowable_order(vma, vma->vm_flags, tva_flags, PMD_ORDER)) + if (!thp_vma_allowable_orders(vma, vma->vm_flags, tva_flags, orders)) return SCAN_VMA_CHECK; /* * Anon VMA expected, the address may be unmapped then @@ -1115,7 +1116,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, goto out_nolock; mmap_read_lock(mm); - result = hugepage_vma_revalidate(mm, address, true, &vma, cc); + result = hugepage_vma_revalidate(mm, address, true, &vma, cc, + BIT(HPAGE_PMD_ORDER)); if (result != SCAN_SUCCEED) { mmap_read_unlock(mm); goto out_nolock; @@ -1149,7 +1151,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, * mmap_lock. */ mmap_write_lock(mm); - result = hugepage_vma_revalidate(mm, address, true, &vma, cc); + result = hugepage_vma_revalidate(mm, address, true, &vma, cc, + BIT(HPAGE_PMD_ORDER)); if (result != SCAN_SUCCEED) goto out_up_write; /* check if the pmd is still valid */ @@ -2780,7 +2783,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); + cc, BIT(HPAGE_PMD_ORDER)); if (result != SCAN_SUCCEED) { last_fail = result; goto out_nolock; -- 2.49.0