diff options
| author | Shakeel Butt <shakeelb@google.com> | 2018-03-23 09:22:29 +0100 |
|---|---|---|
| committer | Michal Hocko <mhocko@suse.com> | 2018-03-23 09:22:29 +0100 |
| commit | a47df3923d330ebff06f4d21ef188d4b5333d486 (patch) | |
| tree | 53969572a0b32cd1e6754776393a6c2094ba1edd | |
| parent | b0c31724e905064b6c6f7fd5021183d14a9cf7e8 (diff) | |
mm, slab: memcg_link the SLAB's kmem_cache
All the root caches are linked into slab_root_caches which was introduced
by the commit 510ded33e075 ("slab: implement slab_root_caches list") but
it missed to add the SLAB's kmem_cache.
While experimenting with opt-in/opt-out kmem accounting, I noticed system
crashes due to NULL dereference inside cache_from_memcg_idx() while
deferencing kmem_cache.memcg_params.memcg_caches. The upstream clean
kernel will not see these crashes but SLAB should be consistent with SLUB
which does linked its boot caches (kmem_cache_node and kmem_cache) into
slab_root_caches.
Link: http://lkml.kernel.org/r/20180319210020.60289-1-shakeelb@google.com
Fixes: 510ded33e075c ("slab: implement slab_root_caches list")
Signed-off-by: Shakeel Butt <shakeelb@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Greg Thelen <gthelen@google.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: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | mm/slab.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/slab.c b/mm/slab.c index 699954f06b8a..b98f7b825fa4 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1283,6 +1283,7 @@ void __init kmem_cache_init(void) nr_node_ids * sizeof(struct kmem_cache_node *), SLAB_HWCACHE_ALIGN); list_add(&kmem_cache->list, &slab_caches); + memcg_link_cache(kmem_cache); slab_state = PARTIAL; /* |