hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm: Convert khugepaged_scan_shmem to XArray 

Slightly shorter and easier to read code.

Signed-off-by: Matthew Wilcox <willy@infradead.org>
This commit is contained in:
Matthew Wilcox 2017-12-04 15:06:23 -05:00
parent 77da9389b9
commit 85b392dbac
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mm/khugepaged.c
View File

@ -1542,8 +1542,7 @@ static void khugepaged_scan_shmem(struct mm_struct *mm,
pgoff_t start, struct page **hpage) pgoff_t start, struct page **hpage)
{ {
struct page *page = NULL; struct page *page = NULL;
struct radix_tree_iter iter; XA_STATE(xas, &mapping->i_pages, start);
void **slot;
int present, swap; int present, swap;
int node = NUMA_NO_NODE; int node = NUMA_NO_NODE;
int result = SCAN_SUCCEED; int result = SCAN_SUCCEED;
@ -1552,17 +1551,11 @@ static void khugepaged_scan_shmem(struct mm_struct *mm,
swap = 0; swap = 0;
memset(khugepaged_node_load, 0, sizeof(khugepaged_node_load)); memset(khugepaged_node_load, 0, sizeof(khugepaged_node_load));
rcu_read_lock(); rcu_read_lock();
radix_tree_for_each_slot(slot, &mapping->i_pages, &iter, start) { xas_for_each(&xas, page, start + HPAGE_PMD_NR - 1) {
if (iter.index >= start + HPAGE_PMD_NR) if (xas_retry(&xas, page))
break;
page = radix_tree_deref_slot(slot);
if (radix_tree_deref_retry(page)) {
slot = radix_tree_iter_retry(&iter);
continue; continue;
}
if (radix_tree_exception(page)) { if (xa_is_value(page)) {
if (++swap > khugepaged_max_ptes_swap) { if (++swap > khugepaged_max_ptes_swap) {
result = SCAN_EXCEED_SWAP_PTE; result = SCAN_EXCEED_SWAP_PTE;
break; break;
@ -1601,7 +1594,7 @@ static void khugepaged_scan_shmem(struct mm_struct *mm,
present++; present++;
if (need_resched()) { if (need_resched()) {
slot = radix_tree_iter_resume(slot, &iter); xas_pause(&xas);
cond_resched_rcu(); cond_resched_rcu();
} }
} }