1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
From eec171e22de23a8bb7321da2bd405a95d4521f92 Mon Sep 17 00:00:00 2001
From: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Date: Tue, 4 Feb 2025 00:55:36 +0900
Subject: [PATCH] Revert "cgroup: Disable cgroup "memory" by default"
This reverts commit 94a23e978235cd35f38075072b34152b2b667e6e.
Upstream-Status: Pending
---
kernel/cgroup/cgroup.c | 38 --------------------------------------
1 file changed, 38 deletions(-)
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 5165f5ccd1b4..518725b57200 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6051,9 +6051,6 @@ int __init cgroup_init_early(void)
return 0;
}
-static u16 cgroup_enable_mask __initdata;
-static int __init cgroup_disable(char *str);
-
/**
* cgroup_init - cgroup initialization
*
@@ -6087,12 +6084,6 @@ int __init cgroup_init(void)
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) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
@@ -6733,10 +6724,6 @@ static int __init cgroup_disable(char *str)
strcmp(token, ss->legacy_name))
continue;
- /* An explicit cgroup_enable overrides a disable */
- if (cgroup_enable_mask & (1 << i))
- continue;
-
static_branch_disable(cgroup_subsys_enabled_key[i]);
pr_info("Disabling %s control group subsystem\n",
ss->name);
@@ -6755,31 +6742,6 @@ static int __init cgroup_disable(char *str)
}
__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) { }
static int __init enable_cgroup_debug(char *str)
--
2.43.0
|
