Commit 6a9c64d0 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Liu Shixin
Browse files

mm: use a folio in __collapse_huge_page_copy_succeeded() 

mainline inclusion
from mainline-v6.9-rc1
commit d4111eecdc3c2a5eabafcc467dbfce0e216fa485
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9R3AY
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d4111eecdc3c2a5eabafcc467dbfce0e216fa485

--------------------------------

These pages are all chained together through the lru list, so we know
they're folios.  Use the folio APIs to save three hidden calls to
compound_head().

Link: https://lkml.kernel.org/r/20240227174254.710559-18-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Conflicts:
	mm/khugepaged.c
[ Context conflicts with memory reliable. ]
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent be773a95

mm/khugepaged.c

+14 −16
Original line number Diff line number Diff line
@@ -695,9 +695,7 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, 
						spinlock_t *ptl,

						struct list_head *compound_pagelist)

{

	struct folio *src_folio;

	struct page *src_page;

	struct page *tmp;

	struct folio *src, *tmp;

	pte_t *_pte;

	pte_t pteval;
@@ -716,10 +714,11 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, 
				ksm_might_unmap_zero_page(vma->vm_mm, pteval);

			}

		} else {

			src_page = pte_page(pteval);

			src_folio = page_folio(src_page);

			if (!folio_test_large(src_folio))

				release_pte_folio(src_folio);

			struct page *src_page = pte_page(pteval);



			src = page_folio(src_page);

			if (!folio_test_large(src))

				release_pte_folio(src);

			/*

			 * ptl mostly unnecessary, but preempt has to

			 * be disabled to update the per-cpu stats
@@ -728,20 +727,19 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, 
			spin_lock(ptl);

			ptep_clear(vma->vm_mm, address, _pte);

			add_reliable_page_counter(src_page, vma->vm_mm, 1);

			folio_remove_rmap_pte(src_folio, src_page, vma);

			folio_remove_rmap_pte(src, src_page, vma);

			spin_unlock(ptl);

			free_page_and_swap_cache(src_page);

		}

	}



	list_for_each_entry_safe(src_page, tmp, compound_pagelist, lru) {

		list_del(&src_page->lru);

		mod_node_page_state(page_pgdat(src_page),

				    NR_ISOLATED_ANON + page_is_file_lru(src_page),

				    -compound_nr(src_page));

		unlock_page(src_page);

		free_swap_cache(src_page);

		putback_lru_page(src_page);

	list_for_each_entry_safe(src, tmp, compound_pagelist, lru) {

		list_del(&src->lru);

		node_stat_sub_folio(src, NR_ISOLATED_ANON +

				folio_is_file_lru(src));

		folio_unlock(src);

		free_swap_cache(&src->page);

		folio_putback_lru(src);

	}

}