mm: teach mincore_hugetlb about pte markers
Subsystems (2)
PATCH 1/1 mm: teach mincore_hugetlb about pte markers
By checking huge_pte_none(), we incorrectly classify PTE markers as "present". Instead, check huge_pte_none_mostly(), classifying PTE markers the same as if the PTE were completely blank.
PTE markers, unlike other kinds of swap entries, don't reference any physical page and don't indicate that a physical page was mapped previously. As such, treat them as non-present for the sake of mincore().
--- mm/mincore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mincore.c +1 -1
@@ -33,7 +33,7 @@ static int mincore_hugetlb(pte_t *pte, unsigned long hmask, unsigned long addr,* Hugepages under user process are always in RAM and never * swapped out, but theoretically it needs to be checked. */ - present = pte && !huge_pte_none (huge_ptep_get (pte)); + present = pte && !huge_pte_none_mostly (huge_ptep_get (pte));for (; addr != end; vec++, addr +=PAGE_SIZE ) *vec = present; walk->private = vec;
Signature · 1 line
2.40.0.rc0.216.gc4246ad0f0-goog
Quoted 11 lines · James Houghton
By checking
huge_pte_none(), we incorrectly classify PTE markers as "present". Instead, checkhuge_pte_none_mostly(), classifying PTE markers the same as if the PTE were completely blank.PTE markers, unlike other kinds of swap entries, don't reference any physical page and don't indicate that a physical page was mapped previously. As such, treat them as non-present for the sake of
mincore().Fixes 5c041f5d1f23 ("mm: teach core mm about pte markers")Signed-off-by James Houghton <[email protected]>
Thanks, James.
Signature · 1 line
Peter Xu
Andrew Morton
maintainerQuoted 10 lines · On Thu, 2 Mar 2023 17:32:48 -0500 Peter Xu <[email protected]> wrote:
Quoted 9 lines · James Houghton
By checking
huge_pte_none(), we incorrectly classify PTE markers as "present". Instead, checkhuge_pte_none_mostly(), classifying PTE markers the same as if the PTE were completely blank.PTE markers, unlike other kinds of swap entries, don't reference any physical page and don't indicate that a physical page was mapped previously. As such, treat them as non-present for the sake of
mincore().
Quoted 5 lines
Quoted 2 lines
Fixes 5c041f5d1f23 ("mm: teach core mm about pte markers")Signed-off-by James Houghton <[email protected]>Acked-by Peter Xu <[email protected]>
I think I'll add cc:stable to this.
Quoted 20 lines · James Houghton
By checking
huge_pte_none(), we incorrectly classify PTE markers as "present". Instead, checkhuge_pte_none_mostly(), classifying PTE markers the same as if the PTE were completely blank.PTE markers, unlike other kinds of swap entries, don't reference any physical page and don't indicate that a physical page was mapped previously. As such, treat them as non-present for the sake of
mincore().Fixes 5c041f5d1f23 ("mm: teach core mm about pte markers")Signed-off-by James Houghton <[email protected]>--- mm/mincore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/mincore.c +0
-0
mm/mincore.c static int mincore_hugetlb(pte_t *pte, unsigned long hmask, unsigned long addr, · line 39
Quoted 8 lines
mm/mincore.c +1
-1@@ -33,7 +33,7 @@ static int mincore_hugetlb(pte_t *pte, unsigned long hmask, unsigned long addr,* Hugepages under user process are always in RAM and never * swapped out, but theoretically it needs to be checked. */ - present = pte && !huge_pte_none (huge_ptep_get (pte)); + present = pte && !huge_pte_none_mostly (huge_ptep_get (pte));for (; addr != end; vec++, addr +=PAGE_SIZE ) *vec = present; walk->private = vec;
Signature · 3 lines
Thanks, David / dhildenb