From: Tejun Heo <tj@kernel.org> To: vdavydov.dev@gmail.com, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org Cc: jsvana@fb.com, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, kernel-team@fb.com, Tejun Heo <tj@kernel.org> Subject: [PATCH 3/9] slab: simplify shutdown_memcg_caches() Date: Sat, 14 Jan 2017 00:54:43 -0500 [thread overview] Message-ID: <20170114055449.11044-4-tj@kernel.org> (raw) In-Reply-To: <20170114055449.11044-1-tj@kernel.org> shutdown_memcg_caches() shuts down all memcg caches associated with a root cache. It first walks the index table clearing and shutting down each entry and then shuts down the ones on root_cache->memcg_params.list. As active caches are on both the table and the list, they're stashed away from the list to avoid shutting down twice and then get spliced back later. This is unnecessarily complication. All memcg caches are on root_cache->memcg_params.list. The function can simply clear the index table and shut down all caches on the list. There's no need to muck with temporary stashing. Simplify the code. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Vladimir Davydov <vdavydov.dev@gmail.com> Cc: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Andrew Morton <akpm@linux-foundation.org> --- mm/slab_common.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 851c75e..45aa67c 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -634,48 +634,26 @@ static int shutdown_memcg_caches(struct kmem_cache *s) { struct memcg_cache_array *arr; struct kmem_cache *c, *c2; - LIST_HEAD(busy); int i; BUG_ON(!is_root_cache(s)); /* - * First, shutdown active caches, i.e. caches that belong to online - * memory cgroups. + * First, clear the pointers to all memcg caches so that they will + * never be accessed even if the root cache stays alive. */ arr = rcu_dereference_protected(s->memcg_params.memcg_caches, lockdep_is_held(&slab_mutex)); - for_each_memcg_cache_index(i) { - c = arr->entries[i]; - if (!c) - continue; - if (shutdown_cache(c)) - /* - * The cache still has objects. Move it to a temporary - * list so as not to try to destroy it for a second - * time while iterating over inactive caches below. - */ - list_move(&c->memcg_params.list, &busy); - else - /* - * The cache is empty and will be destroyed soon. Clear - * the pointer to it in the memcg_caches array so that - * it will never be accessed even if the root cache - * stays alive. - */ - arr->entries[i] = NULL; - } + for_each_memcg_cache_index(i) + arr->entries[i] = NULL; /* - * Second, shutdown all caches left from memory cgroups that are now - * offline. + * Shutdown all caches. */ list_for_each_entry_safe(c, c2, &s->memcg_params.list, memcg_params.list) shutdown_cache(c); - list_splice(&busy, &s->memcg_params.list); - /* * A cache being destroyed must be empty. In particular, this means * that all per memcg caches attached to it must be empty too. -- 2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj@kernel.org> To: vdavydov.dev@gmail.com, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org Cc: jsvana@fb.com, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, kernel-team@fb.com, Tejun Heo <tj@kernel.org> Subject: [PATCH 3/9] slab: simplify shutdown_memcg_caches() Date: Sat, 14 Jan 2017 00:54:43 -0500 [thread overview] Message-ID: <20170114055449.11044-4-tj@kernel.org> (raw) In-Reply-To: <20170114055449.11044-1-tj@kernel.org> shutdown_memcg_caches() shuts down all memcg caches associated with a root cache. It first walks the index table clearing and shutting down each entry and then shuts down the ones on root_cache->memcg_params.list. As active caches are on both the table and the list, they're stashed away from the list to avoid shutting down twice and then get spliced back later. This is unnecessarily complication. All memcg caches are on root_cache->memcg_params.list. The function can simply clear the index table and shut down all caches on the list. There's no need to muck with temporary stashing. Simplify the code. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Vladimir Davydov <vdavydov.dev@gmail.com> Cc: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Andrew Morton <akpm@linux-foundation.org> --- mm/slab_common.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 851c75e..45aa67c 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -634,48 +634,26 @@ static int shutdown_memcg_caches(struct kmem_cache *s) { struct memcg_cache_array *arr; struct kmem_cache *c, *c2; - LIST_HEAD(busy); int i; BUG_ON(!is_root_cache(s)); /* - * First, shutdown active caches, i.e. caches that belong to online - * memory cgroups. + * First, clear the pointers to all memcg caches so that they will + * never be accessed even if the root cache stays alive. */ arr = rcu_dereference_protected(s->memcg_params.memcg_caches, lockdep_is_held(&slab_mutex)); - for_each_memcg_cache_index(i) { - c = arr->entries[i]; - if (!c) - continue; - if (shutdown_cache(c)) - /* - * The cache still has objects. Move it to a temporary - * list so as not to try to destroy it for a second - * time while iterating over inactive caches below. - */ - list_move(&c->memcg_params.list, &busy); - else - /* - * The cache is empty and will be destroyed soon. Clear - * the pointer to it in the memcg_caches array so that - * it will never be accessed even if the root cache - * stays alive. - */ - arr->entries[i] = NULL; - } + for_each_memcg_cache_index(i) + arr->entries[i] = NULL; /* - * Second, shutdown all caches left from memory cgroups that are now - * offline. + * Shutdown all caches. */ list_for_each_entry_safe(c, c2, &s->memcg_params.list, memcg_params.list) shutdown_cache(c); - list_splice(&busy, &s->memcg_params.list); - /* * A cache being destroyed must be empty. In particular, this means * that all per memcg caches attached to it must be empty too. -- 2.9.3 -- 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:[~2017-01-14 5:56 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-14 5:54 [PATCHSET] slab: make memcg slab destruction scalable Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 5:54 ` [PATCH 1/9] Revert "slub: move synchronize_sched out of slab_mutex on shrink" Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 5:54 ` [PATCH 2/9] slab: remove synchronous rcu_barrier() call in memcg cache release path Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 13:19 ` Vladimir Davydov 2017-01-14 13:19 ` Vladimir Davydov 2017-01-14 15:19 ` Tejun Heo 2017-01-14 15:19 ` Tejun Heo 2017-01-17 0:07 ` Joonsoo Kim 2017-01-17 0:07 ` Joonsoo Kim 2017-01-17 0:07 ` Joonsoo Kim 2017-01-17 16:37 ` Tejun Heo 2017-01-17 16:37 ` Tejun Heo 2017-01-17 17:02 ` Tejun Heo 2017-01-17 17:02 ` Tejun Heo 2017-01-14 5:54 ` Tejun Heo [this message] 2017-01-14 5:54 ` [PATCH 3/9] slab: simplify shutdown_memcg_caches() Tejun Heo 2017-01-14 13:27 ` Vladimir Davydov 2017-01-14 13:27 ` Vladimir Davydov 2017-01-14 15:38 ` Tejun Heo 2017-01-14 15:38 ` Tejun Heo 2017-01-14 15:53 ` Tejun Heo 2017-01-14 15:53 ` Tejun Heo 2017-01-14 5:54 ` [PATCH 4/9] slab: reorganize memcg_cache_params Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 13:30 ` Vladimir Davydov 2017-01-14 13:30 ` Vladimir Davydov 2017-01-14 5:54 ` [PATCH 5/9] slab: link memcg kmem_caches on their associated memory cgroup Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 13:33 ` Vladimir Davydov 2017-01-14 13:33 ` Vladimir Davydov 2017-01-14 5:54 ` [PATCH 6/9] slab: don't put memcg caches on slab_caches list Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 13:39 ` Vladimir Davydov 2017-01-14 13:39 ` Vladimir Davydov 2017-01-14 15:39 ` Tejun Heo 2017-01-14 15:39 ` Tejun Heo 2017-01-14 15:39 ` Tejun Heo 2017-01-14 5:54 ` [PATCH 7/9] slab: introduce __kmemcg_cache_deactivate() Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 13:42 ` Vladimir Davydov 2017-01-14 13:42 ` Vladimir Davydov 2017-01-14 15:39 ` Tejun Heo 2017-01-14 15:39 ` Tejun Heo 2017-01-14 5:54 ` [PATCH 8/9] slab: remove synchronous synchronize_sched() from memcg cache deactivation path Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 13:57 ` Vladimir Davydov 2017-01-14 13:57 ` Vladimir Davydov 2017-01-14 13:57 ` Vladimir Davydov 2017-01-14 5:54 ` [PATCH 9/9] slab: remove slub sysfs interface files early for empty memcg caches Tejun Heo 2017-01-14 5:54 ` Tejun Heo 2017-01-14 14:00 ` Vladimir Davydov 2017-01-14 14:00 ` Vladimir Davydov
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=20170114055449.11044-4-tj@kernel.org \ --to=tj@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --cc=cl@linux.com \ --cc=hannes@cmpxchg.org \ --cc=iamjoonsoo.kim@lge.com \ --cc=jsvana@fb.com \ --cc=kernel-team@fb.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=penberg@kernel.org \ --cc=rientjes@google.com \ --cc=vdavydov.dev@gmail.com \ /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.