Change container manager configs from cgroupv1 to v2

AGL was migrate to cgroup v2 integration from cgroup v1 and v2
mixin integration.  Existing container-manager does not support
cgroupv2 based resource control.
This patch change resource control settings from cgroup v1 base
to cgroup v2 base.

Bug-AGL: SPEC-5284

Change-Id: I91761248f36b78b4ae4936d54d60acb92366f999
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>

8 files changed, 70 insertions, 7 deletions

diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/nanopct6/agl-flutter-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/nanopct6/agl-flutter-ivi-demo.json
index 3066c4da..fc063dbe 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/nanopct6/agl-flutter-ivi-demo.json
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/nanopct6/agl-flutter-ivi-demo.json
@@ -30,9 +30,14 @@
 	},
 	"resource": [
 		{
-			"type":		"cgroup",
+			"type":		"cgroupv2",
 			"object":	"cpuset.cpus",
-			"value":	"0-6"
+			"value":	"1-7"
+		},
+		{
+			"type":		"cgroupv2",
+			"object":	"memory.max",
+			"value":	"8G"
 		},
 		{
 			"type":		"prlimit",
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json
index 78a03ef8..f8799738 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json
@@ -26,6 +26,18 @@
 			"HOME=/home/root"
 		]
 	},
+	"resource": [
+		{
+			"type":		"cgroupv2",
+			"object":	"cpuset.cpus",
+			"value":	"1-7"
+		},
+		{
+			"type":		"prlimit",
+			"object":	"rtprio",
+			"value":	"50"
+		}
+	],
 	"fs": {
 		"mount": [
 			{
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/nanopct6/agl-momi-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/nanopct6/agl-momi-ivi-demo.json
index 25caed4a..c88426f5 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/nanopct6/agl-momi-ivi-demo.json
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/nanopct6/agl-momi-ivi-demo.json
@@ -29,9 +29,14 @@
 	},
 	"resource": [
 		{
-			"type":		"cgroup",
+			"type":		"cgroupv2",
 			"object":	"cpuset.cpus",
-			"value":	"0-6"
+			"value":	"1-7"
+		},
+		{
+			"type":		"cgroupv2",
+			"object":	"memory.max",
+			"value":	"8G"
 		},
 		{
 			"type":		"prlimit",
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json
index 97f3c3d1..f48664d4 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json
@@ -27,6 +27,18 @@
 			"HOME=/home/root"
 		]
 	},
+	"resource": [
+		{
+			"type":		"cgroupv2",
+			"object":	"cpuset.cpus",
+			"value":	"1-7"
+		},
+		{
+			"type":		"prlimit",
+			"object":	"rtprio",
+			"value":	"50"
+		}
+	],
 	"fs": {
 		"mount": [
 			{
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/nanopct6/agl-qt-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/nanopct6/agl-qt-ivi-demo.json
index b74170ef..ef92b4cc 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/nanopct6/agl-qt-ivi-demo.json
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/nanopct6/agl-qt-ivi-demo.json
@@ -31,9 +31,14 @@
 	},
 	"resource": [
 		{
-			"type":		"cgroup",
+			"type":		"cgroupv2",
 			"object":	"cpuset.cpus",
-			"value":	"0-6"
+			"value":	"1-7"
+		},
+		{
+			"type":		"cgroupv2",
+			"object":	"memory.max",
+			"value":	"8G"
 		},
 		{
 			"type":		"prlimit",
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json
index ccbf66b6..bf01e0e2 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json
@@ -27,6 +27,18 @@
 			"HOME=/home/root"
 		]
 	},
+	"resource": [
+		{
+			"type":		"cgroupv2",
+			"object":	"cpuset.cpus",
+			"value":	"1-7"
+		},
+		{
+			"type":		"prlimit",
+			"object":	"rtprio",
+			"value":	"50"
+		}
+	],
 	"fs": {
 		"mount": [
 			{
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/nanopct6/cluster-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/nanopct6/cluster-demo.json
index 90a9b0a8..7058f5a5 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/nanopct6/cluster-demo.json
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/nanopct6/cluster-demo.json
@@ -28,7 +28,7 @@
 	},
 	"resource": [
 		{
-			"type":		"cgroup",
+			"type":		"cgroupv2",
 			"object":	"cpuset.cpus",
 			"value":	"0"
 		},
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json
index c0bff97b..2aa0dcf3 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json
@@ -26,6 +26,18 @@
 			"HOME=/home/root"
 		]
 	},
+	"resource": [
+		{
+			"type":		"cgroupv2",
+			"object":	"cpuset.cpus",
+			"value":	"0"
+		},
+		{
+			"type":		"prlimit",
+			"object":	"rtprio",
+			"value":	"50"
+		}
+	],
 	"fs": {
 		"mount": [
 			{