From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Weiner Subject: Re: [patch 6/8] mm: memcg: remove unneeded checks from uncharge_page() Date: Thu, 24 Nov 2011 10:06:39 +0100 Message-ID: <20111124090639.GD6843@cmpxchg.org> References: <1322062951-1756-1-git-send-email-hannes@cmpxchg.org> <1322062951-1756-7-git-send-email-hannes@cmpxchg.org> <20111124090619.895988e7.kamezawa.hiroyu@jp.fujitsu.com> Mime-Version: 1.0 Return-path: Content-Disposition: inline In-Reply-To: <20111124090619.895988e7.kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org> Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: KAMEZAWA Hiroyuki Cc: Andrew Morton , Michal Hocko , Balbir Singh , cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org On Thu, Nov 24, 2011 at 09:06:19AM +0900, KAMEZAWA Hiroyuki wrote: > On Wed, 23 Nov 2011 16:42:29 +0100 > Johannes Weiner wrote: > > > From: Johannes Weiner > > > > mem_cgroup_uncharge_page() is only called on either freshly allocated > > pages without page->mapping or on rmapped PageAnon() pages. There is > > no need to check for a page->mapping that is not an anon_vma. > > > > Signed-off-by: Johannes Weiner > > For making our assumption clearer to readers of codes, > VM_BUG_ON(page->mapping && !PageAnon(page)) please. Yep, delta patch below. > Anyway, > Acked-by: KAMEZAWA Hiroyuki Thanks! --- From: Johannes Weiner Subject: mm: memcg: remove unneeded checks from uncharge_page() fix Document page state assumptions and catch if they are violated in uncharge_page(). Signed-off-by: Johannes Weiner --- mm/memcontrol.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 2f1fdc4..872dae1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2992,6 +2992,7 @@ void mem_cgroup_uncharge_page(struct page *page) /* early check. */ if (page_mapped(page)) return; + VM_BUG_ON(page->mapping && !PageAnon(page)); __mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_MAPPED); } -- 1.7.6.4 -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html