Commit 22d02290 authored by Dev Jain's avatar Dev Jain Committed by Andrew Morton
Browse files

khugepaged: optimize collapse_pte_mapped_thp() by PTE batching 

Use PTE batching to batch process PTEs mapping the same large folio. An
improvement is expected due to batching mapcount manipulation on the
folios, and for arm64 which supports contig mappings, the number of
TLB flushes is also reduced.

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.

Link: https://lkml.kernel.org/r/20250724052301.23844-4-dev.jain@arm.com


Signed-off-by: default avatarDev Jain <dev.jain@arm.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mariano Pache <npache@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4ea3594a

mm/khugepaged.c

+21 −12
Original line number Diff line number Diff line
@@ -1503,15 +1503,17 @@ 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, result = SCAN_FAIL;

	unsigned int nr_batch_ptes;

	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);
@@ -1625,11 +1627,15 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, 
		goto abort;



	/* 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++) {

	for (i = 0, addr = haddr, pte = start_pte; i < HPAGE_PMD_NR;

	     i += nr_batch_ptes, addr += nr_batch_ptes * PAGE_SIZE,

	     pte += nr_batch_ptes) {

		unsigned int max_nr_batch_ptes = (end - addr) >> PAGE_SHIFT;

		struct page *page;

		pte_t ptent = ptep_get(pte);



		nr_batch_ptes = 1;



		if (pte_none(ptent))

			continue;

		/*
@@ -1643,26 +1649,29 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, 
			goto abort;

		}

		page = vm_normal_page(vma, addr, ptent);



		if (folio_page(folio, i) != page)

			goto abort;



		nr_batch_ptes = folio_pte_batch(folio, pte, ptent, max_nr_batch_ptes);



		/*

		 * Must clear entry, or a racing truncate may re-remove it.

		 * 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_ptes(mm, addr, pte, nr_batch_ptes);

		folio_remove_rmap_ptes(folio, page, nr_batch_ptes, vma);

		nr_mapped_ptes += nr_batch_ptes;

	}



	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 */
@@ -1695,10 +1704,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)