From patchwork Mon Apr 14 22:05:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14051080 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 08CEBC369B2 for ; Mon, 14 Apr 2025 22:07:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8722E280098; Mon, 14 Apr 2025 18:07:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 82115280080; Mon, 14 Apr 2025 18:07:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6BF58280098; Mon, 14 Apr 2025 18:07:09 -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 4FE07280080 for ; Mon, 14 Apr 2025 18:07:09 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F1391BA35C for ; Mon, 14 Apr 2025 22:07:09 +0000 (UTC) X-FDA: 83334035778.14.E5A9E16 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 3705E120012 for ; Mon, 14 Apr 2025 22:07:08 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Uw/U/L9T"; spf=pass (imf29.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=1744668428; 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=bllajHnZh5cfp+bU5/etN2JQ5v5uIxqZbRzp0z1zDM8=; b=BJIQB++ikeF66ObEDd0Ciy4myDvhGiNDnX2vCNXvDo+1KjhKF155wlBYvHSHbOz0dIVATQ ca9bf63+QhRCdtbP7MzNLoqIs/WeF8FJ6ID5TtUNBMPawHFlJIqDWeHypS+pU8DXplcafv he0QEa8R4If/qDVyHjLiD7Yi6eHQYNs= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Uw/U/L9T"; spf=pass (imf29.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=1744668428; a=rsa-sha256; cv=none; b=RkTY/SQx9HYHHEr/GHXRhIeAZqds6OHXNxwC3M7XIadyiwhs6UUirdnMmWeCvB66hDoi6g 2qBh5Pm+CfEcHkFyXuVkDqd4mMai0b7AZ78Temep2IKYAnkZOQVwNlgAEX0xE9msGPa+Wl OOf7KJVRnLqDd2vQkNo1/cap28HV5NM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744668427; 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=bllajHnZh5cfp+bU5/etN2JQ5v5uIxqZbRzp0z1zDM8=; b=Uw/U/L9Tq+3r7r0d7fKdjcLzGgH0Y7jwXE0aVhRBTnj2vHtrTUE0Z966qRiG1B7xxHZEuY pcwWe+L+BShRksULN6B25bK8RPP79n1G+uiJaOX+9bCA2HTw8cFWabp4VhbnKZJT1yI5uv rYrXoGOyFheug+AvRvvOTjU9c8hHFzM= Received: from mx-prod-mc-01.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-8-xxxdRWn3OZyZKTJjJg3MRg-1; Mon, 14 Apr 2025 18:07:03 -0400 X-MC-Unique: xxxdRWn3OZyZKTJjJg3MRg-1 X-Mimecast-MFC-AGG-ID: xxxdRWn3OZyZKTJjJg3MRg_1744668419 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CA8A719560B8; Mon, 14 Apr 2025 22:06:58 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 10CC11955BC1; Mon, 14 Apr 2025 22:06:50 +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: akpm@linux-foundation.org, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ziy@nvidia.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, dev.jain@arm.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 Subject: [PATCH v3 03/12] khugepaged: generalize hugepage_vma_revalidate for mTHP support Date: Mon, 14 Apr 2025 16:05:48 -0600 Message-ID: <20250414220557.35388-4-npache@redhat.com> In-Reply-To: <20250414220557.35388-1-npache@redhat.com> References: <20250414220557.35388-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 3705E120012 X-Stat-Signature: ajishg5153f3tr7c8yoe7mi5zwc1wign X-HE-Tag: 1744668428-408521 X-HE-Meta: U2FsdGVkX1/J0gMAKd41IWA9zAXa8//FaGBSyxLuZzapeXchjbjULuP4YwOIeAfNGAQZ5x11PaY4i8deRtILuqRXoWziy/LVWccG7Q6o1iLn1es4SLwAcrkO0T+5VtSblRbJKd0gQDQuHxuV0II+kRUAEBqfSIdQFKqD981ovuZMqavvN60GES3HaWy8ozSUVFLokEyuGSRUV5S3ANXHHOihaZ3Qn+hOqbdErZGyWwBUN6+kz5TxH1KBFubGW3rGYR6Xp1wX+ucnxRpXMr2V1fnZ9b1AzklT1tYcH8OCqN9l1/s8wTmq9v+5tHsfpqr+KFPYguTNfcOzT/qc9cCyT056pCbEHlTjgWqLbz9AceLnAa3/PXLb5KwqR8keh+mcv/6JPyGb5g+W/nYBOxuRAm2qlTjNt8KQjHadTwW5hwS+5dFQcRxk1ExlZshwei4oCnLgnjS7bNu17bWqrTClwhQ4My6Bz16PwycdeKICXfNYogA7d5jQuNgDYc0oftlh1l0RSW9c0qsQFMrXGZqBTv5VKLE5xC5y/gty445uUqnqq9ub4PIJ7tICqrQbuEhCEGFG94KOG/4DJKMTR79bqu9Jp+KuOcdVn+fmG9UaI1FotCoytSmwkemw0acU1Ot9JUHpKqrZekU++V20cDNP7+U1OESFO/f+M2FmBbONwD+HKAMxdpSMURXnZg/lBaBDQ4eHcqrjzsUgrsf0p+FqLJuPJ0M2LvdiwElBDlWcaUF9B4xJ53NNTJ1uJ1rbfyGzoGkGH2Y8dmgeV+rGfdYeg1ZUgO7/XAd7VK2DgKDqgNFiEpLT+ORtbAVC20cAPVpnIEGKXCfVctn+kF4S/f7XyrW1csmmhmNWz0VvrUEM/o6AzpE62QY+DUouyc1iZ7WrpDYgOqyZFse3XbVZrh+Ji7QSE3M/YwmO7olL/pKELa9+lmYZKfY+6j8PrSrwyRdQige4O31Fi0E9ECCv435 uR1GUcP0 hc5W9TAi8fs92HEfZD6Yw0tbaGYNh25C0+xNP/WKoCSPCd1oyxJEAoBki7e+pmn3OZbtshDSbWNjielHjK1zJGGN+tvJLBHYUiqrZ0GGx6HqSVXqLV91LpYthqjB8qBzRb66IDjRxFLCjoNZbdpboXIejmNadbttgukUxg+3vlFowxz764fDQ784WRfyj6z3e7NFAx3M/ak/YrTcqiXfkX/M/BOJnCvPyuEn/zI4d1My84SQ3hBc8m+s8CTCa7OfVAhTQFzpHSwc3SFnmpdvzXplEMrmM5ogZ1PgA3M6tLjYkNeZcCZZj5V5Pc9nJOsrFYelsBvgShywBtdLCgZSWNvSuWWTR8UsRlm861wTcdBGbeUVMqwWZmX7RDP87qBpeKXlcX3qa1e1oUsswwSriyhK60IJ0vxktYbNh+eONBqETKW547DPMCFnhGW98C8FPcyA+yPtWpw+aFcxDPAzL3ayu7FoWSacNEEM0x9El5kGKKCaNqCAglZydrl0msMeaZiwz 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 function for arbitrary orders. No functional change in this patch. Co-developed-by: Dev Jain Signed-off-by: Dev Jain Signed-off-by: Nico Pache --- mm/khugepaged.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 9a1242368cba..61c6ef8fa604 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -920,7 +920,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, int order) { struct vm_area_struct *vma; unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; @@ -932,9 +932,9 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, if (!vma) return SCAN_VMA_NULL; - if (!thp_vma_suitable_order(vma, address, PMD_ORDER)) + if (!thp_vma_suitable_order(vma, address, order)) return SCAN_ADDRESS_RANGE; - if (!thp_vma_allowable_order(vma, vma->vm_flags, tva_flags, PMD_ORDER)) + if (!thp_vma_allowable_order(vma, vma->vm_flags, tva_flags, order)) return SCAN_VMA_CHECK; /* * Anon VMA expected, the address may be unmapped then @@ -1130,7 +1130,7 @@ 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, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) { mmap_read_unlock(mm); goto out_nolock; @@ -1164,7 +1164,7 @@ 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, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) goto out_up_write; /* check if the pmd is still valid */ @@ -2790,7 +2790,7 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, mmap_read_lock(mm); mmap_locked = true; result = hugepage_vma_revalidate(mm, addr, false, &vma, - cc); + cc, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) { last_fail = result; goto out_nolock;