fs-proc-task_mmu-convert-smaps_hugetlb_range-to-work-on-folios.patch removed from -mm tree
The quilt patch titled
Subject: fs/proc/task_mmu: convert smaps_hugetlb_range() to work on folios
has been removed from the -mm tree. Its filename was
fs-proc-task_mmu-convert-smaps_hugetlb_range-to-work-on-folios.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: convert smaps_hugetlb_range() to work on folios
Date: Wed, 17 Apr 2024 11:23:13 +0200
Let's get rid of another page_mapcount() check and simply use folio_likely_mapped_shared(), which is precise for hugetlb folios.
While at it, use huge_ptep_get() + pte_page() instead of ptep_get() + vm_normal_page(), just like we do in pagemap_hugetlb_range().
No functional change intended.
---
fs/proc/task_mmu.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~fs-proc-task_mmu-convert-smaps_hugetlb_range-to-work-on-folios +7 -6
@@ -730,19 +730,20 @@ static int smaps_hugetlb_range(pte_t *pt {struct mem_size_stats *mss = walk->private;struct vm_area_struct *vma = walk->vma; -struct page *page =NULL ; -pte_t ptent =ptep_get (pte); +pte_t ptent =huge_ptep_get (pte); +struct folio *folio =NULL ;if (pte_present (ptent)) { - page =vm_normal_page (vma, addr, ptent); + folio =page_folio (pte_page (ptent)); }else if (is_swap_pte (ptent)) {swp_entry_t swpent =pte_to_swp_entry (ptent);if (is_pfn_swap_entry (swpent)) - page =pfn_swap_entry_to_page (swpent); + folio =pfn_swap_entry_folio (swpent); } -if (page) { -if (page_mapcount (page) >=2 ||hugetlb_pmd_shared (pte)) +if (folio) { +if (folio_likely_mapped_shared (folio) || +hugetlb_pmd_shared (pte)) mss->shared_hugetlb +=huge_page_size (hstate_vma (vma));else mss->private_hugetlb +=huge_page_size (hstate_vma (vma));
_
Patches currently in -mm which might be from [email protected] are