1f88dea66c
- Updating to Sphinx v3.1.2 in Factory is exposing an issue in qemu doc sources. Fix it docs-fix-trace-docs-build-with-sphinx-3..patch - Fix DoS possibility in ati-vga emulation (CVE-2020-13800 bsc#1172495) ati-vga-check-mm_index-before-recursive-.patch - Fix DoS possibility in Network Block Device (nbd) support infrastructure (CVE-2020-10761 bsc#1172710) nbd-server-Avoid-long-error-message-asse.patch - Fix null pointer dereference possibility (DoS) in MegaRAID SAS 8708EM2 emulation (CVE-2020-13659 bsc#1172386) exec-set-map-length-to-zero-when-returni.patch - Fix OOB access possibility in MegaRAID SAS 8708EM2 emulation (CVE-2020-13362 bsc#1172383) megasas-use-unsigned-type-for-reply_queu.patch - Fix legacy IGD passthrough hw-vfio-pci-quirks-Fix-broken-legacy-IGD.patch - The latest gcc10 available in Factory has the fix for the issue this patch was created to avoid, so drop it build-Work-around-gcc10-bug-by-not-using.patch - Switch to upstream versions of some patches we carry add-enum-cast-to-avoid-gcc10-warning.patch -> golan-Add-explicit-type-casts-for-nodnic.patch Be-explicit-about-fcommon-compiler-direc.patch -> build-Be-explicit-about-fcommon-compiler.patch Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch -> build-Do-not-apply-WORKAROUND_CFLAGS-for.patch Fix-s-directive-argument-is-null-error.patch -> build-Fix-s-directive-argument-is-null-e.patch Workaround-compilation-error-with-gcc-9..patch -> build-Workaround-compilation-error-with-.patch work-around-gcc10-problem-with-zero-leng.patch -> intel-Avoid-spurious-compiler-warning-on.patch - Fix vgabios issue for cirrus graphics emulation, which effectively downgraded it to standard VGA behavior vga-fix-cirrus-bios.patch - Fix OOB access possibility in ES1370 audio device emulation (CVE-2020-13361 bsc#1172384) es1370-check-total-frame-count-against-c.patch OBS-URL: https://build.opensuse.org/request/show/822154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=553
85 lines
3.1 KiB
Diff
85 lines
3.1 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Mon, 24 Feb 2020 07:49:06 -0500
|
|
Subject: s390x: protvirt: Inhibit balloon when switching to protected mode
|
|
|
|
Git-commit: 59dc32a3494d6afdd420f3e401f1f324a1179256
|
|
References: bsc#1167075
|
|
|
|
Ballooning in protected VMs can only be done when the guest shares the
|
|
pages it gives to the host. If pages are not shared, the integrity
|
|
checks will fail once those pages have been altered and are given back
|
|
to the guest.
|
|
|
|
As we currently do not yet have a solution for this we will continue
|
|
like this:
|
|
|
|
1. We block ballooning now in QEMU (with this patch).
|
|
|
|
2. Later we will provide a change to virtio that removes the blocker
|
|
and adds VIRTIO_F_IOMMU_PLATFORM automatically by QEMU when doing the
|
|
protvirt switch. This is OK, as the balloon driver in Linux (the only
|
|
supported guest) will refuse to work with the IOMMU_PLATFORM feature
|
|
bit set.
|
|
|
|
3. Later, we can fix the guest balloon driver to accept the IOMMU
|
|
feature bit and correctly exercise sharing and unsharing of balloon
|
|
pages.
|
|
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/s390x/s390-virtio-ccw.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
index e00040a00ba60b20b42ee26a299b..db45249320abf7920ec8730790c2 100644
|
|
--- a/hw/s390x/s390-virtio-ccw.c
|
|
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
@@ -43,6 +43,7 @@
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/s390x/tod.h"
|
|
#include "sysemu/sysemu.h"
|
|
+#include "sysemu/balloon.h"
|
|
#include "hw/s390x/pv.h"
|
|
#include <linux/kvm.h>
|
|
#include "migration/blocker.h"
|
|
@@ -329,6 +330,7 @@ static void s390_machine_unprotect(S390CcwMachineState *ms)
|
|
ms->pv = false;
|
|
migrate_del_blocker(pv_mig_blocker);
|
|
error_free_or_abort(&pv_mig_blocker);
|
|
+ qemu_balloon_inhibit(false);
|
|
}
|
|
|
|
static int s390_machine_protect(S390CcwMachineState *ms)
|
|
@@ -336,10 +338,18 @@ static int s390_machine_protect(S390CcwMachineState *ms)
|
|
Error *local_err = NULL;
|
|
int rc;
|
|
|
|
+ /*
|
|
+ * Ballooning on protected VMs needs support in the guest for
|
|
+ * sharing and unsharing balloon pages. Block ballooning for
|
|
+ * now, until we have a solution to make at least Linux guests
|
|
+ * either support it or fail gracefully.
|
|
+ */
|
|
+ qemu_balloon_inhibit(true);
|
|
error_setg(&pv_mig_blocker,
|
|
"protected VMs are currently not migrateable.");
|
|
rc = migrate_add_blocker(pv_mig_blocker, &local_err);
|
|
if (rc) {
|
|
+ qemu_balloon_inhibit(false);
|
|
error_report_err(local_err);
|
|
error_free_or_abort(&pv_mig_blocker);
|
|
return rc;
|
|
@@ -348,6 +358,7 @@ static int s390_machine_protect(S390CcwMachineState *ms)
|
|
/* Create SE VM */
|
|
rc = s390_pv_vm_enable();
|
|
if (rc) {
|
|
+ qemu_balloon_inhibit(false);
|
|
error_report_err(local_err);
|
|
migrate_del_blocker(pv_mig_blocker);
|
|
error_free_or_abort(&pv_mig_blocker);
|