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 B75DFC83F1A for ; Mon, 14 Jul 2025 00:34:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B6168D0006; Sun, 13 Jul 2025 20:34:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 566AA8D0001; Sun, 13 Jul 2025 20:34:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4077B8D0006; Sun, 13 Jul 2025 20:34:40 -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 288468D0001 for ; Sun, 13 Jul 2025 20:34:40 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 044E214045B for ; Mon, 14 Jul 2025 00:34:40 +0000 (UTC) X-FDA: 83660999520.09.3719A6F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 53BB140010 for ; Mon, 14 Jul 2025 00:34:38 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W0czcAOS; spf=pass (imf01.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=1752453278; 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=W+J7kSzbC+P3Afm1dYs56pHBZuXjXuwK76sETip7T+g=; b=Jp2zmL+iz+u5p2728rE3qEDAA+5B3xwhgu17vdxtxBoWH7wq5sGYJM9XAMZt/hQtVYg9dN HrfEzj/NzSNSGBM4mE9KhwwZM8RVDDTL8MG6wTLaMY41FxbImNl6RLZQ5y+FPVGl7wYq7W NAiMpyozcjLgM4gEltSVG4o59az8tZw= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W0czcAOS; spf=pass (imf01.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=1752453278; a=rsa-sha256; cv=none; b=wFzz6FQx3mj7YPwXSod/4MD5ONgfuSGesT8561LdC4Ue3/D1CJnIZN7J6FpSi06I8Ct9Zm Bv774KOHw2ml2eJXbmYClu1q6ZKZYD3nsIlDiVbfFr5t0rkIY5ZzN79iLdW9BXlklTPYeF xzQg321T1qeiloZ0ectZYTaTsVl1wTw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752453277; 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=W+J7kSzbC+P3Afm1dYs56pHBZuXjXuwK76sETip7T+g=; b=W0czcAOSS0Tv+yfeHRJ9qT44lJHWbmgIPuSqxKp9eEVw2aujai7SQNzctBGge0so9RX59Y c9Gx/joUy0VcloRxDM3K1gu14uFuwfdxtVUHStfC9QeKFXdedLedMuCqQRbVjnlFN9wowQ LNrfKleX2hFbC9K568Mb1eJP1mZV0ho= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-536-hp-nHdCEO9GNmvkLaEQZTQ-1; Sun, 13 Jul 2025 20:33:28 -0400 X-MC-Unique: hp-nHdCEO9GNmvkLaEQZTQ-1 X-Mimecast-MFC-AGG-ID: hp-nHdCEO9GNmvkLaEQZTQ_1752453204 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 82E9C19373DC; Mon, 14 Jul 2025 00:33:23 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.9]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E4B4230001B5; Mon, 14 Jul 2025 00:33:09 +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, hughd@google.com Subject: [PATCH v9 03/14] khugepaged: generalize hugepage_vma_revalidate for mTHP support Date: Sun, 13 Jul 2025 18:31:56 -0600 Message-ID: <20250714003207.113275-4-npache@redhat.com> In-Reply-To: <20250714003207.113275-1-npache@redhat.com> References: <20250714003207.113275-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Queue-Id: 53BB140010 X-Stat-Signature: eor8ncjc8rgjtnzxheew9w5wfouwdfro X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1752453278-668046 X-HE-Meta: U2FsdGVkX19EgaOhz848bXm23gG1YNKCx35RwHiJ/Vwd7vY2jR9DF3+7pJj6aNiWNFrnWMRT64mCAm//1+70oLJTaE4goXQdDNv3qrroULhQxJAPSyrrHR1sw1UncZn8i35miiGIO8BCczjwap6tI10dn+DZn41qI+a93w3u4sE8nVm0Xl9i/qVnu2ku+mmCg7zT0+qDuItSCPxj5lFhdwPyHZSMI/vZA9DmSE2HZ1afc2leykGifWfLv6QKBt/2mW578GYwy6Fwvzz8hJEDYmO8S3DAo4nz3heOMCQDqVqNHAMBkV2h0BnEgMc+fZE6XsxP453LeRPTQhGmcBeMneL1e8FRRqEAGPc8egf/VjkjQEEGFtnoHwrA7h7zcGpm1OBd0p9z3gGeHOK0Hy7uc78EIP0YN+TyKdY1nRTv51W1KRdgm5tOOzTCmrjp94qZNXgjRcC8uZBcpdptjZfDyWs4wmBiuW3paf0tV4HM5Q1VZun3JYHHqixF7yOvEVrAHvzsue0WQM2+VhngJN8BqqrcukHYS7nL0IC6gkZqmRBQLFz5ImPXAnpyqWMn6iOElQA8hbhJ0sowCzf9xHCYVCRnyZH65iwuSSk8cPtQkToqAgMPQpPf2tBS7P61lo3WozSV9Xpiw1te+nDPYtXfvUrlnIzCqNtTu1hRop8iriuiKGfnWwYOAIcCoshdnsvF8hC4dDYgQH1A5+8G3BuEf1r8vlgTW8bjXDsrTMPCJ23gTD9POgsd65E1B++iZO3DkRB35pexifHFeFbkkg4IMhokFi9h6KUAMMV8DyiwkQ5dRREHjmMahyNQIwK0sXPD+7Du8givn18keWnSVbO4FR1E9lrd7U5C5Ql2CAqvnAEFKjoeVClrIqg5sn0vr7BlUtObc6EZjPVKDiv/8NNxZa9S/RWQ/Q4XQOxcF1r6tYknuDK3cG7pyPtUXw/s47tGGZZTEkLo38AhVQYDqFo Yao4XBta y1ud2O+EN9eQElzihxQyFeYMe4fWFhOy49hHceSev8nfEI5B41jLUwdsKGTRm1/VWwtPa12fzu5Sxu3si3XnEt74x/qycTBnTUFqXDzsTN8UON8rQz8vXhSDUBFix4q9bpuM3fRd4hMaUdFqDF1NcMYwupjJ9DyIWBeGcXgdlg7vhe/1OnA8MmF1uzsnib8HnHCb5ID6VCry89WE6vhCO9D0sZ+23+noQl/37xmaf6Ae3VRYMCHbSJJTn2Dwl1/MBKs/ouS0BIabCfU3tIlcYBAg3bjVA4AjI9qlWbPmaO3WeWlhIx+tBAlMvQT0K8nzSnOFxYtlVaG5HY9QhB74wJuicc9403QR/X0bDbHBfk9F4w+whkRFtAxGzVjWY2kQUIhK6BK4fyvtfpAlXio/KxEltaOXSTFv2laLjhFwoBhWiYoK+9C+9N55VRPfrtKV2Jsy/RfFqCREzRFVBGYUEDGdHqiLvoR0hhGQh1Oz3Hw9O53kW80YmLCmtg/1oeZSpbhV9NwvZwLjsLCOvBXWzRtZ6Sw== 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 47a80638af97..fa0642e66790 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -907,7 +907,7 @@ static int collapse_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 @@ -1123,7 +1124,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; @@ -1157,7 +1159,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 */ @@ -2788,7 +2791,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.50.0