fs-proc-task_mmu-properly-detect-pm_mmap_exclusive-per-page-of-pmd-mapped-thps.patch removed from -mm tree
The quilt patch titled
Subject: fs/proc/task_mmu: properly detect PM_MMAP_EXCLUSIVE per page of PMD-mapped THPs
has been removed from the -mm tree. Its filename was
fs-proc-task_mmu-properly-detect-pm_mmap_exclusive-per-page-of-pmd-mapped-thps.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: David Hildenbrand <[email protected]>
Subject: fs/proc/task_mmu: properly detect PM_MMAP_EXCLUSIVE per page of PMD-mapped THPs
Date: Fri, 7 Jun 2024 14:23:54 +0200
We added PM_MMAP_EXCLUSIVE in 2015 via commit 77bb499bb60f ("pagemap: add mmap-exclusive bit for marking pages mapped only here"), when THPs could not be partially mapped and page_mapcount() returned something that was true for all pages of the THP.
In 2016, we added support for partially mapping THPs via commit 53f9263baba6 ("mm: rework mapcount accounting to enable 4k mapping of THPs") but missed to determine PM_MMAP_EXCLUSIVE as well per page.
Checking page_mapcount() on the head page does not tell the whole story.
We should check each individual page. In a future without per-page mapcounts it will be different, but we'll change that to be consistent with PTE-mapped THPs once we deal with that.
---
fs/proc/task_mmu.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~fs-proc-task_mmu-properly-detect-pm_mmap_exclusive-per-page-of-pmd-mapped-thps +12 -10
@@ -1474,6 +1474,7 @@ static int pagemap_pmd_range(pmd_t *pmdp ptl =pmd_trans_huge_lock (pmdp, vma);if (ptl) { +unsigned int idx = (addr & ~PMD_MASK ) >>PAGE_SHIFT ;u64 flags =0 , frame =0 ;pmd_t pmd = *pmdp;struct page *page =NULL ;
@@ -1490,8 +1491,7 @@ static int pagemap_pmd_range(pmd_t *pmdpif (pmd_uffd_wp (pmd)) flags |=PM_UFFD_WP ;if (pm->show_pfn) - frame =pmd_pfn (pmd) + - ((addr & ~PMD_MASK ) >>PAGE_SHIFT ); + frame =pmd_pfn (pmd) + idx; }#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION else if (is_swap_pmd(pmd)) {
@@ -1500,11 +1500,9 @@ static int pagemap_pmd_range(pmd_t *pmdpif (pm->show_pfn) {if (is_pfn_swap_entry (entry)) - offset =swp_offset_pfn (entry); + offset =swp_offset_pfn (entry) + idx;else - offset =swp_offset (entry); - offset = offset + - ((addr & ~PMD_MASK ) >>PAGE_SHIFT ); + offset =swp_offset (entry) + idx; frame =swp_type (entry) | (offset <<MAX_SWAPFILES_SHIFT ); }
@@ -1520,12 +1518,16 @@ static int pagemap_pmd_range(pmd_t *pmdpif (page && !PageAnon (page)) flags |=PM_FILE ; -if (page && (flags &PM_PRESENT ) &&page_mapcount (page) ==1 ) - flags |=PM_MMAP_EXCLUSIVE ; -for (; addr != end; addr +=PAGE_SIZE ) { -pagemap_entry_t pme =make_pme (frame, flags); +for (; addr != end; addr +=PAGE_SIZE , idx++) { +unsigned long cur_flags = flags; +pagemap_entry_t pme; + +if (page && (flags &PM_PRESENT ) && +page_mapcount (page + idx) ==1 ) + cur_flags |=PM_MMAP_EXCLUSIVE ; + pme =make_pme (frame, cur_flags); err =add_to_pagemap (&pme, pm);if (err)break ;
_
Patches currently in -mm which might be from [email protected] are
mm-pass-meminit_context-to-__free_pages_core.patch mm-pass-meminit_context-to-__free_pages_core-fix.patch mm-pass-meminit_context-to-__free_pages_core-fix-2.patch mm-pass-meminit_context-to-__free_pages_core-fix-3.patch mm-memory_hotplug-initialize-memmap-of-zone_device-with-pageoffline-instead-of-pagereserved.patch mm-memory_hotplug-skip-adjust_managed_page_count-for-pageoffline-pages-when-offlining.patch mm-read-page_type-using-read_once.patch mm-migrate-make-migrate_misplaced_folio-return-0-on-success.patch mm-migrate-move-numa-hinting-fault-folio-isolation-checks-under-ptl.patch