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 9BA26C3ABC3 for ; Thu, 15 May 2025 03:24:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE9076B00E1; Wed, 14 May 2025 23:24:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E722F6B010C; Wed, 14 May 2025 23:24:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC3986B010D; Wed, 14 May 2025 23:24:35 -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 A9D536B00E1 for ; Wed, 14 May 2025 23:24:35 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 98E10C13DD for ; Thu, 15 May 2025 03:24:36 +0000 (UTC) X-FDA: 83443699752.01.2F8F29F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 9AE79140008 for ; Thu, 15 May 2025 03:24:34 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EzgGmHub; spf=pass (imf23.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1747279474; 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=LERVvJDdQ50N7NrtLEv/wIwv1YxbOJn5S0TLZdjZtxg=; b=jGtSM5LRxB8ph4dPQPzMLyeeZa8sDQlp25+lEezihTVYZTai0gHNQrq1aXP9EjjYzPD6Os +uPc86O8RagdUM0QYqNVUtppVA+BE9+VkZC1f6tU4dQZ8MX0he76/QolpvVMa8BFcB39Rq pJdYzhF2VmoQ6JND4sV9A9ferwavbCo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747279474; a=rsa-sha256; cv=none; b=X6IvmG6J5tTV6TD2ijUWHu42ZkXm5Xvc9bkJAFOSpLkZekrJnxnjUg6q9Klg7j3sjIPW7y NVXlNEkScA8Kg5C+FiplUK9AHUAXw4J9s2RRrts6Ehg3hhQzI9m0cnOFi8pWPDJUMu+4jV Cwx2ZOI47Su/QrxK3dqA6NLBnnnCqTc= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EzgGmHub; spf=pass (imf23.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747279474; 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=LERVvJDdQ50N7NrtLEv/wIwv1YxbOJn5S0TLZdjZtxg=; b=EzgGmHubSYzB3hM/i2MR9rWsUMFyxaUDLDk60rSM0N10IJt/D3BrYHyJV0CA52V4hnQcJB usNVASQ6h2IJo7N9MgtK7lYC7go/d3pMdTd7aECrd7sNjBjSFljTnc6Fg25rCFG5FtLcPI 608FzGcf/Ujk9i42OQ1wmWT5hgTIZYw= Received: from mx-prod-mc-05.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-177-5nI4l0iMMOSW1pt9wr28Kg-1; Wed, 14 May 2025 23:24:29 -0400 X-MC-Unique: 5nI4l0iMMOSW1pt9wr28Kg-1 X-Mimecast-MFC-AGG-ID: 5nI4l0iMMOSW1pt9wr28Kg_1747279462 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A80331956089; Thu, 15 May 2025 03:24:22 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B682D180087A; Thu, 15 May 2025 03:24:07 +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 v7 06/12] khugepaged: introduce khugepaged_scan_bitmap for mTHP support Date: Wed, 14 May 2025 21:22:20 -0600 Message-ID: <20250515032226.128900-7-npache@redhat.com> In-Reply-To: <20250515032226.128900-1-npache@redhat.com> References: <20250515032226.128900-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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 9AE79140008 X-Stat-Signature: cbtdwfmjwg9ff68heef7bchb785aqks6 X-Rspam-User: X-HE-Tag: 1747279474-102751 X-HE-Meta: U2FsdGVkX19eh7vC6pP+1KeBeWSUewamgCQJp7v9xl//0CmHuPIMI5U+LEYGl4nN1htsjvZScD51/wJLlEEsScS05mrPW1IlOaat3HYAYwJgBtxRgA/0+KX6qric0B11/BORnHyLUTBS0O8sLg1foo2kROkHLetNVDPRMyfh53xd359r1l7PvI+M1EniXCWJW+xIlndCuQ47FFXBDYDSloGL8El+JcWHJ4Gs7tPOkmWlvGJVMH1+gAXcSIdVf3tHFiCEUFOCQ6fvOZbAc/IDr0c9B5YcTbzePCX5Sdudt8colJfS/55MgTt/agweVdztW1ZT78O4CZGAzmmfSdkxoeqCJZnQO3OeFsuCTOP48MNuWZRIJD8VhpXEPswU2F9L4mB8ZeaKhtY415G4RHmA2ovUCIaBM9efgiuIXab6oLb8MQXY2Nj0b/xpdYvycJXVdDZ5f51ayqpBbxLqPI7Ym97/PNad/QY4fXZJ21hefTicbM0L00ijeXJfe/j7NY4W5O2BOq++n0RCG6p6dVR0JCLQBtwy0MDQlIiD/p+7BmZ7JfsyQL+F4sFHwAZPoIB3KYnrgtgJGy56xgNC98Tk3UM30+R1Y0VyyYOV3DLq2CFC2lidNGdYWa8b6Qtu9HKqT7lHOrLPEO+iIsi5VBbr9VwSWVxmSQ+c7rpYelNG5ZXFgvUNeVa5w8s5FecAtPrSVW7yQz+OEd8wlXO8s0bU/1Vd2a8SgyaqkYzwc9GW2PnY8DSyJE44ou+e1vUz87+OZXWulptMqMbKcYZe3I6r0HS1H/jSL2n1uXep9Y/3Ar+YWLI4bh2P4givm3HvsnRJpDwYDoboP0vHVwDfDFN2aXHW/9KnXAeiK7gMz4jaUcvT0b4C3gf6XKhec4YDu5/vpS6HkeMIuFylllyy3eEaHW1vEPjgB8s5+8T9pRwzCRPYnYsDw+7r6In0/xsA8UQVSGCiA4WNLi/QUrW+L7J TmWOe/us Rrca6Kf3TNK+nY9mruxxH3GmjfAwVf+GfcWJIYPsBQl8+LCRySAqdmX9k+3K3kujN5IZ3uQaSeUcAMSvzkqrohtfa4xxCjaDeJQfZBph+99dQKVge9xGrg9C4EXHm/Mm5KWch+woltBh7gTtQH0dbbsNvKlC0onW7I+BOe9krrKkGMDHrnl7824JuVRZAMAfcVfn56/vsgmspIm8aHnzjwEM2RaU1plSGOl/LuN0bqZV0R/fEjVWmHlWAE/en0Zu8/aZA61JKqe0jlM1RQ39YqgOk5z90CgrCbr8R5RhvRDXj7p/SRb2T2UWWwxTKmR57d4gbqakVWcxmj2hM96qUToueua/B9MDBt/8Ke9GiXHuMuTMKXeS29WSPdET/Euvlb4j7+4dHFE6aiIw536tqOlkLqC5r/+UQnWS5yP0wPz4QdH5WEoEyaFfiZ2mgq9+bdbO6xPAvkpm7Iiw= 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: khugepaged scans anons PMD ranges for potential collapse to a hugepage. To add mTHP support we use this scan to instead record chunks of utilized sections of the PMD. khugepaged_scan_bitmap uses a stack struct to recursively scan a bitmap that represents chunks of utilized regions. We can then determine what mTHP size fits best and in the following patch, we set this bitmap while scanning the anon PMD. A minimum collapse order of 2 is used as this is the lowest order supported by anon memory. max_ptes_none is used as a scale to determine how "full" an order must be before being considered for collapse. When attempting to collapse an order that has its order set to "always" lets always collapse to that order in a greedy manner without considering the number of bits set. Signed-off-by: Nico Pache --- include/linux/khugepaged.h | 4 ++ mm/khugepaged.c | 94 ++++++++++++++++++++++++++++++++++---- 2 files changed, 89 insertions(+), 9 deletions(-) diff --git a/include/linux/khugepaged.h b/include/linux/khugepaged.h index b8d69cfbb58b..b6e5ba1fae58 100644 --- a/include/linux/khugepaged.h +++ b/include/linux/khugepaged.h @@ -1,6 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_KHUGEPAGED_H #define _LINUX_KHUGEPAGED_H +#define KHUGEPAGED_MIN_MTHP_ORDER 2 +#define KHUGEPAGED_MIN_MTHP_NR (1<mthp_bitmap_stack[++top] = (struct scan_bit_state) + { HPAGE_PMD_ORDER - KHUGEPAGED_MIN_MTHP_ORDER, 0 }; + + while (top >= 0) { + state = cc->mthp_bitmap_stack[top--]; + order = state.order + KHUGEPAGED_MIN_MTHP_ORDER; + offset = state.offset; + num_chunks = 1 << (state.order); + // Skip mTHP orders that are not enabled + if (!test_bit(order, &enabled_orders)) + goto next; + + // copy the relavant section to a new bitmap + bitmap_shift_right(cc->mthp_bitmap_temp, cc->mthp_bitmap, offset, + MTHP_BITMAP_SIZE); + + bits_set = bitmap_weight(cc->mthp_bitmap_temp, num_chunks); + threshold_bits = (HPAGE_PMD_NR - khugepaged_max_ptes_none - 1) + >> (HPAGE_PMD_ORDER - state.order); + + //Check if the region is "almost full" based on the threshold + if (bits_set > threshold_bits || is_pmd_only + || test_bit(order, &huge_anon_orders_always)) { + ret = collapse_huge_page(mm, address, referenced, unmapped, cc, + mmap_locked, order, offset * KHUGEPAGED_MIN_MTHP_NR); + if (ret == SCAN_SUCCEED) { + collapsed += (1 << order); + continue; + } + } + +next: + if (state.order > 0) { + next_order = state.order - 1; + mid_offset = offset + (num_chunks / 2); + cc->mthp_bitmap_stack[++top] = (struct scan_bit_state) + { next_order, mid_offset }; + cc->mthp_bitmap_stack[++top] = (struct scan_bit_state) + { next_order, offset }; + } + } + return collapsed; +} + static int khugepaged_scan_pmd(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, bool *mmap_locked, @@ -1447,9 +1525,7 @@ static int khugepaged_scan_pmd(struct mm_struct *mm, pte_unmap_unlock(pte, ptl); if (result == SCAN_SUCCEED) { result = collapse_huge_page(mm, address, referenced, - unmapped, cc); - /* collapse_huge_page will return with the mmap_lock released */ - *mmap_locked = false; + unmapped, cc, mmap_locked, HPAGE_PMD_ORDER, 0); } out: trace_mm_khugepaged_scan_pmd(mm, folio, writable, referenced, -- 2.49.0