From patchwork Thu Apr 17 00:02:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14054625 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 E889CC369C2 for ; Thu, 17 Apr 2025 00:06:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 961A6280134; Wed, 16 Apr 2025 20:06:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 911C3280132; Wed, 16 Apr 2025 20:06:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B160280134; Wed, 16 Apr 2025 20:06:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5C447280132 for ; Wed, 16 Apr 2025 20:06:38 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A46E41A0F40 for ; Thu, 17 Apr 2025 00:06:38 +0000 (UTC) X-FDA: 83341594476.21.BF8D29B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 009BA20002 for ; Thu, 17 Apr 2025 00:06:36 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fWHhj2CF; spf=pass (imf13.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=1744848397; 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=eeP+ASa848B04l6hN/xeJdd8j96iNql4Kt8P0gksKvQ=; b=yXu9KwCh2I3+ZiO6asKFzkWXMi2r4xtsMR1XlJj4NrWXIElX4eyjVsz2mOIdvW7xZXzuIO HsYrmWFOUFzwxJtDgwVSZet6VnDRYONK9UQ3/h/qaAhk33D+xNspds6YDoSeywn5vTC2RH 7Z/MCJr6YbGHJ7yP0wVyAejePvkzxTI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fWHhj2CF; spf=pass (imf13.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=1744848397; a=rsa-sha256; cv=none; b=TW9iGkPDUR2miAsH4Sw/GOprSjPSATFDR+4CnxZTHbrGhgYr20B+TZSiNcMTbVaryhakBh 9ZJeklWEu/kggWeAaULgcA0nxHXubSae88+6H/OyAkHPNq3evEC6QynHDA3XgeNwKNtObr TsiRvYYWIH43gRXlhsK6jBHp/djLyy0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744848396; 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=eeP+ASa848B04l6hN/xeJdd8j96iNql4Kt8P0gksKvQ=; b=fWHhj2CFLLN2ZzxbxDUAU0Jkoi8UpLSQtdDL4vqH9ejceQBhnBjqfZrV7ORE+amCPkgzt4 Uk12Me9hkS4D/INUL+IS6eWeklWTLl/udlL/ZF+xZ2JDEb8kmtI5+XPHYClJKaO0lupaOR cFcXDqqKSAiKJ8bT3aOeffwT7UTjVzA= 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-190-aYi93XnTOHC_yoU0ZrvIyg-1; Wed, 16 Apr 2025 20:06:31 -0400 X-MC-Unique: aYi93XnTOHC_yoU0ZrvIyg-1 X-Mimecast-MFC-AGG-ID: aYi93XnTOHC_yoU0ZrvIyg_1744848387 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 7A49D1800EC8; Thu, 17 Apr 2025 00:06:26 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.34]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 354A4180045B; Thu, 17 Apr 2025 00:06:18 +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, rdunlap@infradead.org Subject: [PATCH v4 03/12] khugepaged: generalize hugepage_vma_revalidate for mTHP support Date: Wed, 16 Apr 2025 18:02:29 -0600 Message-ID: <20250417000238.74567-4-npache@redhat.com> In-Reply-To: <20250417000238.74567-1-npache@redhat.com> References: <20250417000238.74567-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Stat-Signature: qjryw3ibd3zdr1smktksfkp14dcophnj X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 009BA20002 X-Rspam-User: X-HE-Tag: 1744848396-665723 X-HE-Meta: U2FsdGVkX19AJuaE6c6hA9HD+3JKWNSPCtfdF7Mty0J7TlcWXyDXvl/WQL4/RXYbsaKy8IqKSwKY5/S/x2OA5Yj2tOE+/AmOy0GyDfRIrWFADW9EPJACkIVScVbdGA1bI4m1h6xYr/uTdZKmnfAXRPnqAQVgZFyTzm4MQkgVTD1CcUOXcSvSoiBoO8veIoaBhW6AtdhfKP/G6vMAmcIaTLIVt0EznBkoamPxPSg2uY7uYEgqLvXM5LBETwHv+9Ksk7jo7N/v0lkxyRvl2zmFLWKMc4Th/gaxaZJfxWMPsSlSARZ1zFncuyWi1zdn/gMWAknnw1/eIdqIo/uY08GYm0kBYGXaSx3RmSvbRsOkl2ZSpmJZ1Zgc/07dSfBpMWZ6oHEhf9vrJhnnfTN2YGkapATd7Yk05kxXCsiGZ22L/4sBXw+R3GFa4cTsvZYNFs8TTPm5jLK99wYByBkIK+a69bsFIH5Kacloc/i+mMFIeqqtE6jsP6TN/9X56h49Wi1QQ6ysO9pqe/JPvIg5f0GtXVZG1JSvA4yzPLiDVs5yiM0nASSCRZUb39fgnjB//VCeOUXnn7GnB/yuD4wxGbMzN5xHEYQ+YqxwZ35pvXbhTuQJZPKmcrcXhZQKY/5z18S4yu+67p2O/emVrp43jB6RGh5jgPhGZS98TqPGByrJFYpa4SHLx/mSeXmL++TBqL9fIHsjU1g631gYK3Af3sL1AtYoaZzL2/O5uGL/eIblXjuV0zsy+YwXfFnfGrXru9L36S0IfBDWZA/PTE86vHEGbwZ5bkrldXn+UIv48TjEYHshJe4r7JsIv6QvgH9n3DbyAsOXqUeXITlFpOz+y2MqbVpGqcC0SScB5Ljjx9l5U3RdZmKPRwoQ9zu+Wr38y+pbeW/HXl5cfazbIKXcOaGxoAsBaR+k9aMhoRz5quoYbLxktY51ldcvg7PvOofSzy6vprt0SbVt2IR37MtNotN dxiXxV0q zQ4rwPd51CoQBuSv506PJ571IKQNW4Yo9hoIl+j7p1gQTL4d4xX8/QxNI9VnBQmHAQ8jzSmqwk9EhM3YtNdNUaq5h09rAIZbTezOLYSpQaCA8Lh/Er4f86nmJJrfdTATA1RL6siPfVSANsdht27PbawkRwmoAmiQhMiRau9d20qZ5B/zwuVwsuT79QQvSlU+ArfTesTQJUQKdGuodbeD18oTTAeVYAUjNNaMFlFGDBS7FV2mqhAEgBown51WKLS6ZGLQwgc43xxkIoH65tvEQCgmHNvlPRahckdZMSSAGyv8j1rVRiGGv3B3S4YU055FoqO2k0JAJSKsHEzQDbBLELXXq49PmDZ4vtKWH5U5zmGSeU2h47fCLY7QXef0rXqTdVvll4+gg6Yaca9ipYoSPt3KoGm6Le9sqDjkUPWKU3asO7sr4BrRokTVRAWSudTSz4ArVQiNGLa4mq+GfpF2khOO4L0YiPwP/jfg8YRNBMzmF/iQ28X0CAjcv6/4jm9O0D09b 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 b6281c04f1e5..54d7f43da69c 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;