|
 |
fbe740 |
From 6c6f1a32c07941d6fe6208e1ad12dc137dbe7c41 Mon Sep 17 00:00:00 2001
|
|
|
fbe740 |
Message-Id: <6c6f1a32c07941d6fe6208e1ad12dc137dbe7c41@dist-git>
|
|
|
fbe740 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
fbe740 |
Date: Wed, 4 Mar 2020 12:42:47 +0100
|
|
|
fbe740 |
Subject: [PATCH] qemu: put virtiofsd in the emulator cgroup
|
|
|
fbe740 |
MIME-Version: 1.0
|
|
|
fbe740 |
Content-Type: text/plain; charset=UTF-8
|
|
|
fbe740 |
Content-Transfer-Encoding: 8bit
|
|
|
fbe740 |
|
|
|
fbe740 |
Wire up the code to put virtiofsd in the emulator cgroup on domain
|
|
|
fbe740 |
startup.
|
|
|
fbe740 |
|
|
|
fbe740 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
fbe740 |
Tested-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
fbe740 |
(cherry picked from commit 9de5d69c218faa0e25c5d6a56ab5f6bacbd1a132)
|
|
|
fbe740 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
https://bugzilla.redhat.com/show_bug.cgi?id=1694166
|
|
|
fbe740 |
Message-Id: <7653ce933656c9a13c9afa2a019ef11fb192bdc4.1583322091.git.jtomko@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
fbe740 |
---
|
|
|
fbe740 |
src/qemu/qemu_extdevice.c | 15 +++++++++++++++
|
|
|
fbe740 |
src/qemu/qemu_virtiofs.c | 26 ++++++++++++++++++++++++++
|
|
|
fbe740 |
src/qemu/qemu_virtiofs.h | 5 +++++
|
|
|
fbe740 |
3 files changed, 46 insertions(+)
|
|
|
fbe740 |
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
|
|
|
fbe740 |
index bfa770f45a..f66bafb62f 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_extdevice.c
|
|
|
fbe740 |
+++ b/src/qemu/qemu_extdevice.c
|
|
|
fbe740 |
@@ -248,6 +248,13 @@ qemuExtDevicesHasDevice(virDomainDefPtr def)
|
|
|
fbe740 |
if (def->tpm && def->tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR)
|
|
|
fbe740 |
return true;
|
|
|
fbe740 |
|
|
|
fbe740 |
+ for (i = 0; i < def->nfss; i++) {
|
|
|
fbe740 |
+ virDomainFSDefPtr fs = def->fss[i];
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+ if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS)
|
|
|
fbe740 |
+ return true;
|
|
|
fbe740 |
+ }
|
|
|
fbe740 |
+
|
|
|
fbe740 |
return false;
|
|
|
fbe740 |
}
|
|
|
fbe740 |
|
|
|
fbe740 |
@@ -272,5 +279,13 @@ qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver,
|
|
|
fbe740 |
qemuExtTPMSetupCgroup(driver, def, cgroup) < 0)
|
|
|
fbe740 |
return -1;
|
|
|
fbe740 |
|
|
|
fbe740 |
+ for (i = 0; i < def->nfss; i++) {
|
|
|
fbe740 |
+ virDomainFSDefPtr fs = def->fss[i];
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+ if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS &&
|
|
|
fbe740 |
+ qemuVirtioFSSetupCgroup(vm, fs, cgroup) < 0)
|
|
|
fbe740 |
+ return -1;
|
|
|
fbe740 |
+ }
|
|
|
fbe740 |
+
|
|
|
fbe740 |
return 0;
|
|
|
fbe740 |
}
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
|
|
|
fbe740 |
index 09ab2cef27..194855ece8 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_virtiofs.c
|
|
|
fbe740 |
+++ b/src/qemu/qemu_virtiofs.c
|
|
|
fbe740 |
@@ -299,3 +299,29 @@ qemuVirtioFSStop(virQEMUDriverPtr driver G_GNUC_UNUSED,
|
|
|
fbe740 |
cleanup:
|
|
|
fbe740 |
virErrorRestore(&orig_err);
|
|
|
fbe740 |
}
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+int
|
|
|
fbe740 |
+qemuVirtioFSSetupCgroup(virDomainObjPtr vm,
|
|
|
fbe740 |
+ virDomainFSDefPtr fs,
|
|
|
fbe740 |
+ virCgroupPtr cgroup)
|
|
|
fbe740 |
+{
|
|
|
fbe740 |
+ g_autofree char *pidfile = NULL;
|
|
|
fbe740 |
+ pid_t pid = -1;
|
|
|
fbe740 |
+ int rc;
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+ if (!(pidfile = qemuVirtioFSCreatePidFilename(vm, fs->info.alias)))
|
|
|
fbe740 |
+ return -1;
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+ rc = virPidFileReadPathIfAlive(pidfile, &pid, NULL);
|
|
|
fbe740 |
+ if (rc < 0 || pid == (pid_t) -1) {
|
|
|
fbe740 |
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
fbe740 |
+ _("virtiofsd died unexpectedly"));
|
|
|
fbe740 |
+ return -1;
|
|
|
fbe740 |
+ }
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+ if (virCgroupAddProcess(cgroup, pid) < 0)
|
|
|
fbe740 |
+ return -1;
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+ return 0;
|
|
|
fbe740 |
+}
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_virtiofs.h b/src/qemu/qemu_virtiofs.h
|
|
|
fbe740 |
index b2f0c57d0c..1db59917c6 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_virtiofs.h
|
|
|
fbe740 |
+++ b/src/qemu/qemu_virtiofs.h
|
|
|
fbe740 |
@@ -35,3 +35,8 @@ void
|
|
|
fbe740 |
qemuVirtioFSStop(virQEMUDriverPtr driver,
|
|
|
fbe740 |
virDomainObjPtr vm,
|
|
|
fbe740 |
virDomainFSDefPtr fs);
|
|
|
fbe740 |
+
|
|
|
fbe740 |
+int
|
|
|
fbe740 |
+qemuVirtioFSSetupCgroup(virDomainObjPtr vm,
|
|
|
fbe740 |
+ virDomainFSDefPtr fs,
|
|
|
fbe740 |
+ virCgroupPtr cgroup);
|
|
|
fbe740 |
--
|
|
|
fbe740 |
2.25.1
|
|
|
fbe740 |
|