Commit 6401a2e6 authored by David Hildenbrand's avatar David Hildenbrand Committed by Andrew Morton
Browse files

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: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 88e4e47c

fs/proc/task_mmu.c

+7 −6
Original line number Diff line number Diff line
@@ -730,19 +730,20 @@ static int smaps_hugetlb_range(pte_t *pte, unsigned long hmask, 
{

	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));