mm-khugepaged-convert-is_refcount_suitable-to-use-folios.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: convert is_refcount_suitable() to use folios
has been removed from the -mm tree. Its filename was
mm-khugepaged-convert-is_refcount_suitable-to-use-folios.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Vishal Moola (Oracle)" <[email protected]>
Subject: mm/khugepaged: convert is_refcount_suitable() to use folios
Date: Fri, 20 Oct 2023 11:33:29 -0700
Both callers of is_refcount_suitable() have been converted to use folios, so convert it to take in a folio. Both callers only operate on head pages of folios so mapcount/refcount conversions here are trivial.
Removes 3 calls to compound head, and removes 315 bytes of kernel text.
---
mm/khugepaged.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-convert-is_refcount_suitable-to-use-folios +7 -7
@@ -524,15 +524,15 @@ static void release_pte_pages(pte_t *pte } } -static bool is_refcount_suitable (struct page *page) +static bool is_refcount_suitable (struct folio *folio) {int expected_refcount; - expected_refcount =total_mapcount (page); -if (PageSwapCache (page)) - expected_refcount +=compound_nr (page); + expected_refcount =folio_mapcount (folio); +if (folio_test_swapcache (folio)) + expected_refcount +=folio_nr_pages (folio); -return page_count (page) == expected_refcount; +return folio_ref_count (folio) == expected_refcount; } static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
@@ -625,7 +625,7 @@ static int __collapse_huge_page_isolate(* but not from this process. The other process cannot write to * the page, only trigger CoW. */ -if (!is_refcount_suitable (&folio->page)) { +if (!is_refcount_suitable (folio)) {folio_unlock (folio); result =SCAN_PAGE_COUNT ; goto out;
@@ -1371,7 +1371,7 @@ static int hpage_collapse_scan_pmd(struc* has excessive GUP pins (i.e. 512). Anyway the same check * will be done again later the risk seems low. */ -if (!is_refcount_suitable (&folio->page)) { +if (!is_refcount_suitable (folio)) { result =SCAN_PAGE_COUNT ; goto out_unmap; }
_
Patches currently in -mm which might be from [email protected] are