mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
Commita08c7193e4("mm/filemap: remove hugetlb special casing in filemap.c") changed mapping->nrpages to count base pages for hugetlb folios. However, shm_add_rss_swap() still multiplies it by pages_per_huge_page(), overcounting RSS in both SHM_INFO and /proc/sysvipc/shm. Use mapping->nrpages for RSS accounting across all backing types, and account swap only for non-hugetlb shmem. Use READ_ONCE() for both counters instead of info->lock, which does not protect nrpages and cannot provide a consistent snapshot. Link: https://lore.kernel.org/[email protected] Fixes:a08c7193e4("mm/filemap: remove hugetlb special casing in filemap.c") Signed-off-by: Weilin Tong <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Suggested-by: Muchun Song <[email protected]> Acked-by: Muchun Song <[email protected]> Cc: Oscar Salvador <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Sidhartha Kumar <[email protected]> Cc: Lorenzo Stoakes <[email protected]> Cc: Dan Carpenter <[email protected]> Cc: Baolin Wang <[email protected]> Cc: <[email protected]>