diff options
| author | Yang Shi | 2018-08-18 00:44:55 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-08-18 01:20:28 +0200 |
| commit | fadae2953072e9005c5f1d64e1049edb043494dc (patch) | |
| tree | 11915df568a18c7b814b80778abfb7b8ece15271 /mm/memory.c | |
| parent | mm: skip invalid pages block at a time in zero_resv_unresv() (diff) | |
| download | kernel-qcow2-linux-fadae2953072e9005c5f1d64e1049edb043494dc.tar.gz kernel-qcow2-linux-fadae2953072e9005c5f1d64e1049edb043494dc.tar.xz kernel-qcow2-linux-fadae2953072e9005c5f1d64e1049edb043494dc.zip | |
thp: use mm_file_counter to determine update which rss counter
Since commit eca56ff906bd ("mm, shmem: add internal shmem resident
memory accounting"), MM_SHMEMPAGES is added to separate the shmem
accounting from regular files. So, all shmem pages should be accounted
to MM_SHMEMPAGES instead of MM_FILEPAGES.
And, normal 4K shmem pages have been accounted to MM_SHMEMPAGES, so
shmem thp pages should be not treated differently. Account them to
MM_SHMEMPAGES via mm_counter_file() since shmem pages are swap backed to
keep consistent with normal 4K shmem pages.
This will not change the rss counter of processes since shmem pages are
still a part of it.
The /proc/pid/status and /proc/pid/statm counters will however be more
accurate wrt shmem usage, as originally intended. And as eca56ff906bd
("mm, shmem: add internal shmem resident memory accounting") mentioned,
oom also could report more accurate "shmem-rss".
Link: http://lkml.kernel.org/r/1529442518-17398-1-git-send-email-yang.shi@linux.alibaba.com
Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 7c3bd119fcca..d7b5b22a1a0a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3400,7 +3400,7 @@ static int do_set_pmd(struct vm_fault *vmf, struct page *page) if (write) entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); - add_mm_counter(vma->vm_mm, MM_FILEPAGES, HPAGE_PMD_NR); + add_mm_counter(vma->vm_mm, mm_counter_file(page), HPAGE_PMD_NR); page_add_file_rmap(page, true); /* * deposit and withdraw with pmd lock held |