]> xenbits.xensource.com Git - libvirt.git/commitdiff
vircgroup: introduce virCgroupV2DevicesCreateProg
authorPavel Hrdina <phrdina@redhat.com>
Mon, 24 Jun 2019 12:30:59 +0000 (14:30 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Fri, 15 Nov 2019 11:58:32 +0000 (12:58 +0100)
This function creates new BPF program with new empty BPF map with the
default size and attaches it to the guest cgroup.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/libvirt_private.syms
src/util/vircgroupv2devices.c
src/util/vircgroupv2devices.h

index d4e446cbef3ae177d39475c91d6a58dcae7171aa..b75956c4e1c8d7f2b27b10b1bc560553cdf54c12 100644 (file)
@@ -1719,6 +1719,7 @@ virCgroupV2Register;
 # util/vircgroupv2devices.h
 virCgroupV2DevicesAttachProg;
 virCgroupV2DevicesAvailable;
+virCgroupV2DevicesCreateProg;
 virCgroupV2DevicesDetectProg;
 
 # util/virclosecallbacks.h
index 62f66250c3256c3dc6a1b0d6d88d423bd777cd3f..330e40c63aa5b541390603c53ed59b2650423fd4 100644 (file)
@@ -426,6 +426,46 @@ virCgroupV2DevicesDetectProg(virCgroupPtr group)
 
     return 0;
 }
+
+
+# define VIR_CGROUP_V2_INITIAL_BPF_MAP_SIZE 64
+
+static int
+virCgroupV2DevicesCreateMap(size_t size)
+{
+    int mapfd = virBPFCreateMap(BPF_MAP_TYPE_HASH, sizeof(uint64_t),
+                                sizeof(uint32_t), size);
+
+    if (mapfd < 0) {
+        virReportSystemError(errno, "%s",
+                             _("failed to initialize device BPF map"));
+        return -1;
+    }
+
+    return mapfd;
+}
+
+
+int
+virCgroupV2DevicesCreateProg(virCgroupPtr group)
+{
+    VIR_AUTOCLOSE mapfd = -1;
+
+    if (group->unified.devices.progfd > 0 && group->unified.devices.mapfd > 0)
+        return 0;
+
+    mapfd = virCgroupV2DevicesCreateMap(VIR_CGROUP_V2_INITIAL_BPF_MAP_SIZE);
+    if (mapfd < 0)
+        return -1;
+
+    if (virCgroupV2DevicesAttachProg(group, mapfd,
+                                     VIR_CGROUP_V2_INITIAL_BPF_MAP_SIZE) < 0) {
+        return -1;
+    }
+
+    mapfd = -1;
+    return 0;
+}
 #else /* !HAVE_DECL_BPF_CGROUP_DEVICE */
 bool
 virCgroupV2DevicesAvailable(virCgroupPtr group G_GNUC_UNUSED)
@@ -454,4 +494,14 @@ virCgroupV2DevicesDetectProg(virCgroupPtr group G_GNUC_UNUSED)
                            "with this kernel"));
     return -1;
 }
+
+
+int
+virCgroupV2DevicesCreateProg(virCgroupPtr group G_GNUC_UNUSED)
+{
+    virReportSystemError(ENOSYS, "%s",
+                         _("cgroups v2 BPF devices not supported "
+                           "with this kernel"));
+    return -1;
+}
 #endif /* !HAVE_DECL_BPF_CGROUP_DEVICE */
index 882bbd66f1e4d03abf6ed1b63ce96f39b9e6ed75..db1316d072e2686a178d16b70eac6c7e67d2e2ae 100644 (file)
@@ -30,3 +30,6 @@ virCgroupV2DevicesAttachProg(virCgroupPtr group,
 
 int
 virCgroupV2DevicesDetectProg(virCgroupPtr group);
+
+int
+virCgroupV2DevicesCreateProg(virCgroupPtr group);