mm-khugepaged-check-compound_order-in-collapse_pte_mapped_thp.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: check compound_order() in collapse_pte_mapped_thp()
has been removed from the -mm tree. Its filename was
mm-khugepaged-check-compound_order-in-collapse_pte_mapped_thp.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: "Zach O'Keefe" <[email protected]>
Subject: mm/khugepaged: check compound_order() in collapse_pte_mapped_thp()
Date: Thu, 22 Sep 2022 15:27:31 -0700
By the time we lock a page in collapse_pte_mapped_thp(), the page mapped by the address pushed onto the slot's .pte_mapped_thp[] array might have changed arbitrarily since we last looked at it. We revalidate that the page is still the head of a compound page, but we don't revalidate if the compound page is of order HPAGE_PMD_ORDER before applying rmap and page table updates.
Since the kernel now supports large folios of arbitrary order, and since replacing page's pte mappings by a pmd mapping only makes sense for compound pages of order HPAGE_PMD_ORDER, revalidate that the compound order is indeed of order HPAGE_PMD_ORDER before proceeding.
---
mm/khugepaged.c | 3 +++ 1 file changed, 3 insertions(+)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-check-compound_order-in-collapse_pte_mapped_thp +3 -0
@@ -1399,6 +1399,9 @@ void collapse_pte_mapped_thp(struct mm_sif (!PageHead (hpage)) goto drop_hpage; +if (compound_order (hpage) !=HPAGE_PMD_ORDER ) + goto drop_hpage; +if (find_pmd_or_thp_or_none (mm, haddr, &pmd) !=SCAN_SUCCEED ) goto drop_hpage;
_
Patches currently in -mm which might be from [email protected] are