Commit 5c07ebb3 authored by Vishal Moola (Oracle)'s avatar Vishal Moola (Oracle) Committed by Andrew Morton
Browse files

mm/khugepaged: convert hpage_collapse_scan_pmd() to use folios 

Replaces 5 calls to compound_head(), and removes 1385 bytes of kernel
text.

Link: https://lkml.kernel.org/r/20231020183331.10770-3-vishal.moola@gmail.com


Signed-off-by: default avatarVishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: default avatarRik van Riel <riel@surriel.com>
Reviewed-by: default avatarYang Shi <shy828301@gmail.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 8dd1e896

mm/khugepaged.c

+10 −10
Original line number Diff line number Diff line
@@ -1248,6 +1248,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, 
	int result = SCAN_FAIL, referenced = 0;

	int none_or_zero = 0, shared = 0;

	struct page *page = NULL;

	struct folio *folio = NULL;

	unsigned long _address;

	spinlock_t *ptl;

	int node = NUMA_NO_NODE, unmapped = 0;
@@ -1334,29 +1335,28 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, 
			}

		}



		page = compound_head(page);



		folio = page_folio(page);

		/*

		 * Record which node the original page is from and save this

		 * information to cc->node_load[].

		 * Khugepaged will allocate hugepage from the node has the max

		 * hit record.

		 */

		node = page_to_nid(page);

		node = folio_nid(folio);

		if (hpage_collapse_scan_abort(node, cc)) {

			result = SCAN_SCAN_ABORT;

			goto out_unmap;

		}

		cc->node_load[node]++;

		if (!PageLRU(page)) {

		if (!folio_test_lru(folio)) {

			result = SCAN_PAGE_LRU;

			goto out_unmap;

		}

		if (PageLocked(page)) {

		if (folio_test_locked(folio)) {

			result = SCAN_PAGE_LOCK;

			goto out_unmap;

		}

		if (!PageAnon(page)) {

		if (!folio_test_anon(folio)) {

			result = SCAN_PAGE_ANON;

			goto out_unmap;

		}
@@ -1371,7 +1371,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, 
		 * has excessive GUP pins (i.e. 512).  Anyway the same check

		 * will be done again later the risk seems low.

		 */

		if (!is_refcount_suitable(page)) {

		if (!is_refcount_suitable(&folio->page)) {

			result = SCAN_PAGE_COUNT;

			goto out_unmap;

		}
@@ -1381,8 +1381,8 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, 
		 * enough young pte to justify collapsing the page

		 */

		if (cc->is_khugepaged &&

		    (pte_young(pteval) || page_is_young(page) ||

		     PageReferenced(page) || mmu_notifier_test_young(vma->vm_mm,

		    (pte_young(pteval) || folio_test_young(folio) ||

		     folio_test_referenced(folio) || mmu_notifier_test_young(vma->vm_mm,

								     address)))

			referenced++;

	}
@@ -1404,7 +1404,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, 
		*mmap_locked = false;

	}

out:

	trace_mm_khugepaged_scan_pmd(mm, page, writable, referenced,

	trace_mm_khugepaged_scan_pmd(mm, &folio->page, writable, referenced,

				     none_or_zero, result, unmapped);

	return result;

}