mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
c261e7d94f
Currently, /proc/pid/smaps will always show "Swap: 0 kB" for shmem-backed mappings, even if the mapped portion does contain pages that were swapped out. This is because unlike private anonymous mappings, shmem does not change pte to swap entry, but pte_none when swapping the page out. In the smaps page walk, such page thus looks like it was never faulted in. This patch changes smaps_pte_entry() to determine the swap status for such pte_none entries for shmem mappings, similarly to how mincore_page() does it. Swapped out shmem pages are thus accounted for. For private mappings of tmpfs files that COWed some of the pages, swaped out status of the original shmem pages is naturally ignored. If some of the private copies was also swapped out, they are accounted via their page table swap entries, so the resulting reported swap usage is then a sum of both swapped out private copies, and swapped out shmem pages that were not COWed. No double accounting can thus happen. The accounting is arguably still not as precise as for private anonymous mappings, since now we will count also pages that the process in question never accessed, but another process populated them and then let them become swapped out. I believe it is still less confusing and subtle than not showing any swap usage by shmem mappings at all. Swapped out counter might of interest of users who would like to prevent from future swapins during performance critical operation and pre-fault them at their convenience. Especially for larger swapped out regions the cost of swapin is much higher than a fresh page allocation. So a differentiation between pte_none vs. swapped out is important for those usecases. One downside of this patch is that it makes /proc/pid/smaps more expensive for shmem mappings, as we consult the radix tree for each pte_none entry, so the overal complexity is O(n*log(n)). I have measured this on a process that creates a 2GB mapping and dirties single pages with a stride of 2MB, and time how long does it take to cat /proc/pid/smaps of this process 100 times. Private anonymous mapping: real 0m0.949s user 0m0.116s sys 0m0.348s Mapping of a /dev/shm/file: real 0m3.831s user 0m0.180s sys 0m3.212s The difference is rather substantial, so the next patch will reduce the cost for shared or read-only mappings. In a less controlled experiment, I've gathered pids of processes on my desktop that have either '/dev/shm/*' or 'SYSV*' in smaps. This included the Chrome browser and some KDE processes. Again, I've run cat /proc/pid/smaps on each 100 times. Before this patch: real 0m9.050s user 0m0.518s sys 0m8.066s After this patch: real 0m9.221s user 0m0.541s sys 0m8.187s This suggests low impact on average systems. Note that this patch doesn't attempt to adjust the SwapPss field for shmem mappings, which would need extra work to determine who else could have the pages mapped. Thus the value stays zero except for COWed swapped out pages in a shmem mapping, which are accounted as usual. Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Acked-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Acked-by: Jerome Marchand <jmarchan@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Hugh Dickins <hughd@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
||
|---|---|---|
| .. | ||
| caching | ||
| cifs | ||
| configfs | ||
| nfs | ||
| pohmelfs | ||
| .gitignore | ||
| 00-INDEX | ||
| 9p.txt | ||
| adfs.txt | ||
| affs.txt | ||
| afs.txt | ||
| autofs4-mount-control.txt | ||
| autofs4.txt | ||
| automount-support.txt | ||
| befs.txt | ||
| bfs.txt | ||
| btrfs.txt | ||
| ceph.txt | ||
| coda.txt | ||
| cramfs.txt | ||
| dax.txt | ||
| debugfs.txt | ||
| devpts.txt | ||
| directory-locking | ||
| dlmfs.txt | ||
| dnotify.txt | ||
| dnotify_test.c | ||
| ecryptfs.txt | ||
| efivarfs.txt | ||
| exofs.txt | ||
| ext2.txt | ||
| ext3.txt | ||
| ext4.txt | ||
| f2fs.txt | ||
| fiemap.txt | ||
| files.txt | ||
| fuse.txt | ||
| gfs2-glocks.txt | ||
| gfs2-uevents.txt | ||
| gfs2.txt | ||
| hfs.txt | ||
| hfsplus.txt | ||
| hpfs.txt | ||
| inotify.txt | ||
| isofs.txt | ||
| jfs.txt | ||
| Locking | ||
| locks.txt | ||
| logfs.txt | ||
| Makefile | ||
| mandatory-locking.txt | ||
| ncpfs.txt | ||
| nilfs2.txt | ||
| ntfs.txt | ||
| ocfs2.txt | ||
| omfs.txt | ||
| overlayfs.txt | ||
| path-lookup.md | ||
| path-lookup.txt | ||
| porting | ||
| proc.txt | ||
| qnx6.txt | ||
| quota.txt | ||
| ramfs-rootfs-initramfs.txt | ||
| relay.txt | ||
| romfs.txt | ||
| seq_file.txt | ||
| sharedsubtree.txt | ||
| spufs.txt | ||
| squashfs.txt | ||
| sysfs-pci.txt | ||
| sysfs-tagging.txt | ||
| sysfs.txt | ||
| sysv-fs.txt | ||
| tmpfs.txt | ||
| ubifs.txt | ||
| udf.txt | ||
| ufs.txt | ||
| vfat.txt | ||
| vfs.txt | ||
| xfs-delayed-logging-design.txt | ||
| xfs-self-describing-metadata.txt | ||
| xfs.txt | ||