Commit efd41493 authored by Peter Xu's avatar Peter Xu Committed by Andrew Morton

mm/smaps: don't access young/dirty bit if pte unpresent

These bits should only be valid when the ptes are present.  Introducing
two booleans for it and set it to false when !pte_present() for both pte
and pmd accountings.

The bug is found during code reading and no real world issue reported, but
logically such an error can cause incorrect readings for either smaps or
smaps_rollup output on quite a few fields.

For example, it could cause over-estimate on values like Shared_Dirty,
Private_Dirty, Referenced.  Or it could also cause under-estimate on
values like LazyFree, Shared_Clean, Private_Clean.

Link: https://lkml.kernel.org/r/20220805160003.58929-1-peterx@redhat.com
Fixes: b1d4d9e0 ("proc/smaps: carefully handle migration entries")
Fixes: c94b6923 ("/proc/PID/smaps: Add PMD migration entry parsing")
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarYang Shi <shy828301@gmail.com>
Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Huang Ying <ying.huang@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a39c5d3c
...@@ -527,10 +527,12 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, ...@@ -527,10 +527,12 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr,
struct vm_area_struct *vma = walk->vma; struct vm_area_struct *vma = walk->vma;
bool locked = !!(vma->vm_flags & VM_LOCKED); bool locked = !!(vma->vm_flags & VM_LOCKED);
struct page *page = NULL; struct page *page = NULL;
bool migration = false; bool migration = false, young = false, dirty = false;
if (pte_present(*pte)) { if (pte_present(*pte)) {
page = vm_normal_page(vma, addr, *pte); page = vm_normal_page(vma, addr, *pte);
young = pte_young(*pte);
dirty = pte_dirty(*pte);
} else if (is_swap_pte(*pte)) { } else if (is_swap_pte(*pte)) {
swp_entry_t swpent = pte_to_swp_entry(*pte); swp_entry_t swpent = pte_to_swp_entry(*pte);
...@@ -560,8 +562,7 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr, ...@@ -560,8 +562,7 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr,
if (!page) if (!page)
return; return;
smaps_account(mss, page, false, pte_young(*pte), pte_dirty(*pte), smaps_account(mss, page, false, young, dirty, locked, migration);
locked, migration);
} }
#ifdef CONFIG_TRANSPARENT_HUGEPAGE #ifdef CONFIG_TRANSPARENT_HUGEPAGE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment