Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm/khugepaged: convert hpage_collapse_scan_pmd() to use folios

Browse Source 
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: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: Rik van Riel <riel@surriel.com>
Reviewed-by: Yang Shi <shy828301@gmail.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Vishal Moola (Oracle) 2023-10-20 11:33:28 -07:00 committed by Andrew Morton
parent 8dd1e89673
commit 5c07ebb372
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mm/khugepaged.c
View File

@ -1248,6 +1248,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm,
int result = SCAN_FAIL, referenced = 0; int result = SCAN_FAIL, referenced = 0;
int none_or_zero = 0, shared = 0; int none_or_zero = 0, shared = 0;
struct page *page = NULL; struct page *page = NULL;
struct folio *folio = NULL;
unsigned long _address; unsigned long _address;
spinlock_t *ptl; spinlock_t *ptl;
int node = NUMA_NO_NODE, unmapped = 0; 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 * Record which node the original page is from and save this
* information to cc->node_load[]. * information to cc->node_load[].
* Khugepaged will allocate hugepage from the node has the max * Khugepaged will allocate hugepage from the node has the max
* hit record. * hit record.
*/ */
node = page_to_nid(page); node = folio_nid(folio);
if (hpage_collapse_scan_abort(node, cc)) { if (hpage_collapse_scan_abort(node, cc)) {
result = SCAN_SCAN_ABORT; result = SCAN_SCAN_ABORT;
goto out_unmap; goto out_unmap;
} }
cc->node_load[node]++; cc->node_load[node]++;
if (!PageLRU(page)) { if (!folio_test_lru(folio)) {
result = SCAN_PAGE_LRU; result = SCAN_PAGE_LRU;
goto out_unmap; goto out_unmap;
} }
if (PageLocked(page)) { if (folio_test_locked(folio)) {
result = SCAN_PAGE_LOCK; result = SCAN_PAGE_LOCK;
goto out_unmap; goto out_unmap;
} }
if (!PageAnon(page)) { if (!folio_test_anon(folio)) {
result = SCAN_PAGE_ANON; result = SCAN_PAGE_ANON;
goto out_unmap; 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 * has excessive GUP pins (i.e. 512). Anyway the same check
* will be done again later the risk seems low. * will be done again later the risk seems low.
*/ */
if (!is_refcount_suitable(page)) { if (!is_refcount_suitable(&folio->page)) {
result = SCAN_PAGE_COUNT; result = SCAN_PAGE_COUNT;
goto out_unmap; 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 * enough young pte to justify collapsing the page
*/ */
if (cc->is_khugepaged && if (cc->is_khugepaged &&
(pte_young(pteval) || page_is_young(page) || (pte_young(pteval) || folio_test_young(folio) ||
PageReferenced(page) || mmu_notifier_test_young(vma->vm_mm, folio_test_referenced(folio) || mmu_notifier_test_young(vma->vm_mm,
address))) address)))
referenced++; referenced++;
} }
@ -1404,7 +1404,7 @@ out_unmap:
*mmap_locked = false; *mmap_locked = false;
} }
out: 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); none_or_zero, result, unmapped);
return result; return result;
} }