Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/proc/task_mmu: convert smaps_hugetlb_range() to work on folios

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.

Link: https://lkml.kernel.org/r/20240417092313.753919-3-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

David Hildenbrand and committed by
Andrew Morton
6401a2e6 88e4e47c

+7 -6
+7 -6
fs/proc/task_mmu.c
··· 730 730 { 731 731 struct mem_size_stats *mss = walk->private; 732 732 struct vm_area_struct *vma = walk->vma; 733 - struct page *page = NULL; 734 - pte_t ptent = ptep_get(pte); 733 + pte_t ptent = huge_ptep_get(pte); 734 + struct folio *folio = NULL; 735 735 736 736 if (pte_present(ptent)) { 737 - page = vm_normal_page(vma, addr, ptent); 737 + folio = page_folio(pte_page(ptent)); 738 738 } else if (is_swap_pte(ptent)) { 739 739 swp_entry_t swpent = pte_to_swp_entry(ptent); 740 740 741 741 if (is_pfn_swap_entry(swpent)) 742 - page = pfn_swap_entry_to_page(swpent); 742 + folio = pfn_swap_entry_folio(swpent); 743 743 } 744 - if (page) { 745 - if (page_mapcount(page) >= 2 || hugetlb_pmd_shared(pte)) 744 + if (folio) { 745 + if (folio_likely_mapped_shared(folio) || 746 + hugetlb_pmd_shared(pte)) 746 747 mss->shared_hugetlb += huge_page_size(hstate_vma(vma)); 747 748 else 748 749 mss->private_hugetlb += huge_page_size(hstate_vma(vma));