lkml.org 
[lkml]   [2012]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 5/6] memcg: remove PCG_FILE_MAPPED
On Fri, Feb 17, 2012 at 06:28:18PM +0900, KAMEZAWA Hiroyuki wrote:
> >From a19a8eae9c2a3dabb25a50c7a1b2e3a183935260 Mon Sep 17 00:00:00 2001
> From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
> Date: Thu, 2 Feb 2012 15:02:18 +0900
> Subject: [PATCH 5/6] memcg: remove PCG_FILE_MAPPED
>
> with new lock scheme for updating memcg's page stat, we don't need
> a flag PCG_FILE_MAPPED which was duplicated information of page_mapped().
>
> Acked-by: Greg Thelen <gthelen@google.com>
> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
> ---
> include/linux/page_cgroup.h | 6 ------
> mm/memcontrol.c | 6 +-----
> 2 files changed, 1 insertions(+), 11 deletions(-)
>
> diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
> index 7a3af74..a88cdba 100644
> --- a/include/linux/page_cgroup.h
> +++ b/include/linux/page_cgroup.h
> @@ -6,8 +6,6 @@ enum {
> PCG_LOCK, /* Lock for pc->mem_cgroup and following bits. */
> PCG_USED, /* this object is in use. */
> PCG_MIGRATION, /* under page migration */
> - /* flags for mem_cgroup and file and I/O status */
> - PCG_FILE_MAPPED, /* page is accounted as "mapped" */
> __NR_PCG_FLAGS,
> };
>
> @@ -66,10 +64,6 @@ TESTPCGFLAG(Used, USED)
> CLEARPCGFLAG(Used, USED)
> SETPCGFLAG(Used, USED)
>
> -SETPCGFLAG(FileMapped, FILE_MAPPED)
> -CLEARPCGFLAG(FileMapped, FILE_MAPPED)
> -TESTPCGFLAG(FileMapped, FILE_MAPPED)
> -
> SETPCGFLAG(Migration, MIGRATION)
> CLEARPCGFLAG(Migration, MIGRATION)
> TESTPCGFLAG(Migration, MIGRATION)
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 86bdde0..e19cffb 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -1935,10 +1935,6 @@ void mem_cgroup_update_page_stat(struct page *page,
>
> switch (idx) {
> case MEMCG_NR_FILE_MAPPED:
> - if (val > 0)
> - SetPageCgroupFileMapped(pc);
> - else if (!page_mapped(page))
> - ClearPageCgroupFileMapped(pc);
> idx = MEM_CGROUP_STAT_FILE_MAPPED;
> break;
> default:
> @@ -2559,7 +2555,7 @@ static int mem_cgroup_move_account(struct page *page,
>
> move_lock_mem_cgroup(from, &flags);
>
> - if (PageCgroupFileMapped(pc)) {
> + if (page_mapped(page)) {

As opposed to update_page_stat(), this runs against all types of
pages, so I think it should be

if (!PageAnon(page) && page_mapped(page))
instead.

> /* Update mapped_file data for mem_cgroup */
> preempt_disable();
> __this_cpu_dec(from->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]);


\
 
 \ /
  Last update: 2012-02-18 14:41    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site