Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752817AbbHENVo (ORCPT ); Wed, 5 Aug 2015 09:21:44 -0400 Received: from forward-corp1f.mail.yandex.net ([95.108.130.40]:56277 "EHLO forward-corp1f.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751867AbbHENVm (ORCPT ); Wed, 5 Aug 2015 09:21:42 -0400 Authentication-Results: smtpcorp1m.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Message-ID: <55C20DDE.1080506@yandex-team.ru> Date: Wed, 05 Aug 2015 16:21:34 +0300 From: Konstantin Khlebnikov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Vlastimil Babka , Andrew Morton , Jerome Marchand CC: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Hugh Dickins , Michal Hocko , "Kirill A. Shutemov" , Cyrill Gorcunov , Randy Dunlap , linux-s390@vger.kernel.org, Martin Schwidefsky , Heiko Carstens , Peter Zijlstra , Paul Mackerras , Arnaldo Carvalho de Melo , Oleg Nesterov , Linux API , Minchan Kim Subject: Re: [PATCH v3 4/4] mm, procfs: Display VmAnon, VmFile and VmShm in /proc/pid/status References: <1438779685-5227-1-git-send-email-vbabka@suse.cz> <1438779685-5227-5-git-send-email-vbabka@suse.cz> In-Reply-To: <1438779685-5227-5-git-send-email-vbabka@suse.cz> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4559 Lines: 110 On 05.08.2015 16:01, 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 fcf67c7..fadd1b3 100644 > --- a/Documentation/filesystems/proc.txt > +++ b/Documentation/filesystems/proc.txt > @@ -168,6 +168,9 @@ For example, to get the status information of a process, all you have to do is > 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 > @@ -229,7 +232,12 @@ Table 1-2: Contents of the status files (as of 4.1) > 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) "Vm" is an acronym for Virtual Memory, but all these are not virtual. They are real pages. Let's leave VmRSS as is and invent better prefix for new fields: something like "Mem", "Pg", or no prefix at all. > 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 99b0efe..e299101 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; > -- Konstantin -- 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/