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 919F8C7115A for ; Wed, 18 Jun 2025 15:56:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 07F386B0088; Wed, 18 Jun 2025 11:56:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 009726B0089; Wed, 18 Jun 2025 11:56:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E39996B008A; Wed, 18 Jun 2025 11:56:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id CFF086B0088 for ; Wed, 18 Jun 2025 11:56:22 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3146D140391 for ; Wed, 18 Jun 2025 15:56:22 +0000 (UTC) X-FDA: 83568973404.02.0C15877 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf09.hostedemail.com (Postfix) with ESMTP id 3A8AA140004 for ; Wed, 18 Jun 2025 15:56:20 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf09.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=1750262180; a=rsa-sha256; cv=none; b=AmrPXUJ8a3YMpzoMUa4ltvwRJ7ryGiwyE9pfcWd+wk32p/vENGzVBdnu3Ig7uqG0eoA3dc nYGk7eRrpQrhVbvsCo5y60DfeUNTafl7Pay4nRho+A0dBvnX/O9SA02oXgHAQeHxAUE7l+ LY9aBCQAK3dUF31KtCM5Q1YLxb98xac= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf09.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=1750262180; 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=vqu2YkLFf3228cxcE80GCPPwDaIoSlMCcQP7IljQqj4=; b=mTQRLDYf7XqAJiYlHrxnC3GGSj6UlaoKgbJ8WffYMtekG6mTihjW3mSUzw9TpWa9npIOox LHwwqgsZ9D9gw6V+lu+LwtnmuUtj1mO2WglLsbhbAK7qZ7JvsGCh6/7iHT8ibU/Tl3I8ek 4ucXdwaKGXlJk6atd0PuLMqXD77/ztw= 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 86630113E; Wed, 18 Jun 2025 08:55:58 -0700 (PDT) Received: from localhost.localdomain (unknown [10.163.88.172]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DACDD3F66E; Wed, 18 Jun 2025 08:56:14 -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_pte_mapped_thp() for large folios by PTE batching Date: Wed, 18 Jun 2025 21:26:08 +0530 Message-Id: <20250618155608.18580-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: 3A8AA140004 X-Stat-Signature: eurza46hurnurcatdk68f4mbdkb1wk4t X-Rspam-User: X-HE-Tag: 1750262180-731264 X-HE-Meta: U2FsdGVkX1/32kB8350QVRqVwI0nZrBKLznGRird95jLUhjQzy3omzBkdHZkmTrGmUVSLApsSKcsJFV9e1YgJOZ17pTAdV2L38wrT0AW4wEZG8kJ0gmLadSIoKFtoIUDTI9ANK960qsqlaSc102COi7+OboLGUGPS9YbsnokyVBClLPw+aElwwZF/xmogxluBtfd1le6+s5ij2ehIV+aq2zIqyCsDTlfwOioALzY+lyH5eWng/V423fH01oxP2uvcz7JvGcXaBvfUUgxntYp31lyGjkbpLJmx8GZkgbl7iAvfCn/r9JreR5i9u7K3/RZgdR5ExDl8PSSs3uE//A0F1mrDuQZ0uTcyzYIP9FCGTxxavheIGhRfWJEbhMuvqL50K4/CBNdxH/nkUqAUBYN4ZFRu2bexUxN43O0d9e4Zjvz5bGX4t2eORUadaUpRg6emuYMX19puYFUt/lXagIpjgwLd7KTGxpPS3GHqQqcMikvvat0oReH+kg5vl7q8OER1Sb2EyErcXZcATkyaAHAqd+bGcxvUlWxzeYNsxfOfgJ7QaH8p5BeZKXBp4XeI/1iwyIv6m1HszkhlCpM/IgJ3ev4874J1S1KhUTHHnkP7a93sLjh8+Imae94ZHKQ0fEg0dRYSw2IqpakP1l4bQz6WaWnbgqkfMR4lcg+1JvtJC/uPjiFGJDzwRL289TKFxHR45eAyeaWzkYYkavVRe5px09qhx4gQbXd6aXGS91eeEUKyLIaQm7w3lk5MvTA3+sR+kYGnW2S+XBOuRKoQgrOKZgt9XO+QqeXDLw1xedGJt+oFYVP7Rcn7z/sAUGsM9ztIj5gKcKkLL8+u3UOUghije5uFW5TIsPXk4hsAHXK76azLHtZeV2AOg2d4O+om8Q+z2e84X50CaVVPMtBSV91kP1IE4MeoMsT2Y27PY1nt44hZKtCEAYsDw3C2YQtW+KpePdFHcftqQQq4/yzzXQ 5EwU39zH JTFvx1KpPeoDzdqZUtq7mTMBcGkl7tYNiixvjosRwzzNyYgXqhQ+5g33Odx0AxG9VTDdKjIMXvEdOPbAtItYKpaYDorblQIJkkTU9ioEKLCe1xRJOuVtfjbqGhIq+RjCcRMPm2mtLxSlGWuZ56+myMTsWWeRtVUnOCzsGaLbgoxVSi/vwEivznvsat80FCWl9+/zyuYGWiZN51Wk+FSASylFojOA3AL1IXJa7 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_pte_mapped_thp(). 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(). Note that we do not need to make a change to the check "if (folio_page(folio, i) != page)"; if i'th page of the folio is equal to the first page of our batch, then i + 1, .... i + nr_batch_ptes - 1 pages of the folio will be equal to the corresponding pages of our batch mapping consecutive pages. No issues were observed with mm-selftests. Signed-off-by: Dev Jain --- This is rebased on: https://lore.kernel.org/all/20250618102607.10551-1-dev.jain@arm.com/ If there will be a v2 of either version I'll send them together. mm/khugepaged.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 649ccb2670f8..7d37058eda5b 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1499,15 +1499,16 @@ static int set_huge_pmd(struct vm_area_struct *vma, unsigned long addr, int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, bool install_pmd) { + int nr_mapped_ptes = 0, nr_batch_ptes, result = SCAN_FAIL; struct mmu_notifier_range range; bool notified = false; unsigned long haddr = addr & HPAGE_PMD_MASK; + unsigned long end = haddr + HPAGE_PMD_SIZE; struct vm_area_struct *vma = vma_lookup(mm, haddr); struct folio *folio; pte_t *start_pte, *pte; pmd_t *pmd, pgt_pmd; spinlock_t *pml = NULL, *ptl; - int nr_ptes = 0, result = SCAN_FAIL; int i; mmap_assert_locked(mm); @@ -1620,12 +1621,17 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, if (unlikely(!pmd_same(pgt_pmd, pmdp_get_lockless(pmd)))) goto abort; + i = 0, addr = haddr, pte = start_pte; /* step 2: clear page table and adjust rmap */ - for (i = 0, addr = haddr, pte = start_pte; - i < HPAGE_PMD_NR; i++, addr += PAGE_SIZE, pte++) { + do { + const fpb_t flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; + int max_nr_batch_ptes = (end - addr) >> PAGE_SHIFT; + struct folio *this_folio; struct page *page; pte_t ptent = ptep_get(pte); + nr_batch_ptes = 1; + if (pte_none(ptent)) continue; /* @@ -1639,6 +1645,11 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, goto abort; } page = vm_normal_page(vma, addr, ptent); + this_folio = page_folio(page); + if (folio_test_large(this_folio) && max_nr_batch_ptes != 1) + nr_batch_ptes = folio_pte_batch(this_folio, addr, pte, ptent, + max_nr_batch_ptes, flags, NULL, NULL, NULL); + if (folio_page(folio, i) != page) goto abort; @@ -1647,18 +1658,19 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, * TLB flush can be left until pmdp_collapse_flush() does it. * PTE dirty? Shmem page is already dirty; file is read-only. */ - ptep_clear(mm, addr, pte); - folio_remove_rmap_pte(folio, page, vma); - nr_ptes++; - } + clear_full_ptes(mm, addr, pte, nr_batch_ptes, false); + folio_remove_rmap_ptes(folio, page, nr_batch_ptes, vma); + nr_mapped_ptes += nr_batch_ptes; + } while (i += nr_batch_ptes, addr += nr_batch_ptes * PAGE_SIZE, + pte += nr_batch_ptes, i < HPAGE_PMD_NR); if (!pml) spin_unlock(ptl); /* step 3: set proper refcount and mm_counters. */ - if (nr_ptes) { - folio_ref_sub(folio, nr_ptes); - add_mm_counter(mm, mm_counter_file(folio), -nr_ptes); + if (nr_mapped_ptes) { + folio_ref_sub(folio, nr_mapped_ptes); + add_mm_counter(mm, mm_counter_file(folio), -nr_mapped_ptes); } /* step 4: remove empty page table */ @@ -1691,10 +1703,10 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, : SCAN_SUCCEED; goto drop_folio; abort: - if (nr_ptes) { + if (nr_mapped_ptes) { flush_tlb_mm(mm); - folio_ref_sub(folio, nr_ptes); - add_mm_counter(mm, mm_counter_file(folio), -nr_ptes); + folio_ref_sub(folio, nr_mapped_ptes); + add_mm_counter(mm, mm_counter_file(folio), -nr_mapped_ptes); } unlock: if (start_pte) -- 2.30.2