The patch titled
memcg: disable the memory controller by default
has been removed from the -mm tree. Its filename was
disable-the-memory-controller-by-default-v3.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memcg: disable the memory controller by default
From: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Due to the overhead of the memory controller the memory controller is now
disabled by default. This patch adds cgroup_enable.
[akpm@xxxxxxxxxxxxxxxxxxxx: `inline __init' doesn't make sense]
Signed-off-by: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: AMAMOTO Takashi <yamamoto@xxxxxxxxxxxxx>
Acked-by: Paul Menage <menage@xxxxxxxxxx>
Cc: Pavel Emelianov <xemul@xxxxxxxxxx>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/kernel-parameters.txt | 3 +++
kernel/cgroup.c | 17 +++++++++++++----
mm/memcontrol.c | 1 +
3 files changed, 17 insertions(+), 4 deletions(-)
diff -puN Documentation/kernel-parameters.txt~disable-the-memory-controller-by-default-v3 Documentation/kernel-parameters.txt
--- a/Documentation/kernel-parameters.txt~disable-the-memory-controller-by-default-v3
+++ a/Documentation/kernel-parameters.txt
@@ -382,8 +382,11 @@ and is between 256 and 4096 characters.
See Documentation/s390/CommonIO for details.
cgroup_disable= [KNL] Disable a particular controller
+ cgroup_enable= [KNL] Enable a particular controller
+ For both cgroup_enable and cgroup_enable
Format: {name of the controller(s) to disable}
{Currently supported controllers - "memory"}
+ {Memory controller is disabled by default}
checkreqprot [SELINUX] Set initial checkreqprot flag value.
Format: { "0" | "1" }
diff -puN kernel/cgroup.c~disable-the-memory-controller-by-default-v3 kernel/cgroup.c
--- a/kernel/cgroup.c~disable-the-memory-controller-by-default-v3
+++ a/kernel/cgroup.c
@@ -3120,7 +3120,7 @@ static void cgroup_release_agent(struct
mutex_unlock(&cgroup_mutex);
}
-static int __init cgroup_disable(char *str)
+static int __init cgroup_turnonoff(char *str, int disable)
{
int i;
char *token;
@@ -3133,13 +3133,22 @@ static int __init cgroup_disable(char *s
struct cgroup_subsys *ss = subsys[i];
if (!strcmp(token, ss->name)) {
- ss->disabled = 1;
- printk(KERN_INFO "Disabling %s control group"
- " subsystem\n", ss->name);
+ ss->disabled = disable;
break;
}
}
}
return 1;
}
+
+static int __init cgroup_disable(char *str)
+{
+ return cgroup_turnonoff(str, 1);
+}
__setup("cgroup_disable=", cgroup_disable);
+
+static int __init cgroup_enable(char *str)
+{
+ return cgroup_turnonoff(str, 0);
+}
+__setup("cgroup_enable=", cgroup_enable);
diff -puN mm/memcontrol.c~disable-the-memory-controller-by-default-v3 mm/memcontrol.c
--- a/mm/memcontrol.c~disable-the-memory-controller-by-default-v3
+++ a/mm/memcontrol.c
@@ -1106,4 +1106,5 @@ struct cgroup_subsys mem_cgroup_subsys =
.populate = mem_cgroup_populate,
.attach = mem_cgroup_move_task,
.early_init = 0,
+ .disabled = 1,
};
_
Patches currently in -mm which might be from balbir@xxxxxxxxxxxxxxxxxx are
origin.patch
disable-the-memory-controller-by-default-v3.patch
git-kvm.patch
memcg-simple-stats-for-memory-resource-controller.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
