[13/13] kernel: Enable all cgroups on all architectures

Message ID 20210917114229.10704-13-michael.tremer@ipfire.org
State Staged
Commit cbbed5bc1487ca0e3343b0aaf777abea258ef49c
Headers show
Series [01/13] kernel: Change timer tick to 1000Hz | expand

Commit Message

Michael Tremer Sept. 17, 2021, 11:42 a.m. UTC
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/kernel/kernel.config.aarch64-ipfire | 2 +-
 config/kernel/kernel.config.armv6l-ipfire  | 2 +-
 config/kernel/kernel.config.i586-ipfire    | 9 +++++++--
 config/kernel/kernel.config.x86_64-ipfire  | 9 +++++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

Comments

Peter Müller Sept. 18, 2021, 4:15 p.m. UTC | #1
Acked-by: Peter Müller <peter.mueller@ipfire.org>


> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
> ---
>   config/kernel/kernel.config.aarch64-ipfire | 2 +-
>   config/kernel/kernel.config.armv6l-ipfire  | 2 +-
>   config/kernel/kernel.config.i586-ipfire    | 9 +++++++--
>   config/kernel/kernel.config.x86_64-ipfire  | 9 +++++++--
>   4 files changed, 16 insertions(+), 6 deletions(-)
> 
> diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
> index 7ae9f9738..4449227e9 100644
> --- a/config/kernel/kernel.config.aarch64-ipfire
> +++ b/config/kernel/kernel.config.aarch64-ipfire
> @@ -142,7 +142,7 @@ CONFIG_FAIR_GROUP_SCHED=y
>   # CONFIG_CFS_BANDWIDTH is not set
>   CONFIG_RT_GROUP_SCHED=y
>   CONFIG_CGROUP_PIDS=y
> -# CONFIG_CGROUP_RDMA is not set
> +CONFIG_CGROUP_RDMA=y
>   CONFIG_CGROUP_FREEZER=y
>   CONFIG_CPUSETS=y
>   CONFIG_PROC_PID_CPUSET=y
> diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire
> index 33117b0b4..77a4b8661 100644
> --- a/config/kernel/kernel.config.armv6l-ipfire
> +++ b/config/kernel/kernel.config.armv6l-ipfire
> @@ -147,7 +147,7 @@ CONFIG_FAIR_GROUP_SCHED=y
>   # CONFIG_CFS_BANDWIDTH is not set
>   CONFIG_RT_GROUP_SCHED=y
>   CONFIG_CGROUP_PIDS=y
> -# CONFIG_CGROUP_RDMA is not set
> +CONFIG_CGROUP_RDMA=y
>   CONFIG_CGROUP_FREEZER=y
>   CONFIG_CPUSETS=y
>   CONFIG_PROC_PID_CPUSET=y
> diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
> index 2d7158c96..f426bf0b0 100644
> --- a/config/kernel/kernel.config.i586-ipfire
> +++ b/config/kernel/kernel.config.i586-ipfire
> @@ -145,14 +145,18 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
>   
>   CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
>   CONFIG_CGROUPS=y
> -# CONFIG_MEMCG is not set
> +CONFIG_PAGE_COUNTER=y
> +CONFIG_MEMCG=y
> +CONFIG_MEMCG_SWAP=y
> +CONFIG_MEMCG_KMEM=y
>   CONFIG_BLK_CGROUP=y
> +CONFIG_CGROUP_WRITEBACK=y
>   CONFIG_CGROUP_SCHED=y
>   CONFIG_FAIR_GROUP_SCHED=y
>   # CONFIG_CFS_BANDWIDTH is not set
>   CONFIG_RT_GROUP_SCHED=y
>   CONFIG_CGROUP_PIDS=y
> -# CONFIG_CGROUP_RDMA is not set
> +CONFIG_CGROUP_RDMA=y
>   CONFIG_CGROUP_FREEZER=y
>   CONFIG_CPUSETS=y
>   CONFIG_PROC_PID_CPUSET=y
> @@ -236,6 +240,7 @@ CONFIG_PERF_EVENTS=y
>   
>   CONFIG_VM_EVENT_COUNTERS=y
>   # CONFIG_SLUB_DEBUG is not set
> +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
>   # CONFIG_COMPAT_BRK is not set
>   # CONFIG_SLAB is not set
>   CONFIG_SLUB=y
> diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
> index aab0cfb25..9cd6756cd 100644
> --- a/config/kernel/kernel.config.x86_64-ipfire
> +++ b/config/kernel/kernel.config.x86_64-ipfire
> @@ -152,14 +152,18 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
>   CONFIG_CC_HAS_INT128=y
>   CONFIG_ARCH_SUPPORTS_INT128=y
>   CONFIG_CGROUPS=y
> -# CONFIG_MEMCG is not set
> +CONFIG_PAGE_COUNTER=y
> +CONFIG_MEMCG=y
> +CONFIG_MEMCG_SWAP=y
> +CONFIG_MEMCG_KMEM=y
>   CONFIG_BLK_CGROUP=y
> +CONFIG_CGROUP_WRITEBACK=y
>   CONFIG_CGROUP_SCHED=y
>   CONFIG_FAIR_GROUP_SCHED=y
>   # CONFIG_CFS_BANDWIDTH is not set
>   CONFIG_RT_GROUP_SCHED=y
>   CONFIG_CGROUP_PIDS=y
> -# CONFIG_CGROUP_RDMA is not set
> +CONFIG_CGROUP_RDMA=y
>   CONFIG_CGROUP_FREEZER=y
>   CONFIG_CPUSETS=y
>   CONFIG_PROC_PID_CPUSET=y
> @@ -246,6 +250,7 @@ CONFIG_PERF_EVENTS=y
>   
>   CONFIG_VM_EVENT_COUNTERS=y
>   # CONFIG_SLUB_DEBUG is not set
> +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
>   # CONFIG_COMPAT_BRK is not set
>   # CONFIG_SLAB is not set
>   CONFIG_SLUB=y
>

Patch

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 7ae9f9738..4449227e9 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -142,7 +142,7 @@  CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire
index 33117b0b4..77a4b8661 100644
--- a/config/kernel/kernel.config.armv6l-ipfire
+++ b/config/kernel/kernel.config.armv6l-ipfire
@@ -147,7 +147,7 @@  CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 2d7158c96..f426bf0b0 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -145,14 +145,18 @@  CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CGROUPS=y
-# CONFIG_MEMCG is not set
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
@@ -236,6 +240,7 @@  CONFIG_PERF_EVENTS=y
 
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index aab0cfb25..9cd6756cd 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -152,14 +152,18 @@  CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
-# CONFIG_MEMCG is not set
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
@@ -246,6 +250,7 @@  CONFIG_PERF_EVENTS=y
 
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y