fs-proc-task_mmu-dont-indicate-pm_mmap_exclusive-without-pm_present.patch removed from -mm tree
The quilt patch titled
Subject: fs/proc/task_mmu: don't indicate PM_MMAP_EXCLUSIVE without PM_PRESENT
has been removed from the -mm tree. Its filename was
fs-proc-task_mmu-dont-indicate-pm_mmap_exclusive-without-pm_present.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: don't indicate PM_MMAP_EXCLUSIVE without PM_PRESENT
Date: Fri, 7 Jun 2024 14:23:53 +0200
Relying on the mapcount for non-present PTEs that reference pages doesn't make any sense: they are not accounted in the mapcount, so page_mapcount() == 1 won't return the result we actually want to know.
While we don't check the mapcount for migration entries already, we could end up checking it for swap, hwpoison, device exclusive, ... entries, which we really shouldn't.
There is one exception: device private entries, which we consider fake-present (e.g., incremented the mapcount). But we won't care about that for now for PM_MMAP_EXCLUSIVE, because indicating PM_SWAP for them although they are fake-present already sounds suspiciously wrong.
Let's never indicate PM_MMAP_EXCLUSIVE without PM_PRESENT.
---
fs/proc/task_mmu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~fs-proc-task_mmu-dont-indicate-pm_mmap_exclusive-without-pm_present +2 -6
@@ -1415,7 +1415,6 @@ static pagemap_entry_t pte_to_pagemap_en {u64 frame =0 , flags =0 ;struct page *page =NULL ; -bool migration = false;if (pte_present (pte)) {if (pm->show_pfn)
@@ -1447,7 +1446,6 @@ static pagemap_entry_t pte_to_pagemap_en (offset <<MAX_SWAPFILES_SHIFT ); } flags |=PM_SWAP ; - migration =is_migration_entry (entry);if (is_pfn_swap_entry (entry)) page =pfn_swap_entry_to_page (entry);if (pte_marker_entry_uffd_wp (entry))
@@ -1456,7 +1454,7 @@ static pagemap_entry_t pte_to_pagemap_enif (page && !PageAnon (page)) flags |=PM_FILE ; -if (page && !migration &&page_mapcount (page) ==1 ) +if (page && (flags &PM_PRESENT ) &&page_mapcount (page) ==1 ) flags |=PM_MMAP_EXCLUSIVE ;if (vma->vm_flags &VM_SOFTDIRTY ) flags |=PM_SOFT_DIRTY ;
@@ -1473,7 +1471,6 @@ static int pagemap_pmd_range(pmd_t *pmdppte_t *pte, *orig_pte;int err =0 ;#ifdef CONFIG_TRANSPARENT_HUGEPAGE -bool migration = false; ptl =pmd_trans_huge_lock (pmdp, vma);if (ptl) {
@@ -1517,14 +1514,13 @@ static int pagemap_pmd_range(pmd_t *pmdpif (pmd_swp_uffd_wp (pmd)) flags |=PM_UFFD_WP ;VM_BUG_ON (!is_pmd_migration_entry (pmd)); - migration =is_migration_entry (entry); page = pfn_swap_entry_to_page(entry); }#endif if (page && !PageAnon (page)) flags |=PM_FILE ; -if (page && !migration &&page_mapcount (page) ==1 ) +if (page && (flags &PM_PRESENT ) &&page_mapcount (page) ==1 ) flags |=PM_MMAP_EXCLUSIVE ;for (; addr != end; addr +=PAGE_SIZE ) {
_
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