libvirt/SOURCES/libvirt-vircgroup-introduce-virCgroupV2GetBlkioIoServiced.patch

From abf2cfc52b828aa892b446385875381f735ff947 Mon Sep 17 00:00:00 2001
Message-Id: <abf2cfc52b828aa892b446385875381f735ff947@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 1 Jul 2019 17:07:32 +0200
Subject: [PATCH] vircgroup: introduce virCgroupV2GetBlkioIoServiced
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 709260add941a247b3829cf940624333cb445bb7)

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

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Message-Id: <f178386744bb4d74f41acecb82807d451c255fc9.1561993100.git.phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/util/vircgroupv2.c | 65 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index f7863a5690..000fd4c747 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -567,6 +567,70 @@ virCgroupV2GetBlkioWeight(virCgroupPtr group,
 }
 
 
+static int
+virCgroupV2GetBlkioIoServiced(virCgroupPtr group,
+                              long long *bytes_read,
+                              long long *bytes_write,
+                              long long *requests_read,
+                              long long *requests_write)
+{
+    long long stats_val;
+    VIR_AUTOFREE(char *) str1 = NULL;
+    char *p1;
+    size_t i;
+
+    const char *value_names[] = {
+        "rbytes=",
+        "wbytes=",
+        "rios=",
+        "wios=",
+    };
+    long long *value_ptrs[] = {
+        bytes_read,
+        bytes_write,
+        requests_read,
+        requests_write
+    };
+
+    *bytes_read = 0;
+    *bytes_write = 0;
+    *requests_read = 0;
+    *requests_write = 0;
+
+    if (virCgroupGetValueStr(group,
+                             VIR_CGROUP_CONTROLLER_BLKIO,
+                             "io.stat", &str1) < 0) {
+        return -1;
+    }
+
+    /* sum up all entries of the same kind, from all devices */
+    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
+        p1 = str1;
+
+        while ((p1 = strstr(p1, value_names[i]))) {
+            p1 += strlen(value_names[i]);
+            if (virStrToLong_ll(p1, &p1, 10, &stats_val) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("Cannot parse byte '%s' stat '%s'"),
+                               value_names[i], p1);
+                return -1;
+            }
+
+            if (stats_val < 0 ||
+                (stats_val > 0 && *value_ptrs[i] > (LLONG_MAX - stats_val))) {
+                virReportError(VIR_ERR_OVERFLOW,
+                               _("Sum of byte '%s' stat overflows"),
+                               value_names[i]);
+                return -1;
+            }
+            *value_ptrs[i] += stats_val;
+        }
+    }
+
+    return 0;
+}
+
+
 virCgroupBackend virCgroupV2Backend = {
     .type = VIR_CGROUP_BACKEND_TYPE_V2,
 
@@ -591,6 +655,7 @@ virCgroupBackend virCgroupV2Backend = {
 
     .setBlkioWeight = virCgroupV2SetBlkioWeight,
     .getBlkioWeight = virCgroupV2GetBlkioWeight,
+    .getBlkioIoServiced = virCgroupV2GetBlkioIoServiced,
 };
 
 
-- 
2.22.0