Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754707AbbB0KjM (ORCPT ); Fri, 27 Feb 2015 05:39:12 -0500 Received: from mail-ob0-f176.google.com ([209.85.214.176]:61441 "EHLO mail-ob0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752916AbbB0KjI (ORCPT ); Fri, 27 Feb 2015 05:39:08 -0500 MIME-Version: 1.0 In-Reply-To: <1424958666-18241-5-git-send-email-vbabka@suse.cz> References: <1424958666-18241-1-git-send-email-vbabka@suse.cz> <1424958666-18241-5-git-send-email-vbabka@suse.cz> From: Michael Kerrisk Date: Fri, 27 Feb 2015 11:38:47 +0100 X-Google-Sender-Auth: jjr1fG5Wl1UKWBAQyV016SUlaDg Message-ID: Subject: Re: [PATCH 4/4] mm, procfs: Display VmAnon, VmFile and VmShm in /proc/pid/status To: Vlastimil Babka Cc: linux-mm , Jerome Marchand , Linux Kernel , Andrew Morton , linux-doc , Hugh Dickins , Michal Hocko , "Kirill A. Shutemov" , Cyrill Gorcunov , Randy Dunlap , linux-s390 , Martin Schwidefsky , Heiko Carstens , Peter Zijlstra , Paul Mackerras , Arnaldo Carvalho de Melo , Oleg Nesterov , Linux API Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5137 Lines: 117 [CC += linux-api@] On Thu, Feb 26, 2015 at 2:51 PM, Vlastimil Babka wrote: > From: Jerome Marchand > > It's currently inconvenient to retrieve MM_ANONPAGES value from status > and statm files and there is no way to separate MM_FILEPAGES and > MM_SHMEMPAGES. Add VmAnon, VmFile and VmShm lines in /proc//status > to solve these issues. > > Signed-off-by: Jerome Marchand > Signed-off-by: Vlastimil Babka > --- > Documentation/filesystems/proc.txt | 10 +++++++++- > fs/proc/task_mmu.c | 13 +++++++++++-- > 2 files changed, 20 insertions(+), 3 deletions(-) > > diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt > index 8b30543..c777adb 100644 > --- a/Documentation/filesystems/proc.txt > +++ b/Documentation/filesystems/proc.txt > @@ -168,6 +168,9 @@ read the file /proc/PID/status: > VmLck: 0 kB > VmHWM: 476 kB > VmRSS: 476 kB > + VmAnon: 352 kB > + VmFile: 120 kB > + VmShm: 4 kB > VmData: 156 kB > VmStk: 88 kB > VmExe: 68 kB > @@ -224,7 +227,12 @@ Table 1-2: Contents of the status files (as of 2.6.30-rc7) > VmSize total program size > VmLck locked memory size > VmHWM peak resident set size ("high water mark") > - VmRSS size of memory portions > + VmRSS size of memory portions. It contains the three > + following parts (VmRSS = VmAnon + VmFile + VmShm) > + VmAnon size of resident anonymous memory > + VmFile size of resident file mappings > + VmShm size of resident shmem memory (includes SysV shm, > + mapping of tmpfs and shared anonymous mappings) > VmData size of data, stack, and text segments > VmStk size of data, stack, and text segments > VmExe size of text segment > diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c > index d70334c..a77a3ac 100644 > --- a/fs/proc/task_mmu.c > +++ b/fs/proc/task_mmu.c > @@ -22,7 +22,7 @@ > > void task_mem(struct seq_file *m, struct mm_struct *mm) > { > - unsigned long data, text, lib, swap, ptes, pmds; > + unsigned long data, text, lib, swap, ptes, pmds, anon, file, shmem; > unsigned long hiwater_vm, total_vm, hiwater_rss, total_rss; > > /* > @@ -39,6 +39,9 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) > if (hiwater_rss < mm->hiwater_rss) > hiwater_rss = mm->hiwater_rss; > > + anon = get_mm_counter(mm, MM_ANONPAGES); > + file = get_mm_counter(mm, MM_FILEPAGES); > + shmem = get_mm_counter_shmem(mm); > data = mm->total_vm - mm->shared_vm - mm->stack_vm; > text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK)) >> 10; > lib = (mm->exec_vm << (PAGE_SHIFT-10)) - text; > @@ -52,6 +55,9 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) > "VmPin:\t%8lu kB\n" > "VmHWM:\t%8lu kB\n" > "VmRSS:\t%8lu kB\n" > + "VmAnon:\t%8lu kB\n" > + "VmFile:\t%8lu kB\n" > + "VmShm:\t%8lu kB\n" > "VmData:\t%8lu kB\n" > "VmStk:\t%8lu kB\n" > "VmExe:\t%8lu kB\n" > @@ -65,6 +71,9 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) > mm->pinned_vm << (PAGE_SHIFT-10), > hiwater_rss << (PAGE_SHIFT-10), > total_rss << (PAGE_SHIFT-10), > + anon << (PAGE_SHIFT-10), > + file << (PAGE_SHIFT-10), > + shmem << (PAGE_SHIFT-10), > data << (PAGE_SHIFT-10), > mm->stack_vm << (PAGE_SHIFT-10), text, lib, > ptes >> 10, > @@ -82,7 +91,7 @@ unsigned long task_statm(struct mm_struct *mm, > unsigned long *data, unsigned long *resident) > { > *shared = get_mm_counter(mm, MM_FILEPAGES) + > - get_mm_counter(mm, MM_SHMEMPAGES); > + get_mm_counter_shmem(mm); > *text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK)) > >> PAGE_SHIFT; > *data = mm->total_vm - mm->shared_vm; > -- > 2.1.4 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: email@kvack.org -- Michael Kerrisk Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/ Author of "The Linux Programming Interface", http://blog.man7.org/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/