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 05834C7115A for ; Wed, 18 Jun 2025 10:26:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 800886B008A; Wed, 18 Jun 2025 06:26:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D8976B008C; Wed, 18 Jun 2025 06:26:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7157D6B0092; Wed, 18 Jun 2025 06:26:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 614F66B008A for ; Wed, 18 Jun 2025 06:26:26 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 05787141253 for ; Wed, 18 Jun 2025 10:26:25 +0000 (UTC) X-FDA: 83568141972.16.991DD9D Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf04.hostedemail.com (Postfix) with ESMTP id 22FBB4000A for ; Wed, 18 Jun 2025 10:26:23 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf04.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750242384; a=rsa-sha256; cv=none; b=aahBd/ppvRZGYpj9XTyZNnzrcNMhyVKXQL73QOOe9WWqQqsArrYHkw6GBI6xNcRi/2w5xb PMVpTBE15zlB1sL53iP/yvGFrJY11c0aArAGpyTSWLRQFKZVj5OnUvJXTmG4pWzmz/zjA+ rJc1QNK6TByyL9LqjdR45SgmUpUpXP4= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf04.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750242384; 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:references; bh=2KNXxwl37O0Fr8sc/TKDjqF1/BmoFbVcioEXx1ube3c=; b=CEDPkM3B4evoUIl20k0TM3OVCcczRInUDFS2u1FtDjdUafd+tVczZLCP1yv+Tsx4+SaVOs Fpg58ADk7BA3YZOcVOks8darBBBQMMYFB6F6rEcSZXV4oXtmR/71sU1cSBr8BrDjhfqZxC +Jb69x1sV8X7LPxNxNeK/lc5pFUfXnw= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8D92812FC; Wed, 18 Jun 2025 03:26:02 -0700 (PDT) Received: from MacBook-Pro.blr.arm.com (MacBook-Pro.blr.arm.com [10.164.18.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 477253F66E; Wed, 18 Jun 2025 03:26:19 -0700 (PDT) From: Dev Jain To: akpm@linux-foundation.org, david@redhat.com Cc: ziy@nvidia.com, baolin.wang@linux.alibaba.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, npache@redhat.com, ryan.roberts@arm.com, baohua@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dev Jain Subject: [PATCH] khugepaged: Optimize __collapse_huge_page_copy_succeeded() for large folios by PTE batching Date: Wed, 18 Jun 2025 15:56:07 +0530 Message-Id: <20250618102607.10551-1-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 22FBB4000A X-Stat-Signature: u4rfdmi78ycr4hrsahifpm9k8n9pyjr7 X-Rspam-User: X-HE-Tag: 1750242383-621922 X-HE-Meta: U2FsdGVkX18dyfQw66+DpEN2LR/Drnd6yn/2wjLb34ioZ+vCdVjXoTB5I01B2O5vbpObRSILPriq3FjSQidgh4hGTz7TSyEZSSpDnxPonVH+8dRZUOEn3tl1y6BUOZquooXZsRHiiqW6aqhAH050EthQfVYWMVt0nZJAY9HKWwe0p5qBwViRqUlf9XIMIpxKSZmW3iCv71UYpVTAOfwEpQ8Oay1D0GE+r8/3gznAbYeT0tgNk6sJAgGy/27ZKxE9ybT+v9JwEw8ybwP1Vb/Gdi4W6EbAdf8fOFMaVlQg2xGVE0lkKJyAq2G6q3DzpWRBU83PgfLmvVI62gdSXYAlBPt8mfRQu18YIgQqx5wLk63p7Ik6PpCOWxzv/HQCXlml52wX2vnNVlIZqwc/V7Q8IFvjnjjHNL6VWuEE3jAjRBguBPSw5e26drj6KZW5bj6jEYIAPy/Ys4CGEfGNQpRD5e2/Az08vD5mKicKLrlPyAg4qzTApha7BBfc+QtnHBvwZzQniF8cxnP5k53LQLw7zV7DN7EXGZp2ne0P/r80eOCrm9/f8prXu+NiQCA8XK0K/h8NgGvadyT/FTgQyTGKMT0XOA6HwoXf3ptltzbJSKXrpcXvlFc2pR1JU8HmOBw4S4cXcFfveyADpc2HBuW6q/4EX0f5dfaoHPNfCc911aY00C9To1mDgNxYJvhhoGA3HnsBAgwcOQjSLeKNyfgBjXXE8oZp/py60JYpDNg0nsrbDxyoXko3Hq+9frDPa27xyd1GoZ4Zil2uwD7vSGSHjo4fFhYInADaW/xCCyKI0BB8qKKrP27u1RcLe8xeX2uiwQXUd6pGQ1jkZKvAcLlvqEnTfCR1tS/vP+8K9RHC5Afo6okvH1yzIURolZmhKqh/viDJXraC7+7Zv8MShthgG6s9gqjDoagXTnA8aeLuN7nla9ufB43MVgUzD4qDYlXILlmZwMFkupy81wY+Kyu gcSIKu5Z UaZbXoHlNStskACNZ397gjFAcIFAbun9+qEAq8wsW0MRo33xYlWx4Is1zHb85IFCEdj7N4oulA41KgtJbuyh8OA9NaZFgs+U60qtF9njPIKZdgy+fPSzp11pw8ZOfO329SoP0E3JQOaCeAsd/DmwfZtVHt0niRx6u7CVQtF1hQBkyFvYnpQzjq2i9yHr4kAZ59nlbUZeyYTTUOXcuK+7/quJ1ytY45RwhVN9zwbS7HcmtcLI= 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: Use PTE batching to optimize __collapse_huge_page_copy_succeeded(). On arm64, suppose khugepaged is scanning a pte-mapped 2MB THP for collapse. Then, calling ptep_clear() for every pte will cause a TLB flush for every contpte block. Instead, clear_full_ptes() does a contpte_try_unfold_partial() which will flush the TLB only for the (if any) starting and ending contpte block, if they partially overlap with the range khugepaged is looking at. For all arches, there should be a benefit due to batching atomic operations on mapcounts due to folio_remove_rmap_ptes(). No issues were observed with mm-selftests. Signed-off-by: Dev Jain --- mm/khugepaged.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d45d08b521f6..649ccb2670f8 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -700,12 +700,14 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, spinlock_t *ptl, struct list_head *compound_pagelist) { + unsigned long end = address + HPAGE_PMD_SIZE; struct folio *src, *tmp; - pte_t *_pte; + pte_t *_pte = pte; pte_t pteval; + int nr_ptes; - for (_pte = pte; _pte < pte + HPAGE_PMD_NR; - _pte++, address += PAGE_SIZE) { + do { + nr_ptes = 1; pteval = ptep_get(_pte); if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) { add_mm_counter(vma->vm_mm, MM_ANONPAGES, 1); @@ -719,23 +721,36 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, ksm_might_unmap_zero_page(vma->vm_mm, pteval); } } else { + const fpb_t flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; + int max_nr_ptes; + bool is_large; + struct page *src_page = pte_page(pteval); src = page_folio(src_page); - if (!folio_test_large(src)) + is_large = folio_test_large(src); + if (!is_large) release_pte_folio(src); + + max_nr_ptes = (end - address) >> PAGE_SHIFT; + if (is_large && max_nr_ptes != 1) + nr_ptes = folio_pte_batch(src, address, _pte, + pteval, max_nr_ptes, + flags, NULL, NULL, NULL); + /* * ptl mostly unnecessary, but preempt has to * be disabled to update the per-cpu stats * inside folio_remove_rmap_pte(). */ spin_lock(ptl); - ptep_clear(vma->vm_mm, address, _pte); - folio_remove_rmap_pte(src, src_page, vma); + clear_full_ptes(vma->vm_mm, address, _pte, nr_ptes, false); + folio_remove_rmap_ptes(src, src_page, nr_ptes, vma); spin_unlock(ptl); - free_folio_and_swap_cache(src); + free_swap_cache(src); + folio_put_refs(src, nr_ptes); } - } + } while (_pte += nr_ptes, address += nr_ptes * PAGE_SIZE, address != end); list_for_each_entry_safe(src, tmp, compound_pagelist, lru) { list_del(&src->lru); -- 2.30.2