raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

cgroup: Disable cgroup "memory" by default

Browse Source 
Some Raspberry Pis have limited RAM and most users won't use the
cgroup memory support so it is disabled by default. Enable with:

    cgroup_enable=memory

See: https://github.com/raspberrypi/linux/issues/1950

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
This commit is contained in:
Phil Elwell
2017-11-27 17:14:54 +00:00
committed by Dom Cobley
parent abc515eb92
commit 94a23e9782
1 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
kernel/cgroup/cgroup.c
View File

@@ -6051,6 +6051,9 @@ int __init cgroup_init_early(void)
return 0; return 0;
} }
static u16 cgroup_enable_mask __initdata;
static int __init cgroup_disable(char *str);
/** /**
* cgroup_init - cgroup initialization * cgroup_init - cgroup initialization
* *
@@ -6084,6 +6087,12 @@ int __init cgroup_init(void)
cgroup_unlock(); cgroup_unlock();
/*
* Apply an implicit disable, knowing that an explicit enable will
* prevent if from doing anything.
*/
cgroup_disable("memory");
for_each_subsys(ss, ssid) { for_each_subsys(ss, ssid) {
if (ss->early_init) { if (ss->early_init) {
struct cgroup_subsys_state *css = struct cgroup_subsys_state *css =
@@ -6724,6 +6733,10 @@ static int __init cgroup_disable(char *str)
strcmp(token, ss->legacy_name)) strcmp(token, ss->legacy_name))
continue; continue;
/* An explicit cgroup_enable overrides a disable */
if (cgroup_enable_mask & (1 << i))
continue;
static_branch_disable(cgroup_subsys_enabled_key[i]); static_branch_disable(cgroup_subsys_enabled_key[i]);
pr_info("Disabling %s control group subsystem\n", pr_info("Disabling %s control group subsystem\n",
ss->name); ss->name);
@@ -6742,6 +6755,31 @@ static int __init cgroup_disable(char *str)
} }
__setup("cgroup_disable=", cgroup_disable); __setup("cgroup_disable=", cgroup_disable);
static int __init cgroup_enable(char *str)
{
struct cgroup_subsys *ss;
char *token;
int i;
while ((token = strsep(&str, ",")) != NULL) {
if (!*token)
continue;
for_each_subsys(ss, i) {
if (strcmp(token, ss->name) &&
strcmp(token, ss->legacy_name))
continue;
cgroup_enable_mask |= 1 << i;
static_branch_enable(cgroup_subsys_enabled_key[i]);
pr_info("Enabling %s control group subsystem\n",
ss->name);
}
}
return 1;
}
__setup("cgroup_enable=", cgroup_enable);
void __init __weak enable_debug_cgroup(void) { } void __init __weak enable_debug_cgroup(void) { }
static int __init enable_cgroup_debug(char *str) static int __init enable_cgroup_debug(char *str)