resctrl: Do not calculate free bandwidth for MBA

For CAT we calculate unallocated parts of the cache, however with MBA this does
not make sense as the purpose of that is to limit the bandwidth and the setting
is only proportional relative to bandwidth settings for other groups.

This means it makes sense to set the values to 100% even if there are other
groups with some allocations and that we don't need to find the available
(unallocated) bandwidth in all the groups.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 0857d4e882be420c35cc48fa9b5261454cc222fc..4a812d7a8be85eaf55a386cb0d37b324e1032322 100644 (file)
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -1823,22 +1823,6 @@ virResctrlAllocSubtract(virResctrlAllocPtr dst,
 }
 
 
-static void
-virResctrlMemoryBandwidthSubtract(virResctrlAllocPtr free,
-                                  virResctrlAllocPtr used)
-{
-    size_t i;
-
-    if (!used->mem_bw)
-        return;
-
-    for (i = 0; i < used->mem_bw->nbandwidths; i++) {
-        if (used->mem_bw->bandwidths[i])
-            *(free->mem_bw->bandwidths[i]) -= *(used->mem_bw->bandwidths[i]);
-    }
-}
-
-
 static virResctrlAllocPtr
 virResctrlAllocNewFromInfo(virResctrlInfoPtr info)
 {
@@ -1902,15 +1886,18 @@ virResctrlAllocNewFromInfo(virResctrlInfoPtr info)
 }
 
 /*
- * This function creates an allocation that represents all unused parts of
- * all caches and memory bandwidth in the system. It uses virResctrlInfo
- * for creating a new full allocation with all bits set (using the
- * virResctrlAllocNewFromInfo()), sets memory bandwidth 100%, and then scans
- * for all allocations under /sys/fs/resctrl and subtracts each one of them
- * from it. That way it can then return an allocation with only bit set
- * being those that are not mentioned in any other allocation for CAT and
- * available memory bandwidth for MBA. It is used for two things, calculating
- * the masks and bandwidth available when creating allocations and from tests.
+ * This function creates an allocation that represents all unused parts of all
+ * caches in the system.  It uses virResctrlInfo for creating a new full
+ * allocation with all bits set (using virResctrlAllocNewFromInfo()) and then
+ * scans for all allocations under /sys/fs/resctrl and subtracts each one of
+ * them from it.  That way it can then return an allocation with only bit set
+ * being those that are not mentioned in any other allocation.  It is used for
+ * two things, a) calculating the masks when creating allocations and b) from
+ * tests.
+ *
+ * MBA (Memory Bandwidth Allocation) is not taken into account as it is a
+ * limiting setting, not an allocating one.  The way it works is also vastly
+ * different from CAT.
  */
 virResctrlAllocPtr
 virResctrlAllocGetUnused(virResctrlInfoPtr resctrl)
@@ -1956,7 +1943,6 @@ virResctrlAllocGetUnused(virResctrlInfoPtr resctrl)
             goto error;
         }
 
-        virResctrlMemoryBandwidthSubtract(ret, alloc);
         virResctrlAllocSubtract(ret, alloc);
         virObjectUnref(alloc);
         alloc = NULL;
@@ -2109,12 +2095,10 @@ virResctrlAllocFindUnused(virResctrlAllocPtr alloc,
 
 static int
 virResctrlAllocMemoryBandwidth(virResctrlInfoPtr resctrl,
-                               virResctrlAllocPtr alloc,
-                               virResctrlAllocPtr free)
+                               virResctrlAllocPtr alloc)
 {
     size_t i;
     virResctrlAllocMemBWPtr mem_bw_alloc = alloc->mem_bw;
-    virResctrlAllocMemBWPtr mem_bw_free = free->mem_bw;
     virResctrlInfoMemBWPtr mem_bw_info = resctrl->membw_info;
 
     if (!mem_bw_alloc)
@@ -2154,14 +2138,6 @@ virResctrlAllocMemoryBandwidth(virResctrlInfoPtr resctrl,
                            i, mem_bw_info->max_id);
             return -1;
         }
-        if (*(mem_bw_alloc->bandwidths[i]) > *(mem_bw_free->bandwidths[i])) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("Not enough room for allocation of %u%% "
-                             "bandwidth on node %zd, available bandwidth %u%%"),
-                           *(mem_bw_alloc->bandwidths[i]), i,
-                           *(mem_bw_free->bandwidths[i]));
-            return -1;
-        }
     }
     return 0;
 }
@@ -2228,7 +2204,7 @@ virResctrlAllocAssign(virResctrlInfoPtr resctrl,
     if (!alloc_default)
         goto cleanup;
 
-    if (virResctrlAllocMemoryBandwidth(resctrl, alloc, alloc_free) < 0)
+    if (virResctrlAllocMemoryBandwidth(resctrl, alloc) < 0)
         goto cleanup;
 
     if (virResctrlAllocCopyMasks(alloc, alloc_default) < 0)