From 390a98f3fdf726083d9a2b5e6ba1d9fee3af4ba6 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 3 Nov 2020 16:13:03 -0800
Subject: [PATCH] runc update: support unified resources

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 tests/integration/update.bats | 25 +++++++++++++++++++++++++
 update.go                     |  1 +
 2 files changed, 26 insertions(+)

diff --git a/tests/integration/update.bats b/tests/integration/update.bats
index cb803bc9d..eda2b7ad2 100644
--- a/tests/integration/update.bats
+++ b/tests/integration/update.bats
@@ -363,6 +363,31 @@ EOF
 	check_cpu_quota 30000 100000 "300ms"
 }
 
+@test "update cgroup v2 resources via unified map" {
+	[[ "$ROOTLESS" -ne 0 ]] && requires rootless_cgroup
+	requires cgroups_v2
+
+	runc run -d --console-socket "$CONSOLE_SOCKET" test_update
+	[ "$status" -eq 0 ]
+
+	# check that initial values were properly set
+	check_cpu_quota 500000 1000000 "500ms"
+	check_systemd_value "TasksMax" 20
+
+	runc update -r - test_update <<EOF
+{
+  "unified": {
+    "cpu.max": "max 100000",
+    "pids.max": "10"
+  }
+}
+EOF
+
+	# check the updated systemd unit properties
+	check_cpu_quota -1 100000 "infinity"
+	check_systemd_value "TasksMax" 10
+}
+
 @test "update rt period and runtime" {
 	[[ "$ROOTLESS" -ne 0 ]] && requires rootless_cgroup
 	requires cgroups_v1 cgroups_rt no_systemd
diff --git a/update.go b/update.go
index 2cb77ac37..81928e58d 100644
--- a/update.go
+++ b/update.go
@@ -294,6 +294,7 @@ other options are ignored.
 		config.Cgroups.Resources.MemoryReservation = *r.Memory.Reservation
 		config.Cgroups.Resources.MemorySwap = *r.Memory.Swap
 		config.Cgroups.Resources.PidsLimit = r.Pids.Limit
+		config.Cgroups.Resources.Unified = r.Unified
 
 		// Update Intel RDT
 		l3CacheSchema := context.String("l3-cache-schema")