From 6a1f3fdcf13ff1fdcbd1f63443a1e5d05b2ddd1c Mon Sep 17 00:00:00 2001

Message-Id: <6a1f3fdcf13ff1fdcbd1f63443a1e5d05b2ddd1c@dist-git>

From: Pavel Hrdina <phrdina@redhat.com>

Date: Mon, 1 Jul 2019 17:07:43 +0200

Subject: [PATCH] vircgroup: introduce virCgroupV2(Set|Get)MemorySoftLimit

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

(cherry picked from commit 94db4bf86ea10e9853f62c4ea079a432482a58df)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

Message-Id: <a59c442f9098898c0196a5fb2a0d3527ce277153.1561993100.git.phrdina@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/util/vircgroupv2.c | 61 ++++++++++++++++++++++++++++++++++++++++++

 1 file changed, 61 insertions(+)

diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c

index 81a577d28f..d8a1d7712f 100644

--- a/src/util/vircgroupv2.c

+++ b/src/util/vircgroupv2.c

@@ -1171,6 +1171,65 @@ virCgroupV2GetMemoryHardLimit(virCgroupPtr group,

 }

+static int

+virCgroupV2SetMemorySoftLimit(virCgroupPtr group,

+                              unsigned long long kb)

+{

+    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;

+

+    if (kb > maxkb) {

+        virReportError(VIR_ERR_INVALID_ARG,

+                       _("Memory '%llu' must be less than %llu"),

+                       kb, maxkb);

+        return -1;

+    }

+

+    if (kb == maxkb) {

+        return virCgroupSetValueStr(group,

+                                    VIR_CGROUP_CONTROLLER_MEMORY,

+                                    "memory.high",

+                                    "max");

+    } else {

+        return virCgroupSetValueU64(group,

+                                    VIR_CGROUP_CONTROLLER_MEMORY,

+                                    "memory.high",

+                                    kb << 10);

+    }

+}

+

+

+static int

+virCgroupV2GetMemorySoftLimit(virCgroupPtr group,

+                              unsigned long long *kb)

+{

+    VIR_AUTOFREE(char *) value = NULL;

+    unsigned long long high;

+

+    if (virCgroupGetValueStr(group,

+                             VIR_CGROUP_CONTROLLER_MEMORY,

+                             "memory.high", &value) < 0)

+        return -1;

+

+    if (STREQ(value, "max")) {

+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;

+        return 0;

+    }

+

+    if (virStrToLong_ull(value, NULL, 10, &high) < 0) {

+        virReportError(VIR_ERR_INTERNAL_ERROR,

+                       _("Failed to parse value '%s' as number."),

+                       value);

+        return -1;

+    }

+

+    *kb = high >> 10;

+    if (*kb >= VIR_DOMAIN_MEMORY_PARAM_UNLIMITED)

+        *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;

+

+    return 0;

+}

+

+

 virCgroupBackend virCgroupV2Backend = {

     .type = VIR_CGROUP_BACKEND_TYPE_V2,

@@ -1213,6 +1272,8 @@ virCgroupBackend virCgroupV2Backend = {

     .getMemoryUsage = virCgroupV2GetMemoryUsage,

     .setMemoryHardLimit = virCgroupV2SetMemoryHardLimit,

     .getMemoryHardLimit = virCgroupV2GetMemoryHardLimit,

+    .setMemorySoftLimit = virCgroupV2SetMemorySoftLimit,

+    .getMemorySoftLimit = virCgroupV2GetMemorySoftLimit,

 };

-- 

2.22.0