From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755331Ab2FZJMU (ORCPT ); Tue, 26 Jun 2012 05:12:20 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:51585 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753908Ab2FZJMR (ORCPT ); Tue, 26 Jun 2012 05:12:17 -0400 Date: Tue, 26 Jun 2012 02:12:15 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Glauber Costa cc: cgroups@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org, Frederic Weisbecker , Pekka Enberg , Michal Hocko , Johannes Weiner , Christoph Lameter , devel@openvz.org, kamezawa.hiroyu@jp.fujitsu.com, Tejun Heo , Pekka Enberg Subject: Re: [PATCH 06/11] memcg: kmem controller infrastructure In-Reply-To: <1340633728-12785-7-git-send-email-glommer@parallels.com> Message-ID: References: <1340633728-12785-1-git-send-email-glommer@parallels.com> <1340633728-12785-7-git-send-email-glommer@parallels.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 25 Jun 2012, Glauber Costa wrote: > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 83e7ba9..22479eb 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -21,6 +21,7 @@ > #define _LINUX_MEMCONTROL_H > #include > #include > +#include > > struct mem_cgroup; > struct page_cgroup; > @@ -409,6 +410,12 @@ struct sock; > #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM > void sock_update_memcg(struct sock *sk); > void sock_release_memcg(struct sock *sk); > + > +#define mem_cgroup_kmem_on 1 > +bool __mem_cgroup_new_kmem_page(gfp_t gfp, void *handle, int order); > +void __mem_cgroup_commit_kmem_page(struct page *page, void *handle, int order); > +void __mem_cgroup_free_kmem_page(struct page *page, int order); > +#define is_kmem_tracked_alloc (gfp & __GFP_KMEMCG) > #else > static inline void sock_update_memcg(struct sock *sk) > { > @@ -416,6 +423,43 @@ static inline void sock_update_memcg(struct sock *sk) > static inline void sock_release_memcg(struct sock *sk) > { > } > + > +#define mem_cgroup_kmem_on 0 > +#define __mem_cgroup_new_kmem_page(a, b, c) false > +#define __mem_cgroup_free_kmem_page(a,b ) > +#define __mem_cgroup_commit_kmem_page(a, b, c) > +#define is_kmem_tracked_alloc (false) > #endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */ > + > +static __always_inline > +bool mem_cgroup_new_kmem_page(gfp_t gfp, void *handle, int order) > +{ > + if (!mem_cgroup_kmem_on) > + return true; > + if (!is_kmem_tracked_alloc) > + return true; > + if (!current->mm) > + return true; > + if (in_interrupt()) > + return true; You can't test for current->mm in irq context, so you need to check for in_interrupt() first. Also, what prevents __mem_cgroup_new_kmem_page() from being called for a kthread that has called use_mm() before unuse_mm()? > + if (gfp & __GFP_NOFAIL) > + return true; > + return __mem_cgroup_new_kmem_page(gfp, handle, order); > +} > + > +static __always_inline > +void mem_cgroup_free_kmem_page(struct page *page, int order) > +{ > + if (mem_cgroup_kmem_on) > + __mem_cgroup_free_kmem_page(page, order); > +} > + > +static __always_inline > +void mem_cgroup_commit_kmem_page(struct page *page, struct mem_cgroup *handle, > + int order) > +{ > + if (mem_cgroup_kmem_on) > + __mem_cgroup_commit_kmem_page(page, handle, order); > +} > #endif /* _LINUX_MEMCONTROL_H */ > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx182.postini.com [74.125.245.182]) by kanga.kvack.org (Postfix) with SMTP id 6EBFD6B017D for ; Tue, 26 Jun 2012 05:12:18 -0400 (EDT) Received: by pbbrp2 with SMTP id rp2so9636749pbb.14 for ; Tue, 26 Jun 2012 02:12:17 -0700 (PDT) Date: Tue, 26 Jun 2012 02:12:15 -0700 (PDT) From: David Rientjes Subject: Re: [PATCH 06/11] memcg: kmem controller infrastructure In-Reply-To: <1340633728-12785-7-git-send-email-glommer@parallels.com> Message-ID: References: <1340633728-12785-1-git-send-email-glommer@parallels.com> <1340633728-12785-7-git-send-email-glommer@parallels.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-linux-mm@kvack.org List-ID: To: Glauber Costa Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org, Frederic Weisbecker , Pekka Enberg , Michal Hocko , Johannes Weiner , Christoph Lameter , devel@openvz.org, kamezawa.hiroyu@jp.fujitsu.com, Tejun Heo , Pekka Enberg On Mon, 25 Jun 2012, Glauber Costa wrote: > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 83e7ba9..22479eb 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -21,6 +21,7 @@ > #define _LINUX_MEMCONTROL_H > #include > #include > +#include > > struct mem_cgroup; > struct page_cgroup; > @@ -409,6 +410,12 @@ struct sock; > #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM > void sock_update_memcg(struct sock *sk); > void sock_release_memcg(struct sock *sk); > + > +#define mem_cgroup_kmem_on 1 > +bool __mem_cgroup_new_kmem_page(gfp_t gfp, void *handle, int order); > +void __mem_cgroup_commit_kmem_page(struct page *page, void *handle, int order); > +void __mem_cgroup_free_kmem_page(struct page *page, int order); > +#define is_kmem_tracked_alloc (gfp & __GFP_KMEMCG) > #else > static inline void sock_update_memcg(struct sock *sk) > { > @@ -416,6 +423,43 @@ static inline void sock_update_memcg(struct sock *sk) > static inline void sock_release_memcg(struct sock *sk) > { > } > + > +#define mem_cgroup_kmem_on 0 > +#define __mem_cgroup_new_kmem_page(a, b, c) false > +#define __mem_cgroup_free_kmem_page(a,b ) > +#define __mem_cgroup_commit_kmem_page(a, b, c) > +#define is_kmem_tracked_alloc (false) > #endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */ > + > +static __always_inline > +bool mem_cgroup_new_kmem_page(gfp_t gfp, void *handle, int order) > +{ > + if (!mem_cgroup_kmem_on) > + return true; > + if (!is_kmem_tracked_alloc) > + return true; > + if (!current->mm) > + return true; > + if (in_interrupt()) > + return true; You can't test for current->mm in irq context, so you need to check for in_interrupt() first. Also, what prevents __mem_cgroup_new_kmem_page() from being called for a kthread that has called use_mm() before unuse_mm()? > + if (gfp & __GFP_NOFAIL) > + return true; > + return __mem_cgroup_new_kmem_page(gfp, handle, order); > +} > + > +static __always_inline > +void mem_cgroup_free_kmem_page(struct page *page, int order) > +{ > + if (mem_cgroup_kmem_on) > + __mem_cgroup_free_kmem_page(page, order); > +} > + > +static __always_inline > +void mem_cgroup_commit_kmem_page(struct page *page, struct mem_cgroup *handle, > + int order) > +{ > + if (mem_cgroup_kmem_on) > + __mem_cgroup_commit_kmem_page(page, handle, order); > +} > #endif /* _LINUX_MEMCONTROL_H */ > -- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Rientjes Subject: Re: [PATCH 06/11] memcg: kmem controller infrastructure Date: Tue, 26 Jun 2012 02:12:15 -0700 (PDT) Message-ID: References: <1340633728-12785-1-git-send-email-glommer@parallels.com> <1340633728-12785-7-git-send-email-glommer@parallels.com> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type; bh=dUPtyBTVzevbHcp/rcE0FgDaERTneHN3gJB/UnE9bTE=; b=kWge+RcnyEBORpIDjCMJoy8K6KWEBEHIctdPuggbnsNkKVAX1KzqrDZwVJVRFxdsCa ox9LaEbZffLvG+Q66JJ6J2CuB5o1i65hrAseHVUkehTXpi1c56t2eHaA3tuvel+KTgZ2 qrNk31xLmc3GJYUFt3wGE9dtV3PzG7n/OQ78SR8xw0xd/UOTbwDjDdusMdDQFXBz0lxz sWmJnJYTbTsTcKT21TwU07E6B+U2pjHBMwFbnAiUK3PpWEhPrrY7eA7pqoyVlkQzokzn s3GC0RPempbr3of1LBLpKyrFIOAxIyJBp3cUcQbK6T1dD+QYTsrPxfFGaLpr2MCqN5JC VABw== In-Reply-To: <1340633728-12785-7-git-send-email-glommer-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org> Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: TEXT/PLAIN; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Glauber Costa Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, Andrew Morton , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Frederic Weisbecker , Pekka Enberg , Michal Hocko , Johannes Weiner , Christoph Lameter , devel-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org, kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org, Tejun Heo , Pekka Enberg On Mon, 25 Jun 2012, Glauber Costa wrote: > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 83e7ba9..22479eb 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -21,6 +21,7 @@ > #define _LINUX_MEMCONTROL_H > #include > #include > +#include > > struct mem_cgroup; > struct page_cgroup; > @@ -409,6 +410,12 @@ struct sock; > #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM > void sock_update_memcg(struct sock *sk); > void sock_release_memcg(struct sock *sk); > + > +#define mem_cgroup_kmem_on 1 > +bool __mem_cgroup_new_kmem_page(gfp_t gfp, void *handle, int order); > +void __mem_cgroup_commit_kmem_page(struct page *page, void *handle, int order); > +void __mem_cgroup_free_kmem_page(struct page *page, int order); > +#define is_kmem_tracked_alloc (gfp & __GFP_KMEMCG) > #else > static inline void sock_update_memcg(struct sock *sk) > { > @@ -416,6 +423,43 @@ static inline void sock_update_memcg(struct sock *sk) > static inline void sock_release_memcg(struct sock *sk) > { > } > + > +#define mem_cgroup_kmem_on 0 > +#define __mem_cgroup_new_kmem_page(a, b, c) false > +#define __mem_cgroup_free_kmem_page(a,b ) > +#define __mem_cgroup_commit_kmem_page(a, b, c) > +#define is_kmem_tracked_alloc (false) > #endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */ > + > +static __always_inline > +bool mem_cgroup_new_kmem_page(gfp_t gfp, void *handle, int order) > +{ > + if (!mem_cgroup_kmem_on) > + return true; > + if (!is_kmem_tracked_alloc) > + return true; > + if (!current->mm) > + return true; > + if (in_interrupt()) > + return true; You can't test for current->mm in irq context, so you need to check for in_interrupt() first. Also, what prevents __mem_cgroup_new_kmem_page() from being called for a kthread that has called use_mm() before unuse_mm()? > + if (gfp & __GFP_NOFAIL) > + return true; > + return __mem_cgroup_new_kmem_page(gfp, handle, order); > +} > + > +static __always_inline > +void mem_cgroup_free_kmem_page(struct page *page, int order) > +{ > + if (mem_cgroup_kmem_on) > + __mem_cgroup_free_kmem_page(page, order); > +} > + > +static __always_inline > +void mem_cgroup_commit_kmem_page(struct page *page, struct mem_cgroup *handle, > + int order) > +{ > + if (mem_cgroup_kmem_on) > + __mem_cgroup_commit_kmem_page(page, handle, order); > +} > #endif /* _LINUX_MEMCONTROL_H */ >