From: Glauber Costa <glommer@parallels.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>, Tejun Heo <tj@kernel.org>, Michal Hocko <mhocko@suse.cz>, Johannes Weiner <hannes@cmpxchg.org>, <kamezawa.hiroyu@jp.fujitsu.com>, Christoph Lameter <cl@linux.com>, Pekka Enberg <penberg@kernel.org>, Glauber Costa <glommer@parallels.com> Subject: [PATCH 3/7] memcg: remove test for current->mm in memcg_stop/resume_kmem_account Date: Thu, 15 Nov 2012 06:54:49 +0400 [thread overview] Message-ID: <1352948093-2315-4-git-send-email-glommer@parallels.com> (raw) In-Reply-To: <1352948093-2315-1-git-send-email-glommer@parallels.com> The original reason for the existence of this test, was that memcg_kmem_cache_create could be called from either softirq context (where memcg_stop/resume_account is not needed), or process context, (where memcg_stop/resume_account is needed). Just skipping it in-function was the cleanest way to merge both behaviors. The reason for that is that we would try to create caches right away through memcg_kmem_cache_create if the context would allow us to. However, the final version of the code that merged did not have this behavior and we always queue up new cache creation. Thus, instead of a comment explaining why current->mm test is needed, my proposal in this patch is to remove memcg_stop/resume_account from the worker thread and make sure all callers have a valid mm context. Signed-off-by: Glauber Costa <glommer@parallels.com> CC: Michal Hocko <mhocko@suse.cz> CC: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> CC: Johannes Weiner <hannes@cmpxchg.org> CC: Andrew Morton <akpm@linux-foundation.org> --- mm/memcontrol.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c0c6adf..f9c5981 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3063,17 +3063,13 @@ out: */ static inline void memcg_stop_kmem_account(void) { - if (!current->mm) - return; - + VM_BUG_ON(!current->mm); current->memcg_kmem_skip_account++; } static inline void memcg_resume_kmem_account(void) { - if (!current->mm) - return; - + VM_BUG_ON(!current->mm); current->memcg_kmem_skip_account--; } @@ -3206,11 +3202,7 @@ static struct kmem_cache *memcg_create_kmem_cache(struct mem_cgroup *memcg, if (new_cachep) goto out; - /* Don't block progress to enqueue caches for internal infrastructure */ - memcg_stop_kmem_account(); new_cachep = kmem_cache_dup(memcg, cachep); - memcg_resume_kmem_account(); - if (new_cachep == NULL) { new_cachep = cachep; goto out; -- 1.7.11.7
WARNING: multiple messages have this Message-ID (diff)
From: Glauber Costa <glommer@parallels.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>, Michal Hocko <mhocko@suse.cz>, Johannes Weiner <hannes@cmpxchg.org>, kamezawa.hiroyu@jp.fujitsu.com, Christoph Lameter <cl@linux.com>, Pekka Enberg <penberg@kernel.org>, Glauber Costa <glommer@parallels.com> Subject: [PATCH 3/7] memcg: remove test for current->mm in memcg_stop/resume_kmem_account Date: Thu, 15 Nov 2012 06:54:49 +0400 [thread overview] Message-ID: <1352948093-2315-4-git-send-email-glommer@parallels.com> (raw) In-Reply-To: <1352948093-2315-1-git-send-email-glommer@parallels.com> The original reason for the existence of this test, was that memcg_kmem_cache_create could be called from either softirq context (where memcg_stop/resume_account is not needed), or process context, (where memcg_stop/resume_account is needed). Just skipping it in-function was the cleanest way to merge both behaviors. The reason for that is that we would try to create caches right away through memcg_kmem_cache_create if the context would allow us to. However, the final version of the code that merged did not have this behavior and we always queue up new cache creation. Thus, instead of a comment explaining why current->mm test is needed, my proposal in this patch is to remove memcg_stop/resume_account from the worker thread and make sure all callers have a valid mm context. Signed-off-by: Glauber Costa <glommer@parallels.com> CC: Michal Hocko <mhocko@suse.cz> CC: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> CC: Johannes Weiner <hannes@cmpxchg.org> CC: Andrew Morton <akpm@linux-foundation.org> --- mm/memcontrol.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c0c6adf..f9c5981 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3063,17 +3063,13 @@ out: */ static inline void memcg_stop_kmem_account(void) { - if (!current->mm) - return; - + VM_BUG_ON(!current->mm); current->memcg_kmem_skip_account++; } static inline void memcg_resume_kmem_account(void) { - if (!current->mm) - return; - + VM_BUG_ON(!current->mm); current->memcg_kmem_skip_account--; } @@ -3206,11 +3202,7 @@ static struct kmem_cache *memcg_create_kmem_cache(struct mem_cgroup *memcg, if (new_cachep) goto out; - /* Don't block progress to enqueue caches for internal infrastructure */ - memcg_stop_kmem_account(); new_cachep = kmem_cache_dup(memcg, cachep); - memcg_resume_kmem_account(); - if (new_cachep == NULL) { new_cachep = cachep; goto out; -- 1.7.11.7 -- 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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-11-14 18:54 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-11-15 2:54 [PATCH 0/7] fixups for kmemcg Glauber Costa 2012-11-15 2:54 ` Glauber Costa 2012-11-15 0:47 ` David Rientjes 2012-11-15 0:47 ` David Rientjes 2012-11-15 2:54 ` [PATCH 1/7] memcg: simplify ida initialization Glauber Costa 2012-11-15 2:54 ` Glauber Costa 2012-11-15 2:54 ` [PATCH 2/7] move include of workqueue.h to top of slab.h file Glauber Costa 2012-11-15 2:54 ` Glauber Costa 2012-11-15 9:30 ` Kamezawa Hiroyuki 2012-11-15 9:30 ` Kamezawa Hiroyuki 2012-11-15 2:54 ` Glauber Costa [this message] 2012-11-15 2:54 ` [PATCH 3/7] memcg: remove test for current->mm in memcg_stop/resume_kmem_account Glauber Costa 2012-11-15 9:28 ` Kamezawa Hiroyuki 2012-11-15 9:28 ` Kamezawa Hiroyuki 2012-11-15 2:54 ` [PATCH 4/7] memcg: replace __always_inline with plain inline Glauber Costa 2012-11-15 2:54 ` Glauber Costa 2012-11-15 9:29 ` Kamezawa Hiroyuki 2012-11-15 9:29 ` Kamezawa Hiroyuki 2012-11-15 2:54 ` [PATCH 5/7] memcg: get rid of once-per-second cache shrinking for dead memcgs Glauber Costa 2012-11-15 2:54 ` Glauber Costa 2012-11-15 9:41 ` Kamezawa Hiroyuki 2012-11-15 9:41 ` Kamezawa Hiroyuki 2012-11-15 13:47 ` Glauber Costa 2012-11-15 13:47 ` Glauber Costa 2012-11-16 5:07 ` Kamezawa Hiroyuki 2012-11-16 5:07 ` Kamezawa Hiroyuki 2012-11-16 7:11 ` Glauber Costa 2012-11-16 7:11 ` Glauber Costa 2012-11-16 7:21 ` Kamezawa Hiroyuki 2012-11-16 7:21 ` Kamezawa Hiroyuki 2012-11-16 14:55 ` Michal Hocko 2012-11-16 14:55 ` Michal Hocko 2012-11-16 15:50 ` Glauber Costa 2012-11-16 15:50 ` Glauber Costa 2012-11-15 2:54 ` [PATCH 6/7] memcg: add comments clarifying aspects of cache attribute propagation Glauber Costa 2012-11-15 2:54 ` Glauber Costa 2012-11-15 2:54 ` [PATCH 7/7] slub: drop mutex before deleting sysfs entry Glauber Costa 2012-11-15 2:54 ` Glauber Costa
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1352948093-2315-4-git-send-email-glommer@parallels.com \ --to=glommer@parallels.com \ --cc=akpm@linux-foundation.org \ --cc=cl@linux.com \ --cc=hannes@cmpxchg.org \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.cz \ --cc=penberg@kernel.org \ --cc=tj@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.