[libvirt] [PATCH v2 11/16] qemu: add vhost-user-gpu helper unit

[Ján Tomko]

On Fri, Aug 23, 2019 at 12:21:55PM -0400, Cole Robinson wrote:
>From: Marc-André Lureau <marcandre.lureau at redhat.com>
>
>Similar to the qemu_tpm.c, add a unit with a few functions to
>start/stop and setup the cgroup of the external vhost-user-gpu
>process. See function documentation.
>
>Since the vhost-user connection fd isn't necessarily specific to QEMU,
>it was easier to add it to virDomainDeviceInfo, although a reasonable
>place could be qemuDomainObjPrivate (with an associate hashtable
>device-info -> qemu-device-info for example).
>
>Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
>Signed-off-by: Cole Robinson <crobinso at redhat.com>
>---
> src/conf/device_conf.h         |   1 +
> src/qemu/Makefile.inc.am       |   2 +
> src/qemu/qemu_vhost_user_gpu.c | 305 +++++++++++++++++++++++++++++++++
> src/qemu/qemu_vhost_user_gpu.h |  50 ++++++
> 4 files changed, 358 insertions(+)
> create mode 100644 src/qemu/qemu_vhost_user_gpu.c
> create mode 100644 src/qemu/qemu_vhost_user_gpu.h
>
>diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
>index 0b0c525ad8..23cc2e9ba6 100644
>--- a/src/conf/device_conf.h
>+++ b/src/conf/device_conf.h
>@@ -180,6 +180,7 @@ struct _virDomainDeviceInfo {
>      * locking the isolation group */
>     bool isolationGroupLocked;
>     char *vhost_user_binary;
>+    int vhost_user_fd;
> };
>
> void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info);
>diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
>index 18a9220d01..d394eab957 100644
>--- a/src/qemu/Makefile.inc.am
>+++ b/src/qemu/Makefile.inc.am
>@@ -62,6 +62,8 @@ QEMU_DRIVER_SOURCES = \
> 	qemu/qemu_tpm.h \
> 	qemu/qemu_vhost_user.c \
> 	qemu/qemu_vhost_user.h \
>+	qemu/qemu_vhost_user_gpu.c \
>+	qemu/qemu_vhost_user_gpu.h \
> 	$(NULL)
>
>
>diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c
>new file mode 100644
>index 0000000000..0735af1473
>--- /dev/null
>+++ b/src/qemu/qemu_vhost_user_gpu.c
>@@ -0,0 +1,305 @@
>+/*
>+ * qemu_vhost_user_gpu.c: QEMU vhost-user GPU support
>+ *
>+ * Copyright (C) 2018 Red Hat, Inc.
>+ *
>+ * This library is free software; you can redistribute it and/or
>+ * modify it under the terms of the GNU Lesser General Public
>+ * License as published by the Free Software Foundation; either
>+ * version 2.1 of the License, or (at your option) any later version.
>+ *
>+ * This library is distributed in the hope that it will be useful,
>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+ * Lesser General Public License for more details.
>+ *
>+ * You should have received a copy of the GNU Lesser General Public
>+ * License along with this library.  If not, see
>+ * <http://www.gnu.org/licenses/>.
>+ */
>+
>+#include <config.h>
>+
>+#include "qemu_vhost_user_gpu.h"
>+#include "qemu_vhost_user.h"
>+#include "qemu_extdevice.h"
>+
>+#include "conf/domain_conf.h"
>+#include "configmake.h"
>+#include "vircommand.h"
>+#include "viralloc.h"
>+#include "virlog.h"
>+#include "virutil.h"
>+#include "virfile.h"
>+#include "virstring.h"
>+#include "virtime.h"
>+#include "virpidfile.h"
>+
>+#define VIR_FROM_THIS VIR_FROM_NONE
>+
>+VIR_LOG_INIT("qemu.vhost-user-gpu");
>+
>+
>+static char *
>+qemuVhostUserGPUCreatePidFilename(const char *stateDir,
>+                                  const char *shortName,
>+                                  const char *alias)
>+{
>+    char *pidfile = NULL;
>+    char *devicename = NULL;
>+
>+    if (virAsprintf(&devicename, "%s-%s-vhost-user-gpu", shortName, alias) < 0)
>+        return NULL;
>+
>+    pidfile = virPidFileBuildPath(stateDir, devicename);
>+
>+    VIR_FREE(devicename);
>+
>+    return pidfile;
>+}
>+
>+
>+/*
>+ * qemuVhostUserGPUGetPid:
>+ * @binpath: path of executable associated with the pidfile
>+ * @stateDir: the directory where vhost-user-gpu writes the pidfile into
>+ * @shortName: short name of the domain
>+ * @alias: video device alias
>+ * @pid: pointer to pid
>+ *
>+ * Return -errno upon error, or zero on successful reading of the pidfile.
>+ * If the PID was not still alive, zero will be returned, and @pid will be
>+ * set to -1;
>+ */
>+static int
>+qemuVhostUserGPUGetPid(const char *binPath,
>+                       const char *stateDir,
>+                       const char *shortName,
>+                       const char *alias,
>+                       pid_t *pid)
>+{
>+    int ret;
>+    char *pidfile = qemuVhostUserGPUCreatePidFilename(stateDir, shortName, alias);
>+    if (!pidfile)
>+        return -ENOMEM;
>+
>+    ret = virPidFileReadPathIfAlive(pidfile, pid, binPath);
>+
>+    VIR_FREE(pidfile);
>+
>+    return ret;
>+}
>+
>+
>+int qemuExtVhostUserGPUPrepareDomain(virQEMUDriverPtr driver,
>+                                     virDomainVideoDefPtr video)
>+{
>+    return qemuVhostUserFillDomainGPU(driver, video);
>+}
>+
>+
>+/*
>+ * qemuExtVhostUserGPUStart:
>+ * @driver: QEMU driver
>+ * @vm: the VM domain
>+ * @video: the video device
>+ * @logCtxt: log context
>+ *
>+ * Start the external vhost-user-gpu process:
>+ * - open a socketpair for vhost-user communication
>+ * - have the command line built
>+ * - start the external process and sync with it before QEMU start
>+ */
>+int qemuExtVhostUserGPUStart(virQEMUDriverPtr driver,
>+                             virDomainObjPtr vm,
>+                             virDomainVideoDefPtr video,
>+                             qemuDomainLogContextPtr logCtxt)
>+{
>+    int ret = -1;
>+    virCommandPtr cmd = NULL;
>+    int exitstatus = 0;
>+    char *errbuf = NULL;
>+    virQEMUDriverConfigPtr cfg;
>+    char *pidfile = NULL, *shortName = virDomainDefGetShortName(vm->def);

These should be on separate lines and shortName needs to be freed.

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20190827/39bfde3b/attachment-0001.sig>