1 files changed, 33 insertions, 2 deletions

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 2834bc2886fd..2dd920dc3776 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -205,6 +205,8 @@ kmem_cache_create(const char *name, size_t size, size_t align,
         int err;
 
         get_online_cpus();
+        get_online_mems();
+
         mutex_lock(&slab_mutex);
 
         err = kmem_cache_sanity_check(name, size);
@@ -239,6 +241,8 @@ kmem_cache_create(const char *name, size_t size, size_t align,
 
 out_unlock:
         mutex_unlock(&slab_mutex);
+
+        put_online_mems();
         put_online_cpus();
 
         if (err) {
@@ -272,6 +276,8 @@ void kmem_cache_create_memcg(struct mem_cgroup *memcg, struct kmem_cache *root_c
         char *cache_name;
 
         get_online_cpus();
+        get_online_mems();
+
         mutex_lock(&slab_mutex);
 
         /*
@@ -295,6 +301,8 @@ void kmem_cache_create_memcg(struct mem_cgroup *memcg, struct kmem_cache *root_c
 
 out_unlock:
         mutex_unlock(&slab_mutex);
+
+        put_online_mems();
         put_online_cpus();
 }
 
@@ -328,6 +336,8 @@ void slab_kmem_cache_release(struct kmem_cache *s)
 void kmem_cache_destroy(struct kmem_cache *s)
 {
         get_online_cpus();
+        get_online_mems();
+
         mutex_lock(&slab_mutex);
 
         s->refcount--;
@@ -359,15 +369,36 @@ void kmem_cache_destroy(struct kmem_cache *s)
 #else
         slab_kmem_cache_release(s);
 #endif
-        goto out_put_cpus;
+        goto out;
 
 out_unlock:
         mutex_unlock(&slab_mutex);
-out_put_cpus:
+out:
+        put_online_mems();
         put_online_cpus();
 }
 EXPORT_SYMBOL(kmem_cache_destroy);
 
+/**
+ * kmem_cache_shrink - Shrink a cache.
+ * @cachep: The cache to shrink.
+ *
+ * Releases as many slabs as possible for a cache.
+ * To help debugging, a zero exit status indicates all slabs were released.
+ */
+int kmem_cache_shrink(struct kmem_cache *cachep)
+{
+        int ret;
+
+        get_online_cpus();
+        get_online_mems();
+        ret = __kmem_cache_shrink(cachep);
+        put_online_mems();
+        put_online_cpus();
+        return ret;
+}
+EXPORT_SYMBOL(kmem_cache_shrink);
+
 int slab_is_available(void)
 {
         return slab_state >= UP;