lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:	Thu, 8 Aug 2013 19:12:32 +0800
From:	tingwei liu <tingw.liu@...il.com>
To:	Adrian Brzezinski <adrian.brzezinski@...pl>
Cc:	linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/1] fs/proc: cached = pagecache - shmem

On Thu, Jul 25, 2013 at 2:12 AM, Adrian Brzezinski
<adrian.brzezinski@...pl> wrote:
>
> Cached value taken from /proc/meminfo counts also shmem pages.
> This can be very confusing when we encounter OOM problems.
>
> Maybe the better solution would be, to not increment NR_FILE_PAGES,
> when we have NR_SHMEM page? Should I rewrote and resend this patch?
>
I suggest to consider push this patch to mainline.
> Signed-off-by: Adrian Brzezinski <adrian.brzezinski@...pl>
> ---
>  fs/proc/meminfo.c |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
> index 5aa847a..d00aef5 100644
> --- a/fs/proc/meminfo.c
> +++ b/fs/proc/meminfo.c
> @@ -40,7 +40,12 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
>         allowed = ((totalram_pages - hugetlb_total_pages())
>                 * sysctl_overcommit_ratio / 100) + total_swap_pages;
>
> +       /*
> +        * NR_SHMEM pages can't be treated as a cache,
> +        * but they are counted in NR_FILE_PAGES
> +        */
>         cached = global_page_state(NR_FILE_PAGES) -
> +                       global_page_state(NR_SHMEM) -
>                         total_swapcache_pages() - i.bufferram;
>         if (cached < 0)
>                 cached = 0;
> @@ -59,6 +64,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
>                 "Buffers:        %8lu kB\n"
>                 "Cached:         %8lu kB\n"
>                 "SwapCached:     %8lu kB\n"
> +               "PageCache:      %8lu kB\n"
>                 "Active:         %8lu kB\n"
>                 "Inactive:       %8lu kB\n"
>                 "Active(anon):   %8lu kB\n"
> @@ -111,6 +117,7 @@ static int meminfo_proc_show(struct seq_file *m,
> void *v)
>                 K(i.bufferram),
>                 K(cached),
>                 K(total_swapcache_pages()),
> +               K(global_page_state(NR_FILE_PAGES)),
>                 K(pages[LRU_ACTIVE_ANON]   + pages[LRU_ACTIVE_FILE]),
>                 K(pages[LRU_INACTIVE_ANON] + pages[LRU_INACTIVE_FILE]),
>                 K(pages[LRU_ACTIVE_ANON]),
> --
> 1.7.1
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ