From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx131.postini.com [74.125.245.131]) by kanga.kvack.org (Postfix) with SMTP id 1AB3C6B006E for ; Mon, 9 Jul 2012 11:17:56 -0400 (EDT) Date: Mon, 9 Jul 2012 17:17:52 +0200 From: Michal Hocko Subject: Re: [patch 07/11] mm: memcg: remove unneeded shmem charge type Message-ID: <20120709151752.GJ4627@tiehlicka.suse.cz> References: <1341449103-1986-1-git-send-email-hannes@cmpxchg.org> <1341449103-1986-8-git-send-email-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1341449103-1986-8-git-send-email-hannes@cmpxchg.org> Sender: owner-linux-mm@kvack.org List-ID: To: Johannes Weiner Cc: Andrew Morton , KAMEZAWA Hiroyuki , Hugh Dickins , David Rientjes , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org On Thu 05-07-12 02:44:59, Johannes Weiner wrote: > shmem page charges have not needed a separate charge type to tell them > from regular file pages since 08e552c 'memcg: synchronized LRU'. > > Signed-off-by: Johannes Weiner Yes, MEM_CGROUP_CHARGE_TYPE_SHMEM has been quite confusing. Acked-by: Michal Hocko > --- > mm/memcontrol.c | 11 +---------- > 1 files changed, 1 insertions(+), 10 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 4a41b55..418b47d 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -379,7 +379,6 @@ static bool move_file(void) > enum charge_type { > MEM_CGROUP_CHARGE_TYPE_CACHE = 0, > MEM_CGROUP_CHARGE_TYPE_ANON, > - MEM_CGROUP_CHARGE_TYPE_SHMEM, /* used by page migration of shmem */ > MEM_CGROUP_CHARGE_TYPE_SWAPOUT, /* for accounting swapcache */ > MEM_CGROUP_CHARGE_TYPE_DROP, /* a page was unused swap cache */ > NR_CHARGE_TYPE, > @@ -2835,8 +2834,6 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, > > if (unlikely(!mm)) > mm = &init_mm; > - if (!page_is_file_cache(page)) > - type = MEM_CGROUP_CHARGE_TYPE_SHMEM; > > if (!PageSwapCache(page)) > ret = mem_cgroup_charge_common(page, mm, gfp_mask, type); > @@ -3243,10 +3240,8 @@ void mem_cgroup_prepare_migration(struct page *page, struct page *newpage, > */ > if (PageAnon(page)) > ctype = MEM_CGROUP_CHARGE_TYPE_ANON; > - else if (page_is_file_cache(page)) > - ctype = MEM_CGROUP_CHARGE_TYPE_CACHE; > else > - ctype = MEM_CGROUP_CHARGE_TYPE_SHMEM; > + ctype = MEM_CGROUP_CHARGE_TYPE_CACHE; > /* > * The page is committed to the memcg, but it's not actually > * charged to the res_counter since we plan on replacing the > @@ -3340,10 +3335,6 @@ void mem_cgroup_replace_page_cache(struct page *oldpage, > */ > if (!memcg) > return; > - > - if (PageSwapBacked(oldpage)) > - type = MEM_CGROUP_CHARGE_TYPE_SHMEM; > - > /* > * Even if newpage->mapping was NULL before starting replacement, > * the newpage may be on LRU(or pagevec for LRU) already. We lock > -- > 1.7.7.6 > -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic -- 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