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 E4005C7115C for ; Wed, 25 Jun 2025 05:58:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A5AB6B00A2; Wed, 25 Jun 2025 01:58:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 87D456B00B4; Wed, 25 Jun 2025 01:58:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BA136B00B5; Wed, 25 Jun 2025 01:58:29 -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 6E74C6B00A2 for ; Wed, 25 Jun 2025 01:58:29 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 293FB1239A8 for ; Wed, 25 Jun 2025 05:58:29 +0000 (UTC) X-FDA: 83592868338.09.46B7031 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf12.hostedemail.com (Postfix) with ESMTP id 7C25540004 for ; Wed, 25 Jun 2025 05:58:27 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; spf=pass (imf12.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750831107; 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; bh=VCbG9U97+Yq2x2oxoxaiHvVV7lbNKy5/tmIkHcYX6bE=; b=Wr/Ll3hCcPbVO3YeVUqOTPPJAeUVGF0N0hxYGX66ITOvAgwyw5Qsn8N61sBy8suV/UwoPq 35Ibmx2CyiuakRCrr8MGfz2H4UXZFB3gaSQ8rBUbYUm/m4myyZrHMT9nNt9DHLGKutbXb8 je8QjMqzcdY/Xawary4fz9/n4IvX5eI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750831107; a=rsa-sha256; cv=none; b=NUTpk5+DgTqSjIZbXUxcvljgm2/Z1+FR3fDQeyIFSIxGjXqB5vqQZrl9QlJSKv4S6k8eNU sAtkTyWTHW6ZDbPa1LAkgekBT7xFo8GjDG/Abagr0Jhxelv2fhfeLb2cXRrH0KlCV8ZCdB RjskRJ7JPP0V+yZ38D3MDOM7anJTYp8= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; spf=pass (imf12.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com 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 6EF671063; Tue, 24 Jun 2025 22:58:08 -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 BBB743F63F; Tue, 24 Jun 2025 22:58:22 -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 1/3] khugepaged: Optimize __collapse_huge_page_copy_succeeded() by PTE batching Date: Wed, 25 Jun 2025 11:28:04 +0530 Message-Id: <20250625055806.82645-2-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250625055806.82645-1-dev.jain@arm.com> References: <20250625055806.82645-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: joa57gd4imq6w3x9b6q3neydzkyekqdj X-Rspamd-Queue-Id: 7C25540004 X-Rspamd-Server: rspam08 X-HE-Tag: 1750831107-767094 X-HE-Meta: U2FsdGVkX18eko86dzFyf4XsA0kpNHdDggZDaz3EO91j7tr3Yhl1CkH9NCGMfjiDNzG49IOhd0EBZSdeoDpH5hbsHKHuC7pLrG4C5DtFOhiGEgi1uajCN3ILEutfYqHQEM01nQ92HzmzlF/+4UY0ZmD/0iNhWTffTv5Ee+90JWDWy4BWRioyZRUuW8Et2lMgp+YO6+z51v8cq4iwEmpvDkGp3fW0OXYSiFM09QL0aegOo224PmgqeAd3iaZGYa0fidW2JE86D4U7pkIE9jYG07XtQQqwa6LNppjichWmi3qhAg776TJhH/iOfqd6yDJ6TAe1ZCwZRHxfoGe3UnDf8tOzKIuegjUKXQPPplWWQ8GzdsT5B4g1CcmsRnZ3P0hcu7wjPuPoB99ceFICeYM4m/dz7+N0f3QNEtKOahWl/J/U3VewjoBMV7hwD+ndHLOZaoW1cnEbeL5F/qMYbrwZ8UBrycf4GXwlF+cSmzezFXITX/uI2/j+uvEEX6fchZorcfn3jQsHJ5182WnX/w56mi+LccL1AaCobIOub/zGijCH15Qx0PNh+Shwankcma/MMMzsXP7uo0GOFJL+rVAmqgj4Bu2ZfDgTcwjPanMo42faemrGGaZszUVJPCwe3HcHCRLBXoJmBIPG0npT5Woy7J5OqwvBzJmmjAKTUl0K3qjukwZZqaW2NAIvn24hCdy9viLWJ/ZlxMzb1oIwuPFOY6i3O2IZ+gAQvjDdAjqQN065PISq2nO8gM/hf0sSEco+TaLLNPjtHD9I3uuwsvNfJufhwlPPt1feKg9l/fyoHXkdv3OwsFz2VekJtBV7fhFm4mZg+K+IWFtqPc8SjnJ5vmb2UwKx16eEDFz5WQTrEX6NA72/9GnAHdpS0O1DThwK/HsL7f+ciVP5+VIeYOxs/9Y+7lL64WlgO1n602PRxoGejX8NCCbWsThs+KaZXEjMEYyc4JdlOog7XfakTN/ 57vu2Wbn U/6BJcGT5mOaJMWHfo1vzGDPkFu+mc83B62XAr78No7VuYsKhoJfsL6+5OnvMKl6O1q7NNIw7HCE0tgx+vHc/6DDdAzqqgtwq6mLd8yBEd+kPUo3QUMZ4Jq2dQNH/w+MBNi/Y5hv6AhwxxDkJwKBMZuEZBtj7dDFA0+ZES/GSJP1qJ/DUwXTod3Ou7oPfDYAcuj3AKAe5duLeup3HblY0cH4kkF7L/mrTqLtm2jRnHuOBPu8= 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 | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d45d08b521f6..3944b112d452 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -700,12 +700,15 @@ 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 pteval; + pte_t *_pte; + int nr_ptes; - for (_pte = pte; _pte < pte + HPAGE_PMD_NR; - _pte++, address += PAGE_SIZE) { + for (_pte = pte; _pte < pte + HPAGE_PMD_NR; _pte += nr_ptes, + address += nr_ptes * PAGE_SIZE) { + 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,21 +722,33 @@ 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; + struct page *src_page = pte_page(pteval); src = page_folio(src_page); if (!folio_test_large(src)) release_pte_folio(src); + + max_nr_ptes = (end - address) >> PAGE_SHIFT; + if (folio_test_large(src)) + 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, + /* full = */ 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); } } -- 2.30.2