Before we exec() qemu we have to spawn pr-helper processes for
all managed reservations (well, technically there can only one).
The only caveat there is that we should place the process into
the same namespace and cgroup as qemu (so that it shares the same
view of the system). But we can do that only after we've forked.
That means calling the setup function between fork() and exec().
Again, despite demand to not store anything in status XML I have
to take my chances and store 'priv->prDaemonRunning' (at least)
in status XML. Otherwise we might forget whether we started
pr-helper after libvirtd restart.
What happens if we change default managed alias or default socket
is undefined for now, because we don't store them in status XML.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
src/qemu/qemu_domain.c | 22 +++++
src/qemu/qemu_domain.h | 2 +
src/qemu/qemu_process.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 256 insertions(+)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 5ccdeb8e3a..fbe6a0f332 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2040,6 +2040,15 @@ qemuDomainObjPrivateXMLFormatAllowReboot(virBufferPtr buf,
}
+static void
+qemuDomainObjPrivateXMLFormatPR(virBufferPtr buf,
+ qemuDomainObjPrivatePtr priv)
+{
+ if (priv->prDaemonRunning)
+ virBufferAddLit(buf, "<prDaemon running='1'/>\n");
+}
+
+
static int
qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf,
virDomainObjPtr vm,
@@ -2180,6 +2189,8 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf,
qemuDomainObjPrivateXMLFormatAllowReboot(buf, priv->allowReboot);
+ qemuDomainObjPrivateXMLFormatPR(buf, priv);
+
if (qemuDomainObjPrivateXMLFormatBlockjobs(buf, vm) < 0)
return -1;
@@ -2323,6 +2334,15 @@ qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathContextPtr ctxt,
}
+static void
+qemuDomainObjPrivateXMLParsePR(xmlXPathContextPtr ctxt,
+ bool *prDaemonRunning)
+{
+ *prDaemonRunning = virXPathBoolean("count(./prDaemon[@running = '1']) > 0",
+ ctxt) > 0;
+}
+
+
static int
qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm,
qemuDomainObjPrivatePtr priv,
@@ -2572,6 +2592,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
qemuDomainObjPrivateXMLParseAllowReboot(ctxt, &priv->allowReboot);
+ qemuDomainObjPrivateXMLParsePR(ctxt, &priv->prDaemonRunning);
+
if (qemuDomainObjPrivateXMLParseBlockjobs(priv, ctxt) < 0)
goto error;
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 612d234113..b837902e8d 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -342,6 +342,8 @@ struct _qemuDomainObjPrivate {
/* Migration capabilities. Rechecked on reconnect, not to be saved in
* private XML. */
virBitmapPtr migrationCaps;
+
+ bool prDaemonRunning;
};
# define QEMU_DOMAIN_PRIVATE(vm) \
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 6a5262ae46..36cfa438ed 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2555,6 +2555,231 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
}
+static char *
+qemuProcessBuildPRHelperPidfilePath(virDomainObjPtr vm,
+ const char *prdAlias)
+{
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+
+ return virPidFileBuildPath(priv->libDir, prdAlias);
+}
+
+
+static void
+qemuProcessKillPRDaemon(virDomainObjPtr vm)
+{
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+ virErrorPtr orig_err;
+ const char *prdAlias;
+ char *pidfile;
+
+ if (!priv->prDaemonRunning)
+ return;
+
+ if (!(prdAlias = qemuDomainGetManagedPRAlias())) {
+ VIR_WARN("Unable to get default PR manager alias");
+ return;
+ }
+
+ if (!(pidfile = qemuProcessBuildPRHelperPidfilePath(vm, prdAlias))) {
+ VIR_WARN("Unable to construct pr-helper pidfile path");
+ return;
+ }
+
+ virErrorPreserveLast(&orig_err);
+ if (virPidFileForceCleanupPath(pidfile) < 0) {
+ VIR_WARN("Unable to kill pr-helper process");
+ } else {
+ if (unlink(pidfile) < 0 &&
+ errno != ENOENT) {
+ virReportSystemError(errno,
+ _("Unable to remove stale pidfile %s"),
+ pidfile);
+ } else {
+ priv->prDaemonRunning = false;
+ }
+ }
+ virErrorRestore(&orig_err);
+
+ VIR_FREE(pidfile);
+}
+
+
+static int
+qemuProcessStartPRDaemonHook(void *opaque)
+{
+ virDomainObjPtr vm = opaque;
+ size_t i, nfds = 0;
+ int *fds = NULL;
+ int ret = -1;
+
+ if (virProcessGetNamespaces(vm->pid, &nfds, &fds) < 0)
+ return ret;
+
+ if (nfds > 0 &&
+ virProcessSetNamespaces(nfds, fds) < 0)
+ goto cleanup;
+
+ ret = 0;
+ cleanup:
+ for (i = 0; i < nfds; i++)
+ VIR_FORCE_CLOSE(fds[i]);
+ VIR_FREE(fds);
+ return ret;
+}
+
+
+static int
+qemuProcessStartPRDaemon(virDomainObjPtr vm,
+ const virDomainDiskDef *disk)
+{
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+ virQEMUDriverPtr driver = priv->driver;
+ virQEMUDriverConfigPtr cfg;
+ const char *prdAlias;
+ int errfd = -1;
+ char *pidfile = NULL;
+ int pidfd = -1;
+ char *socketPath = NULL;
+ pid_t cpid = -1;
+ virCommandPtr cmd = NULL;
+ virTimeBackOffVar timebackoff;
+ const unsigned long long timeout = 500000; /* ms */
+ int ret = -1;
+
+ if (!virStoragePRDefIsManaged(disk->src->pr) ||
+ priv->prDaemonRunning)
+ return 0;
+
+ cfg = virQEMUDriverGetConfig(driver);
+
+ if (!virFileIsExecutable(cfg->prHelperName)) {
+ virReportSystemError(errno, _("'%s' is not a suitable pr helper"),
+ cfg->prHelperName);
+ goto cleanup;
+ }
+
+ prdAlias = qemuDomainGetManagedPRAlias();
+
+ if (!(pidfile = qemuProcessBuildPRHelperPidfilePath(vm, prdAlias)))
+ goto cleanup;
+
+ /* Just try to acquire. Dummy pid will be replaced later */
+ if ((pidfd = virPidFileAcquirePath(pidfile, false, -1)) < 0)
+ goto cleanup;
+
+ if (!(socketPath = qemuDomainGetPRSocketPath(vm, disk->src->pr)))
+ goto cleanup;
+
+ /* Remove stale socket */
+ if (unlink(socketPath) < 0 &&
+ errno != ENOENT) {
+ virReportSystemError(errno,
+ _("Unable to remove stale socket path: %s"),
+ socketPath);
+ goto cleanup;
+ }
+
+ if (!(cmd = virCommandNewArgList(cfg->prHelperName,
+ "-k", socketPath,
+ "-f", pidfile,
+ NULL)))
+ goto cleanup;
+
+ virCommandDaemonize(cmd);
+ /* We want our virCommand to write child PID into the pidfile
+ * so that we can read it even before exec(). */
+ virCommandSetPidFile(cmd, pidfile);
+ virCommandSetErrorFD(cmd, &errfd);
+
+ /* Place the process into the same namespace and cgroup as
+ * qemu (so that it shares the same view of the system). */
+ virCommandSetPreExecHook(cmd, qemuProcessStartPRDaemonHook, vm);
+
+ if (virCommandRun(cmd, NULL) < 0)
+ goto cleanup;
+
+ if (virPidFileReadPath(pidfile, &cpid) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("pr helper %s didn't show up"), prdAlias);
+ goto cleanup;
+ }
+
+ if (virTimeBackOffStart(&timebackoff, 1, timeout) < 0)
+ goto cleanup;
+ while (virTimeBackOffWait(&timebackoff)) {
+ char errbuf[1024] = { 0 };
+
+ if (virFileExists(socketPath))
+ break;
+
+ if (virProcessKill(cpid, 0) == 0)
+ continue;
+
+ if (saferead(errfd, errbuf, sizeof(errbuf) - 1) < 0) {
+ virReportSystemError(errno,
+ _("pr helper %s died unexpectedly"), prdAlias);
+ } else {
+ virReportError(VIR_ERR_OPERATION_FAILED,
+ _("pr helper died and reported: %s"), errbuf);
+ }
+ goto cleanup;
+ }
+
+ if (!virFileExists(socketPath)) {
+ virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s",
+ _("pr helper socked did not show up"));
+ goto cleanup;
+ }
+
+ if (priv->cgroup &&
+ virCgroupAddMachineTask(priv->cgroup, cpid) < 0)
+ goto cleanup;
+
+ if (qemuSecurityDomainSetPathLabel(driver->securityManager,
+ vm->def, socketPath, true) < 0)
+ goto cleanup;
+
+ priv->prDaemonRunning = true;
+ ret = 1;
+ cleanup:
+ if (ret < 0) {
+ virCommandAbort(cmd);
+ if (cpid >= 0)
+ virProcessKillPainfully(cpid, true);
+ if (pidfile)
+ unlink(pidfile);
+ }
+ virCommandFree(cmd);
+ VIR_FREE(socketPath);
+ VIR_FORCE_CLOSE(pidfd);
+ VIR_FREE(pidfile);
+ VIR_FORCE_CLOSE(errfd);
+ virObjectUnref(cfg);
+ return ret;
+}
+
+
+static int
+qemuProcessMaybeStartPRDaemon(virDomainObjPtr vm)
+{
+ size_t i;
+ int rv;
+
+ for (i = 0; i < vm->def->ndisks; i++) {
+ const virDomainDiskDef *disk = vm->def->disks[i];
+
+ if ((rv = qemuProcessStartPRDaemon(vm, disk)) < 0)
+ return -1;
+
+ if (rv > 0)
+ return 1;
+ }
+
+ return 0;
+}
+
+
static int
qemuProcessInitPasswords(virQEMUDriverPtr driver,
virDomainObjPtr vm,
@@ -6071,6 +6296,10 @@ qemuProcessLaunch(virConnectPtr conn,
if (qemuProcessResctrlCreate(driver, vm) < 0)
goto cleanup;
+ VIR_DEBUG("Setting up PR daemon");
+ if (qemuProcessMaybeStartPRDaemon(vm) < 0)
+ goto cleanup;
+
VIR_DEBUG("Setting domain security labels");
if (qemuSecuritySetAllLabel(driver,
vm,
@@ -6598,6 +6827,9 @@ void qemuProcessStop(virQEMUDriverPtr driver,
/* Remove the master key */
qemuDomainMasterKeyRemove(priv);
+ /* Do this before we delete the tree and remove pidfile. */
+ qemuProcessKillPRDaemon(vm);
+
virFileDeleteTree(priv->libDir);
virFileDeleteTree(priv->channelTargetDir);
--
2.16.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
