From nobody Thu Oct 9 08:43:29 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C7AB828640A for ; Wed, 18 Jun 2025 10:26:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750242385; cv=none; b=mSv/ZHyt3MZDJT5ozXzMongnUAYzvWBRhOc/88dDDVruBysFKoI7pocbRKwP/wNtCZwNAtiM3qPaYykrj1D39A52/ExvrpFkY2jdpC8TEMhfVJiYxT4ik06f1OKRyBW1Kbcw62Tre1XATdVAOwIbdqXP2md2mEUEbp2pgDocSeE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750242385; c=relaxed/simple; bh=aaEieDnTiH5VSU6WJru5C9w+/VuxYHwcSr6Gf2XErC0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=GjDEVRLNfCQtKiAR5LeHg+eZNV38J2utCpNpD6SwP2C8/wvOLISNW4l/AL0xuT2HIX5iF+VnePZyNVoSoflUdnEI8ofG8cIOYlY5bV2luWS16A8KwzgGHfx/0k0Dd67mJd4BZ+NWhlHS0CKr5h2R/WMTnZ9tvgm58W7Wwb9If3c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=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 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) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D address + HPAGE_PMD_SIZE; struct folio *src, *tmp; - pte_t *_pte; + pte_t *_pte =3D pte; pte_t pteval; + int nr_ptes; =20 - for (_pte =3D pte; _pte < pte + HPAGE_PMD_NR; - _pte++, address +=3D PAGE_SIZE) { + do { + nr_ptes =3D 1; pteval =3D 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 =3D FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; + int max_nr_ptes; + bool is_large; + struct page *src_page =3D pte_page(pteval); =20 src =3D page_folio(src_page); - if (!folio_test_large(src)) + is_large =3D folio_test_large(src); + if (!is_large) release_pte_folio(src); + + max_nr_ptes =3D (end - address) >> PAGE_SHIFT; + if (is_large && max_nr_ptes !=3D 1) + nr_ptes =3D 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 +=3D nr_ptes, address +=3D nr_ptes * PAGE_SIZE, address != =3D end); =20 list_for_each_entry_safe(src, tmp, compound_pagelist, lru) { list_del(&src->lru); --=20 2.30.2