Merge ~paelzer/ubuntu/+source/qemu:post-disco-sru-set-cosmic into ubuntu/+source/qemu:ubuntu/cosmic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA is ready at: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3620

[Christian Ehrhardt  (paelzer)]

dep8 tests are only hitting known flaky tests, so they are ok

Also the automated virt regression tests ran fine on all architectures.

I verified the SRU test steps on the bug on the target HW.

Remaining: I'm waiting on the MP review here

[Andreas Hasenack (ahasenack)]

+1

https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1809083/comments/3 explains why patch 2 isn't needed for #1809083

review: Approve

[Christian Ehrhardt  (paelzer)]

thanks for the review, uploaded to SRU queue

[Christian Ehrhardt  (paelzer)]

Cosmic was accepted - setting merged

diff --git a/debian/changelog b/debian/changelog
index 905a87f..94cc473 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+qemu (1:2.12+dfsg-3ubuntu8.3) cosmic; urgency=medium
+
+  * d/p/ubuntu/lp-1806104-spapr_pci-Remove-unhelpful-pagesize-warning.patch:
+    remove misleading page size warning on qemu-system-ppc64 (LP: #1806104)
+  * d/p/ubuntu/lp-1812384-s390x-Return-specification-exception.patch: ensure
+    a proper exception on unknown diag 308 subcodes
+    (LP: #1812384)
+  * d/p/ubuntu/lp-1809083-*: fix backward migration on ppc64el (LP: #1809083)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 31 Jan 2019 14:28:19 +0100
+
 qemu (1:2.12+dfsg-3ubuntu8.2) cosmic; urgency=medium
 
   * debian/patches/ubuntu/lp1787405-*: Support guest dedicated Crypto
diff --git a/debian/patches/series b/debian/patches/series
index ad98113..ebe81df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,7 @@ ubuntu/lp1787405-0003-s390x-kvm-enable-AP-instruction-interpretation-for-g.patch
 ubuntu/lp1787405-0004-s390x-ap-base-Adjunct-Processor-AP-object-model.patch
 ubuntu/lp1787405-0005-s390x-vfio-ap-Introduce-VFIO-AP-device.patch
 ubuntu/lp1787405-0006-s390-doc-detailed-specifications-for-AP-virtualizati.patch
+ubuntu/lp-1806104-spapr_pci-Remove-unhelpful-pagesize-warning.patch
+ubuntu/lp-1812384-s390x-Return-specification-exception.patch
+ubuntu/lp-1809083-1-target-ppc-always-set-PPC_MEM_TLBIE-in-pre-2.8.patch
+ubuntu/lp-1809083-3-spapr-don-t-advertise-radix-GTSE-if-max-compat.patch
diff --git a/debian/patches/ubuntu/lp-1806104-spapr_pci-Remove-unhelpful-pagesize-warning.patch b/debian/patches/ubuntu/lp-1806104-spapr_pci-Remove-unhelpful-pagesize-warning.patch
new file mode 100644
index 0000000..c3a019b
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1806104-spapr_pci-Remove-unhelpful-pagesize-warning.patch
@@ -0,0 +1,52 @@
+From 30f79dc13f116a79ff45d37ad0f5c035012064a7 Mon Sep 17 00:00:00 2001
+From: David Gibson <[e-mail]>
+Date: Thu, 19 Apr 2018 16:07:40 +1000
+Subject: [PATCH] spapr_pci: Remove unhelpful pagesize warning
+
+By default, the IOMMU model built into the spapr virtual PCI host bridge
+supports 4kiB and 64kiB IOMMU page sizes.  However this can be overridden
+which may be desirable to allow larger IOMMU page sizes when running a
+guest with hugepage backing and passthrough devices.  For that reason a
+warning was printed when the device wasn't configured to allow the pagesize
+with which guest RAM is backed.
+
+Experience has proven, however, that this message is more confusing than
+useful.  Worse it sometimes makes little sense when the host-available page
+sizes don't match those available on the guest, which can happen with
+a POWER8 guest running on a POWER9 KVM host.
+
+Long term we do want better handling to allow large IOMMU page sizes to be
+used, but for now this parameter and warning don't really accomplish it.
+So, remove the message, pending a better solution.
+
+Signed-off-by: David Gibson <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=30f79dc13f116a79ff45d37ad0f5c035012064a7
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1806104
+Last-Update: 2019-01-31
+
+---
+ hw/ppc/spapr_pci.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
+index 39a14980d3..f936ce63ef 100644
+--- a/hw/ppc/spapr_pci.c
++++ b/hw/ppc/spapr_pci.c
+@@ -1717,13 +1717,6 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
+     }
+ 
+     /* DMA setup */
+-    if (((sphb->page_size_mask & qemu_getrampagesize()) == 0)
+-        && kvm_enabled()) {
+-        warn_report("System page size 0x%lx is not enabled in page_size_mask "
+-                    "(0x%"PRIx64"). Performance may be slow",
+-                    qemu_getrampagesize(), sphb->page_size_mask);
+-    }
+-
+     for (i = 0; i < windows_supported; ++i) {
+         tcet = spapr_tce_new_table(DEVICE(sphb), sphb->dma_liobn[i]);
+         if (!tcet) {
+-- 
+2.17.1
+
diff --git a/debian/patches/ubuntu/lp-1809083-1-target-ppc-always-set-PPC_MEM_TLBIE-in-pre-2.8.patch b/debian/patches/ubuntu/lp-1809083-1-target-ppc-always-set-PPC_MEM_TLBIE-in-pre-2.8.patch
new file mode 100644
index 0000000..369ce2e
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1809083-1-target-ppc-always-set-PPC_MEM_TLBIE-in-pre-2.8.patch
@@ -0,0 +1,57 @@
+From bce009645b9f1d59195518e35747c8ea30f985f7 Mon Sep 17 00:00:00 2001
+From: Greg Kurz <[e-mail]>
+Date: Thu, 3 May 2018 23:16:29 +0200
+Subject: [PATCH 1/3] target/ppc: always set PPC_MEM_TLBIE in pre 2.8 migration
+ hack
+
+The pseries-2.7 and older machine types require CPUPPCState::insns_flags
+to be strictly equal between source and destination. This checking is
+abusive and breaks migration of KVM guests when the host CPU models
+are different, even if they are compatible enough to allow the guest
+to run transparently. This buggy behaviour was fixed for pseries-2.8
+and we added some hacks to allow backward migration of older machine
+types. These hacks assume that the CPU belongs to the POWER8 family,
+which was true for most KVM based setup we cared about at the time.
+But now POWER9 systems are coming, and backward migration of pre 2.8
+guests running in POWER8 architected mode from a POWER9 host to a
+POWER8 host is broken:
+
+qemu-system-ppc64: error while loading state for instance 0x0 of device
+ 'cpu'
+qemu-system-ppc64: load of migration failed: Invalid argument
+
+This happens because POWER9 doesn't set PPC_MEM_TLBIE in insns_flags,
+while POWER8 does. Let's force PPC_MEM_TLBIE in the migration hack to
+fix the issue. This is an acceptable hack because these old machine
+types only support CPU models that do set PPC_MEM_TLBIE.
+
+Signed-off-by: Greg Kurz <[e-mail]>
+Signed-off-by: David Gibson <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=bce009645b9f1d59195518e35747c8ea30f985f7
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1809083
+Last-Update: 2019-01-31
+
+---
+ target/ppc/machine.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/target/ppc/machine.c b/target/ppc/machine.c
+index 3d6434a006..ba1b9e531f 100644
+--- a/target/ppc/machine.c
++++ b/target/ppc/machine.c
+@@ -212,6 +212,11 @@ static int cpu_pre_save(void *opaque)
+             ;
+         cpu->mig_msr_mask = env->msr_mask & ~metamask;
+         cpu->mig_insns_flags = env->insns_flags & insns_compat_mask;
++        /* CPU models supported by old machines all have PPC_MEM_TLBIE,
++         * so we set it unconditionally to allow backward migration from
++         * a POWER9 host to a POWER8 host.
++         */
++        cpu->mig_insns_flags |= PPC_MEM_TLBIE;
+         cpu->mig_insns_flags2 = env->insns_flags2 & insns_compat_mask2;
+         cpu->mig_nb_BATs = env->nb_BATs;
+     }
+-- 
+2.17.1
+
diff --git a/debian/patches/ubuntu/lp-1809083-3-spapr-don-t-advertise-radix-GTSE-if-max-compat.patch b/debian/patches/ubuntu/lp-1809083-3-spapr-don-t-advertise-radix-GTSE-if-max-compat.patch
new file mode 100644
index 0000000..12e66cd
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1809083-3-spapr-don-t-advertise-radix-GTSE-if-max-compat.patch
@@ -0,0 +1,71 @@
+From 0550b1206a91d66051a21441a02c4ff126b531fe Mon Sep 17 00:00:00 2001
+From: Greg Kurz <[e-mail]>
+Date: Thu, 3 May 2018 23:16:59 +0200
+Subject: [PATCH 3/3] spapr: don't advertise radix GTSE if max-compat-cpu <
+ power9
+
+On a POWER9 host, if a guest runs in pre POWER9 compat mode, it necessarily
+uses the hash MMU mode. In this case, we shouldn't advertise radix GTSE in
+the ibm,arch-vec-5-platform-support DT property as the current code does.
+The first reason is that it doesn't make sense, and the second one is that
+causes the CAS-negotiated options subsection to be migrated. This breaks
+backward migration to QEMU 2.7 and older versions on POWER8 hosts:
+
+qemu-system-ppc64: error while loading state for instance 0x0 of device
+ 'spapr'
+qemu-system-ppc64: load of migration failed: No such file or directory
+
+This patch hence initialize CPUs a bit earlier so that we can check the
+requested compat mode, and don't set OV5_MMU_RADIX_GTSE for power8 and
+older.
+
+Signed-off-by: Greg Kurz <[e-mail]>
+Signed-off-by: David Gibson <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=0550b1206a91d66051a21441a02c4ff126b531fe
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1809083
+Last-Update: 2019-01-31
+
+diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
+index 19997f66c0..32ab3c43b6 100644
+--- a/hw/ppc/spapr.c
++++ b/hw/ppc/spapr.c
+@@ -2512,6 +2512,7 @@ static void spapr_machine_init(MachineState *machine)
+     long load_limit, fw_size;
+     char *filename;
+     Error *resize_hpt_err = NULL;
++    PowerPCCPU *first_ppc_cpu;
+ 
+     msi_nonbroken = true;
+ 
+@@ -2592,11 +2593,6 @@ static void spapr_machine_init(MachineState *machine)
+     }
+ 
+     spapr_ovec_set(spapr->ov5, OV5_FORM1_AFFINITY);
+-    if (!kvm_enabled() || kvmppc_has_cap_mmu_radix()) {
+-        /* KVM and TCG always allow GTSE with radix... */
+-        spapr_ovec_set(spapr->ov5, OV5_MMU_RADIX_GTSE);
+-    }
+-    /* ... but not with hash (currently). */
+ 
+     /* advertise support for dedicated HP event source to guests */
+     if (spapr->use_hotplug_event_source) {
+@@ -2614,6 +2610,15 @@ static void spapr_machine_init(MachineState *machine)
+     /* init CPUs */
+     spapr_init_cpus(spapr);
+ 
++    first_ppc_cpu = POWERPC_CPU(first_cpu);
++    if ((!kvm_enabled() || kvmppc_has_cap_mmu_radix()) &&
++        ppc_check_compat(first_ppc_cpu, CPU_POWERPC_LOGICAL_3_00, 0,
++                         spapr->max_compat_pvr)) {
++        /* KVM and TCG always allow GTSE with radix... */
++        spapr_ovec_set(spapr->ov5, OV5_MMU_RADIX_GTSE);
++    }
++    /* ... but not with hash (currently). */
++
+     if (kvm_enabled()) {
+         /* Enable H_LOGICAL_CI_* so SLOF can talk to in-kernel devices */
+         kvmppc_enable_logical_ci_hcalls();
+-- 
+2.17.1
+
diff --git a/debian/patches/ubuntu/lp-1812384-s390x-Return-specification-exception.patch b/debian/patches/ubuntu/lp-1812384-s390x-Return-specification-exception.patch
new file mode 100644
index 0000000..15b393c
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1812384-s390x-Return-specification-exception.patch
@@ -0,0 +1,46 @@
+From 37dbd1f4d4805edcd18d94eb202bb3461b3cd52d Mon Sep 17 00:00:00 2001
+From: Janosch Frank <[e-mail]>
+Date: Fri, 11 Jan 2019 12:36:57 +0100
+Subject: [PATCH] s390x: Return specification exception for unimplemented diag
+ 308 subcodes
+
+The architecture specifies specification exceptions for all
+unavailable subcodes.
+
+The presence of subcodes is indicated by checking some query subcode.
+For example 6 will indicate that 3-6 are available. So future systems
+might call new subcodes to check for new features. This should not
+trigger a hw error, instead we return the architectured specification
+exception.
+
+Signed-off-by: Janosch Frank <[e-mail]>
+Cc: [e-mail]
+Message-Id: <[e-mail]>
+Reviewed-by: Christian Borntraeger <[e-mail]>
+Reviewed-by: David Hildenbrand <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=37dbd1f4d4805edcd18d94eb202bb3461b3cd52d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1812384
+Last-Update: 2018-01-31
+
+---
+ target/s390x/diag.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/target/s390x/diag.c b/target/s390x/diag.c
+index acb0f3d4af..aafa740f61 100644
+--- a/target/s390x/diag.c
++++ b/target/s390x/diag.c
+@@ -130,7 +130,7 @@ out:
+         }
+         return;
+     default:
+-        hw_error("Unhandled diag308 subcode %" PRIx64, subcode);
++        s390_program_interrupt(env, PGM_SPECIFICATION, ILEN_AUTO, ra);
+         break;
+     }
+ }
+-- 
+2.17.1
+