| From: Andrew Morton <akpm@linux-foundation.org> |
| Subject: mm-hugetlb-proc-check-for-hugetlb-shared-pmd-in-proc-pid-smaps-fix |
| Date: Fri Jan 27 03:00:32 PM PST 2023 |
| |
| simplification, per David |
| |
| Cc: David Hildenbrand <david@redhat.com> |
| Cc: James Houghton <jthoughton@google.com> |
| Cc: Matthew Wilcox <willy@infradead.org> |
| Cc: Michal Hocko <mhocko@suse.com> |
| Cc: Mike Kravetz <mike.kravetz@oracle.com> |
| Cc: Muchun Song <songmuchun@bytedance.com> |
| Cc: Naoya Horiguchi <naoya.horiguchi@linux.dev> |
| Cc: Peter Xu <peterx@redhat.com> |
| Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com> |
| Cc: Yang Shi <shy828301@gmail.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| |
| --- a/fs/proc/task_mmu.c~mm-hugetlb-proc-check-for-hugetlb-shared-pmd-in-proc-pid-smaps-fix |
| +++ a/fs/proc/task_mmu.c |
| @@ -745,18 +745,10 @@ static int smaps_hugetlb_range(pte_t *pt |
| page = pfn_swap_entry_to_page(swpent); |
| } |
| if (page) { |
| - int mapcount = page_mapcount(page); |
| - |
| - if (mapcount >= 2) |
| + if (page_mapcount(page) >= 2 || hugetlb_pmd_shared(pte)) |
| mss->shared_hugetlb += huge_page_size(hstate_vma(vma)); |
| - else { |
| - if (hugetlb_pmd_shared(pte)) |
| - mss->shared_hugetlb += |
| - huge_page_size(hstate_vma(vma)); |
| - else |
| - mss->private_hugetlb += |
| - huge_page_size(hstate_vma(vma)); |
| - } |
| + else |
| + mss->private_hugetlb += huge_page_size(hstate_vma(vma)); |
| } |
| return 0; |
| } |
| _ |
