What does glommer think about kmem cgroup ?

index a88948b..cd5d091 100644
@@ -142,7 +142,7 @@ static void __d_free(struct rcu_head *head)
 	WARN_ON(!list_empty(&dentry->d_alias));
 	if (dname_external(dentry))
 		kfree(dentry->d_name.name);
-	kmem_cache_free(dentry_cache, dentry); 
+	kmem_cache_free(dentry->dentry_cache, dentry); 
 }
 
 /*

@@ -1160,6 +1160,8 @@ void shrink_dcache_parent(struct dentry * parent)
 }
 EXPORT_SYMBOL(shrink_dcache_parent);
 
+static struct memcg_slab_ctlr dcache_ctlr;
+
 /**
  * __d_alloc	-	allocate a dcache entry
  * @sb: filesystem it will belong to

@@ -1173,9 +1175,14 @@ EXPORT_SYMBOL(shrink_dcache_parent);
 struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
 {
 	struct dentry *dentry;
+	struct kmem_cache *current_dcache;
 	char *dname;
 
-	dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
+	current_dcache = current_kmem_cache(dcache_ctlr.token);
+	if (unlikely(!current_dcache))
+		current_dcache = dentry_cache;
+
+	dentry = kmem_cache_alloc(current_dcache, GFP_KERNEL);
 	if (!dentry)
 		return NULL;
 

@@ -1210,6 +1217,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
 	INIT_LIST_HEAD(&dentry->d_alias);
 	INIT_LIST_HEAD(&dentry->d_u.d_child);
 	d_set_d_op(dentry, dentry->d_sb->s_d_op);
+	dentry->dentry_cache = current_dcache;
 
 	this_cpu_inc(nr_dentry);
 

@@ -2945,6 +2953,35 @@ static void __init dcache_init_early(void)
 		INIT_HLIST_BL_HEAD(dentry_hashtable + loop);
 }
 
+static struct kmem_cache *dcache_new_kmem(struct mem_cgroup *memcg,
+					  struct mem_cgroup *parent)
+{
+	char *name;
+
+	if (!parent)
+		return dentry_cache;
+
+	name = kasprintf(GFP_KERNEL, "memcg-dentry-%p", memcg);
+
+	return kmem_cache_create(name, sizeof(struct dentry),
+				__alignof__(struct dentry),
+				SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD, NULL);
+}
+
+static void dcache_destroy_kmem(struct kmem_cache *cachep)
+{
+	if (cachep == dentry_cache)
+		return;
+
+	kfree(cachep->name);
+	kmem_cache_destroy(cachep);
+}
+
+static struct memcg_slab_ctlr dcache_ctlr = {
+	.memcg_create_kmem_cache = dcache_new_kmem,
+	.memcg_destroy_kmem_cache = dcache_destroy_kmem,
+};
+
 static void __init dcache_init(void)
 {
 	int loop;

@@ -2957,6 +2994,8 @@ static void __init dcache_init(void)
 	dentry_cache = KMEM_CACHE(dentry,
 		SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD);
 
+	register_memcg_slab_ctlr(&dcache_ctlr);
+
 	/* Hash may have been set up in dcache_init_early */
 	if (!hashdist)
 		return;

index 62157c0..a002292 100644
@@ -142,6 +142,7 @@ struct dentry {
 	} d_u;
 	struct list_head d_subdirs;	/* our children */
 	struct list_head d_alias;	/* inode alias list */
+	struct kmem_cache *dentry_cache;
 };
 
 /*

index 343bd76..1b7ef0c 100644
@@ -158,6 +158,9 @@ void mem_cgroup_split_huge_fixup(struct page *head, struct page *tail);
 bool mem_cgroup_bad_page_check(struct page *page);
 void mem_cgroup_print_bad_page(struct page *page);
 #endif
+
+struct kmem_cache *current_kmem_cache(int token);
+
 #else /* CONFIG_CGROUP_MEM_RES_CTLR */
 struct mem_cgroup;
 

@@ -376,5 +379,33 @@ mem_cgroup_print_bad_page(struct page *page)
 }
 #endif
 
+struct memcg_slab_ctlr {
+	struct list_head list;
+	struct kmem_cache *cachep;
+	struct kmem_cache *(*memcg_create_kmem_cache)(struct mem_cgroup *memcg,
+						      struct mem_cgroup *parent);
+	void (*memcg_destroy_kmem_cache)(struct kmem_cache *cachep);
+	int token;
+};
+
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
+int mem_cgroup_kmem_charge(struct kmem_cache *cachep, gfp_t flags, int nr_pages);
+void mem_cgroup_kmem_uncharge(struct kmem_cache *cachep, int nr_pages);
+void register_memcg_slab_ctlr(struct memcg_slab_ctlr *ctlr);
+
+#else
+static inline int mem_cgroup_kmem_charge(struct kmem_cache *cachep, gfp_t flags, int nr_pages)
+{
+	return 0;
+}
+static inline void mem_cgroup_kmem_uncharge(struct kmem_cache *cachep, int nr_pages)
+{
+}
+
+static inline void register_memcg_slab_ctlr(struct memcg_slab_ctlr *ctlr)
+{
+}
+#endif
+
 #endif /* _LINUX_MEMCONTROL_H */
 

index 573c809..0bdefe2 100644
@@ -103,6 +103,7 @@ struct kmem_cache *kmem_cache_create(const char *, size_t, size_t,
 			void (*)(void *));
 void kmem_cache_destroy(struct kmem_cache *);
 int kmem_cache_shrink(struct kmem_cache *);
+int kmem_cache_shrink_pages(struct kmem_cache *, int nr_pages);
 void kmem_cache_free(struct kmem_cache *, void *);
 unsigned int kmem_cache_size(struct kmem_cache *);
 

index d00e0ba..1ec3bc0 100644
@@ -23,6 +23,8 @@
  * manages a cache.
  */
 
+struct mem_cgroup;
+
 struct kmem_cache {
 /* 1) Cache tunables. Protected by cache_chain_mutex */
 	unsigned int batchcount;

@@ -55,6 +57,8 @@ struct kmem_cache {
 /* 4) cache creation/removal */
 	const char *name;
 	struct list_head next;
+	struct mem_cgroup *memcg;
+	struct list_head memcg_list;
 
 /* 5) statistics */
 #ifdef CONFIG_DEBUG_SLAB

@@ -111,6 +115,15 @@ extern struct cache_sizes malloc_sizes[];
 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
 void *__kmalloc(size_t size, gfp_t flags);
 
+static inline void slab_associate_memcg(struct kmem_cache *kmem, struct mem_cgroup *memcg)
+{
+	kmem->memcg = memcg;
+}
+static inline struct mem_cgroup *slab_cache_memcg(struct kmem_cache *kmem)
+{
+	return kmem->memcg;
+}
+
 #ifdef CONFIG_TRACING
 extern void *kmem_cache_alloc_trace(size_t size,
 				    struct kmem_cache *cachep, gfp_t flags);

246 lines not on this page · raw message

86 lines not on this page · raw message