[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250211111326.14295-11-dev.jain@arm.com>
Date: Tue, 11 Feb 2025 16:43:19 +0530
From: Dev Jain <dev.jain@....com>
To: akpm@...ux-foundation.org,
david@...hat.com,
willy@...radead.org,
kirill.shutemov@...ux.intel.com
Cc: npache@...hat.com,
ryan.roberts@....com,
anshuman.khandual@....com,
catalin.marinas@....com,
cl@...two.org,
vbabka@...e.cz,
mhocko@...e.com,
apopple@...dia.com,
dave.hansen@...ux.intel.com,
will@...nel.org,
baohua@...nel.org,
jack@...e.cz,
srivatsa@...il.mit.edu,
haowenchao22@...il.com,
hughd@...gle.com,
aneesh.kumar@...nel.org,
yang@...amperecomputing.com,
peterx@...hat.com,
ioworker0@...il.com,
wangkefeng.wang@...wei.com,
ziy@...dia.com,
jglisse@...gle.com,
surenb@...gle.com,
vishal.moola@...il.com,
zokeefe@...gle.com,
zhengqi.arch@...edance.com,
jhubbard@...dia.com,
21cnbao@...il.com,
linux-mm@...ck.org,
linux-kernel@...r.kernel.org,
Dev Jain <dev.jain@....com>
Subject: [PATCH v2 10/17] khugepaged: Exit early on fully-mapped aligned mTHP
Since mTHP orders under consideration by khugepaged are also candidates for the
fault handler, the case we hit frequently is that khugepaged scans a region for
order-x, whereas an order-x folio was already installed by the fault handler there.
Therefore, exit early; this prevents a timeout in the khugepaged selftest. Earlier
this was not a problem because a PMD-hugepage will get checked by find_pmd_or_thp_or_none(),
and the previous patch does not solve this problem because it will do the entire PTE
scan to exit.
Signed-off-by: Dev Jain <dev.jain@....com>
---
mm/khugepaged.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 0d0d8f415a2e..baa5b44968ac 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -626,6 +626,11 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
VM_BUG_ON_FOLIO(!folio_test_anon(folio), folio);
+ if (_pte == pte && (order != HPAGE_PMD_ORDER) && (folio_order(folio) == order) &&
+ test_bit(PG_head, &folio->page.flags) && !folio_test_partially_mapped(folio)) {
+ result = SCAN_PTE_MAPPED_THP;
+ goto out;
+ }
/* See hpage_collapse_scan_pmd(). */
if (folio_likely_mapped_shared(folio)) {
++shared;
@@ -1532,6 +1537,16 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm,
goto out_unmap;
}
+ /* Exit early: There is high chance of this due to faulting */
+ if (_pte == pte && (order != HPAGE_PMD_ORDER) && (folio_order(folio) == order) &&
+ test_bit(PG_head, &folio->page.flags) && !folio_test_partially_mapped(folio)) {
+ pte_unmap_unlock(pte, ptl);
+ _address = address + (PAGE_SIZE << order);
+ _pte = pte + (1UL << order);
+ result = SCAN_PTE_MAPPED_THP;
+ goto decide_order;
+ }
+
/*
* We treat a single page as shared if any part of the THP
* is shared. "False negatives" from
--
2.30.2
Powered by blists - more mailing lists