summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/memcontrol.h14
-rw-r--r--mm/memcontrol.c11
-rw-r--r--mm/slab_common.c3
3 files changed, 19 insertions, 9 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index b3e7a667e03c..284daff507fb 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -497,8 +497,9 @@ void __memcg_kmem_commit_charge(struct page *page,
void __memcg_kmem_uncharge_pages(struct page *page, int order);
int memcg_cache_id(struct mem_cgroup *memcg);
-int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s,
- struct kmem_cache *root_cache);
+int memcg_alloc_cache_params(struct mem_cgroup *memcg, struct kmem_cache *s,
+ struct kmem_cache *root_cache);
+void memcg_free_cache_params(struct kmem_cache *s);
void memcg_release_cache(struct kmem_cache *cachep);
void memcg_cache_list_add(struct mem_cgroup *memcg, struct kmem_cache *cachep);
@@ -640,13 +641,16 @@ static inline int memcg_cache_id(struct mem_cgroup *memcg)
return -1;
}
-static inline int
-memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s,
- struct kmem_cache *root_cache)
+static inline int memcg_alloc_cache_params(struct mem_cgroup *memcg,
+ struct kmem_cache *s, struct kmem_cache *root_cache)
{
return 0;
}
+static inline void memcg_free_cache_params(struct kmem_cache *s)
+{
+}
+
static inline void memcg_release_cache(struct kmem_cache *cachep)
{
}
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 72f2d90e7ef6..b8ebe71f872d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3231,8 +3231,8 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups)
return 0;
}
-int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s,
- struct kmem_cache *root_cache)
+int memcg_alloc_cache_params(struct mem_cgroup *memcg, struct kmem_cache *s,
+ struct kmem_cache *root_cache)
{
size_t size;
@@ -3260,6 +3260,11 @@ int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s,
return 0;
}
+void memcg_free_cache_params(struct kmem_cache *s)
+{
+ kfree(s->memcg_params);
+}
+
void memcg_release_cache(struct kmem_cache *s)
{
struct kmem_cache *root;
@@ -3288,7 +3293,7 @@ void memcg_release_cache(struct kmem_cache *s)
css_put(&memcg->css);
out:
- kfree(s->memcg_params);
+ memcg_free_cache_params(s);
}
/*
diff --git a/mm/slab_common.c b/mm/slab_common.c
index f70df3ef6f1a..70f9e249ac30 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -205,7 +205,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
if (!s->name)
goto out_free_cache;
- err = memcg_register_cache(memcg, s, parent_cache);
+ err = memcg_alloc_cache_params(memcg, s, parent_cache);
if (err)
goto out_free_cache;
@@ -235,6 +235,7 @@ out_unlock:
return s;
out_free_cache:
+ memcg_free_cache_params(s);
kfree(s->name);
kmem_cache_free(kmem_cache, s);
goto out_unlock;