|
@@ -4708,6 +4708,22 @@ enum slab_stat_type {
|
|
|
#define SO_OBJECTS (1 << SL_OBJECTS)
|
|
|
#define SO_TOTAL (1 << SL_TOTAL)
|
|
|
|
|
|
+#ifdef CONFIG_MEMCG
|
|
|
+static bool memcg_sysfs_enabled = IS_ENABLED(CONFIG_SLUB_MEMCG_SYSFS_ON);
|
|
|
+
|
|
|
+static int __init setup_slub_memcg_sysfs(char *str)
|
|
|
+{
|
|
|
+ int v;
|
|
|
+
|
|
|
+ if (get_option(&str, &v) > 0)
|
|
|
+ memcg_sysfs_enabled = v;
|
|
|
+
|
|
|
+ return 1;
|
|
|
+}
|
|
|
+
|
|
|
+__setup("slub_memcg_sysfs=", setup_slub_memcg_sysfs);
|
|
|
+#endif
|
|
|
+
|
|
|
static ssize_t show_slab_objects(struct kmem_cache *s,
|
|
|
char *buf, unsigned long flags)
|
|
|
{
|
|
@@ -5611,8 +5627,14 @@ static int sysfs_slab_add(struct kmem_cache *s)
|
|
|
{
|
|
|
int err;
|
|
|
const char *name;
|
|
|
+ struct kset *kset = cache_kset(s);
|
|
|
int unmergeable = slab_unmergeable(s);
|
|
|
|
|
|
+ if (!kset) {
|
|
|
+ kobject_init(&s->kobj, &slab_ktype);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
if (unmergeable) {
|
|
|
/*
|
|
|
* Slabcache can never be merged so we can use the name proper.
|
|
@@ -5629,7 +5651,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
|
|
|
name = create_unique_id(s);
|
|
|
}
|
|
|
|
|
|
- s->kobj.kset = cache_kset(s);
|
|
|
+ s->kobj.kset = kset;
|
|
|
err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, "%s", name);
|
|
|
if (err)
|
|
|
goto out;
|
|
@@ -5639,7 +5661,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
|
|
|
goto out_del_kobj;
|
|
|
|
|
|
#ifdef CONFIG_MEMCG
|
|
|
- if (is_root_cache(s)) {
|
|
|
+ if (is_root_cache(s) && memcg_sysfs_enabled) {
|
|
|
s->memcg_kset = kset_create_and_add("cgroup", NULL, &s->kobj);
|
|
|
if (!s->memcg_kset) {
|
|
|
err = -ENOMEM;
|