Merge ~paelzer/ubuntu/+source/qemu:SRU-lp-1836154-z14-hw-cpu-model-bionic into ubuntu/+source/qemu:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1836154-s390x-hwmodels/+packages
was tested by IBM already on the new HW.

Eventually this might be SRUed together with bug 1832622, but that isn't sure yet so I ask for individual reviews.

[Rafael David Tinoco (rafaeldtinoco)]

Sorry for taking too long for reviewing this, this is next in my TODO list. Will provide feedback very soon.

[Rafael David Tinoco (rafaeldtinoco)]

You already know that, but this is a review, I should mention everything I see and let you decide things.. so here it goes:

We just pushed a fix to Bionic (for MDS-NO) which means that you have to rebase this merge request to the one currently in -proposed. I see
you've also included the boot signature toleration patch in previous version,
I confess I missed that from the current -proposed for Bionic.

------------

About the backported patches:

1) lp-1836154-01-MIMIMAL-header-sync-against-5.2.patch

Despite the small typo for "minimal", I could not find this commit as being a upstream QEMU commit. The commit I found, related to this change, was:

commit d9cb4336159a00bd0d9c81b93f02874ef3626057
Author: Cornelia Huck <email address hidden>
Date: Thu May 16 14:10:36 2019

    linux headers: update against Linux 5.2-rc1

    commit a188339ca5a396acc588e5851ed7e19f66b0ebd9

    Signed-off-by: Cornelia Huck <email address hidden>

diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
index 0265482f8f..03ab5968c7 100644
--- a/linux-headers/asm-s390/kvm.h
+++ b/linux-headers/asm-s390/kvm.h
@@ -152,7 +152,10 @@ struct kvm_s390_vm_cpu_subfunc {
        __u8 pcc[16]; /* with MSA4 */
        __u8 ppno[16]; /* with MSA5 */
        __u8 kma[16]; /* with MSA8 */
- __u8 reserved[1808];
+ __u8 kdsa[16]; /* with MSA9 */
+ __u8 sortl[32]; /* with STFLE.150 */
+ __u8 dfltcc[32]; /* with STFLE.151 */
+ __u8 reserved[1728];
 };

 /* kvm attributes for crypto */

(the exact same content) as given by IBM DE in the backport list.
Did you get this patch (w/ diff desc) somewhere else ?

2) lp-1836154-02-s390x-cpumodel-Miscellaneous-Instruction-Extensions-.patch

Where is the commit ID coming from ? Your local repo ? Correct if I'm wrong but, in this case, using DEP-3 compliant headers is the correct choice, no ?

I saw you added (cherry picked from commit ...) message but that implies in having "Origin:"" header flag (according to DEP3), and changing commit Author, at least it seems that way according to (https://dep-team.pages.debian.net/deps/dep3/).

Patches contents are good and equivalent to the upstream ones.

3) lp-1836154-03-s390x-cpumodel-msa9-facility.patch

Same as (1), (2), (3), ...

I believe you did the same thing for:

lp-1836154-01-mimimal-header-sync-against-5.2.patch (d9cb4336159a)
lp-1836154-02-s390x-cpumodel-...-Extensions-.patch (2ec038836fa0)
lp-1836154-03-s390x-cpumodel-msa9-facility.patch (5dacbe23d23c)
lp-1836154-04-s390x-cpumodel-vector-enhancements.patch (54d65de0b525)
lp-1836154-05-s390x-cpumodel-enhanced-sort-facility.patch (d220fabf1609)
lp-1836154-06-s390x-cpumodel-add-Def...ion-facility.patch (afc7b8666b62)
lp-1836154-07-s390x-cpumodel-add-gen15-defintions.patch (caef62430fed)
lp-1836154-08-s390x-cpumodel-wire...-as-gen15-machin.patch (c657e84faee4)
lp-1836154-09-s390-cpumodel-fix-desc...new-vector-fac.patch (d05be57ddc2e)

and then for the next two:

lp-1836154-s390x-cpumodel-remove-esort-from-the-default-model.patch
lp-1836154-s390x-cpumodel-also-change-name-of-vxbeh.patch

you have the correct cherry-picked patch with a DEP3 header, a...

[Rafael David Tinoco (rafaeldtinoco)]

Functional part of the merge LGTM after testing code in real s390x HW. Patches format, style and normalization will be up to you, since you're the maintainer. +1 from me.

review: Approve

[Christian Ehrhardt  (paelzer)]

The need for a rebase was known.
But since we have so many qemu changes in flight I tend to propose them more reviewable feature by feature and then group all that are ready at the same time.

Yes the reduced set for the 5.2 header backport came from https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1836154/comments/6
Let me add dep3 headers to the first 9 patches that were provided (so far only those I added ahd proper headers), that will make tracking of their source better.
Thanks for the finding - that can later on ease our life a lot.

And for your question, they always should have headers.
I just have forgotten to add some on those patches that we got handed for this bug.
The only difference between "applies cleanly" and "needs backport" are in the header content, but they should all have headers.

And don't excuse too much, you are neither "annoying with minimal details" nor anything else. You perfectly spotted an issue - so thanks from me for doing so :-)

44de81f... by Christian Ehrhardt  on 2019-08-07

d/p/ubuntu/lp-1836154-*: add dep3 headers for pacthes provided by IBM

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Fixups pushed, set to approved

[Christian Ehrhardt  (paelzer)]

Note: Disco branch is ok as there it were direct git-to-dquilt picks.
An ack there (if ok) would be nice as well.

[Rafael David Tinoco (rafaeldtinoco)]

For sure!

[Christian Ehrhardt  (paelzer)]

This migrated, closing forgotten MP

diff --git a/debian/changelog b/debian/changelog
index 89fced9..38cd270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
 qemu (1:2.11+dfsg-1ubuntu7.17) bionic; urgency=medium
 
+<<<<<<< debian/changelog
   * {Ice,Cascade}Lake IA32_ARCH_CAPABILITIES support (LP: 1828495)
     Needed patch is in d/p/u/lp1828495-:
     - 0017-target-i386-add-MDS-NO-feature.patch:
       target/i386: add MDS-NO feature
 
  -- Rafael David Tinoco <[e-mail]>  Mon, 05 Aug 2019 19:12:08 +0000
+=======
+  * d/p/ubuntu/lp-1836154-*: add HW CPU model for newer s390x machines
+    (LP: #1836154)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 16 Jul 2019 13:05:34 +0200
+>>>>>>> debian/changelog
 
 qemu (1:2.11+dfsg-1ubuntu7.16) bionic; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index fe176a0..e18383e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -104,4 +104,18 @@ ubuntu/lp1828495-0013-cascadelake-server.patch
 ubuntu/lp1828495-0014-remove-cpuid-pconfig.patch
 ubuntu/lp1828495-0015-remove-cpuid-intel_pt.patch
 ubuntu/lp1828495-0016-no-ospke-on-some.patch
+<<<<<<< debian/patches/series
 ubuntu/lp1828495-0017-target-i386-add-MDS-NO-feature.patch
+=======
+ubuntu/lp-1836154-01-mimimal-header-sync-against-5.2.patch
+ubuntu/lp-1836154-02-s390x-cpumodel-Miscellaneous-Instruction-Extensions-.patch
+ubuntu/lp-1836154-03-s390x-cpumodel-msa9-facility.patch
+ubuntu/lp-1836154-04-s390x-cpumodel-vector-enhancements.patch
+ubuntu/lp-1836154-05-s390x-cpumodel-enhanced-sort-facility.patch
+ubuntu/lp-1836154-06-s390x-cpumodel-add-Deflate-conversion-facility.patch
+ubuntu/lp-1836154-07-s390x-cpumodel-add-gen15-defintions.patch
+ubuntu/lp-1836154-08-s390x-cpumodel-wire-up-8561-and-8562-as-gen15-machin.patch
+ubuntu/lp-1836154-09-s390-cpumodel-fix-description-for-the-new-vector-fac.patch
+ubuntu/lp-1836154-s390x-cpumodel-remove-esort-from-the-default-model.patch
+ubuntu/lp-1836154-s390x-cpumodel-also-change-name-of-vxbeh.patch
+>>>>>>> debian/patches/series
diff --git a/debian/patches/ubuntu/lp-1836154-01-mimimal-header-sync-against-5.2.patch b/debian/patches/ubuntu/lp-1836154-01-mimimal-header-sync-against-5.2.patch
new file mode 100644
index 0000000..c23f3dd
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-01-mimimal-header-sync-against-5.2.patch
@@ -0,0 +1,36 @@
+From bc3442e7becc9c67f29000c1e7b2193004ad1e8c Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Fri, 12 Jul 2019 10:14:09 +0200
+Subject: [PATCH 1/9] mimimal header sync against 5.2
+
+only kvm/s390 parts.
+
+Signed-off-by: Christian Borntraeger <[e-mail]>
+
+Author: Christian Borntraeger <[e-mail]>
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=d9cb4336159a00bd0d9c81b93f02874ef3626057
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-08-07
+---
+ linux-headers/asm-s390/kvm.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
+index 0265482f8fdf..03ab5968c75d 100644
+--- a/linux-headers/asm-s390/kvm.h
++++ b/linux-headers/asm-s390/kvm.h
+@@ -152,7 +152,10 @@ struct kvm_s390_vm_cpu_subfunc {
+ 	__u8 pcc[16];		/* with MSA4 */
+ 	__u8 ppno[16];		/* with MSA5 */
+ 	__u8 kma[16];		/* with MSA8 */
+-	__u8 reserved[1808];
++	__u8 kdsa[16];		/* with MSA9 */
++	__u8 sortl[32];		/* with STFLE.150 */
++	__u8 dfltcc[32];	/* with STFLE.151 */
++	__u8 reserved[1728];
+ };
+ 
+ /* kvm attributes for crypto */
+-- 
+2.12.3
+
diff --git a/debian/patches/ubuntu/lp-1836154-02-s390x-cpumodel-Miscellaneous-Instruction-Extensions-.patch b/debian/patches/ubuntu/lp-1836154-02-s390x-cpumodel-Miscellaneous-Instruction-Extensions-.patch
new file mode 100644
index 0000000..c0eceeb
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-02-s390x-cpumodel-Miscellaneous-Instruction-Extensions-.patch
@@ -0,0 +1,51 @@
+From 81a992fdea16e44f4d0eae7dc859a0dc8be2d6f9 Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 29 Apr 2019 05:02:44 -0400
+Subject: [PATCH 2/9] s390x/cpumodel: Miscellaneous-Instruction-Extensions
+ Facility 3
+
+Provide the "Miscellaneous-Instruction-Extensions Facility 3" via
+stfle.61.
+
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Reviewed-by: David Hildenbrand <[e-mail]>
+Message-Id: <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+(cherry picked from commit 2ec038836fa03103596023e4a1ad7e6eb50ee7c7)
+
+Author: Christian Borntraeger <[e-mail]>
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=2ec038836fa03103596023e4a1ad7e6eb50ee7c7
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-08-07
+---
+ target/s390x/cpu_features.c     | 1 +
+ target/s390x/cpu_features_def.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
+index 15738afee154..f03c3c1b9263 100644
+--- a/target/s390x/cpu_features.c
++++ b/target/s390x/cpu_features.c
+@@ -80,6 +80,7 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("minste2", S390_FEAT_TYPE_STFL, 58, "Miscellaneous-instruction-extensions facility 2"),
+     FEAT_INIT("sema", S390_FEAT_TYPE_STFL, 59, "Semaphore-assist facility"),
+     FEAT_INIT("tsi", S390_FEAT_TYPE_STFL, 60, "Time-slice Instrumentation facility"),
++    FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
+     FEAT_INIT("ri", S390_FEAT_TYPE_STFL, 64, "CPU runtime-instrumentation facility"),
+     FEAT_INIT("zpci", S390_FEAT_TYPE_STFL, 69, "z/PCI facility"),
+     FEAT_INIT("aen", S390_FEAT_TYPE_STFL, 71, "General-purpose-adapter-event-notification facility"),
+diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
+index 965bde306acd..b233b7137860 100644
+--- a/target/s390x/cpu_features_def.h
++++ b/target/s390x/cpu_features_def.h
+@@ -71,6 +71,7 @@ typedef enum {
+     S390_FEAT_MISC_INSTRUCTION_EXT,
+     S390_FEAT_SEMAPHORE_ASSIST,
+     S390_FEAT_TIME_SLICE_INSTRUMENTATION,
++    S390_FEAT_MISC_INSTRUCTION_EXT3,
+     S390_FEAT_RUNTIME_INSTRUMENTATION,
+     S390_FEAT_ZPCI,
+     S390_FEAT_ADAPTER_EVENT_NOTIFICATION,
+-- 
+2.12.3
+
diff --git a/debian/patches/ubuntu/lp-1836154-03-s390x-cpumodel-msa9-facility.patch b/debian/patches/ubuntu/lp-1836154-03-s390x-cpumodel-msa9-facility.patch
new file mode 100644
index 0000000..2df3046
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-03-s390x-cpumodel-msa9-facility.patch
@@ -0,0 +1,298 @@
+From ba9165e0f4e3f09893362901f4ba8845dd992cf5 Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 29 Apr 2019 05:02:45 -0400
+Subject: [PATCH 3/9] s390x/cpumodel: msa9 facility
+
+Provide the MSA9 facility (stfle.155). This also contains pckmo
+subfunctions for key wrapping. Keep them in a separate group to disable
+those as a block if necessary. This is for example needed when disabling
+key wrapping via the HMC.
+
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Message-Id: <[e-mail]>
+Reviewed-by: David Hildenbrand <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+(cherry picked from commit 5dacbe23d23c7f0395fa0e65ff1698f632846714)
+
+Author: Christian Borntraeger <[e-mail]>
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=5dacbe23d23c7f0395fa0e65ff1698f632846714
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-08-07
+---
+ target/s390x/cpu_features.c     | 32 +++++++++++++++++++++++++++++++
+ target/s390x/cpu_features.h     |  3 +++
+ target/s390x/cpu_features_def.h | 31 ++++++++++++++++++++++++++++++
+ target/s390x/cpu_models.c       |  2 ++
+ target/s390x/gen-features.c     | 42 +++++++++++++++++++++++++++++++++++++++++
+ target/s390x/kvm.c              |  6 ++++++
+ 6 files changed, 116 insertions(+)
+
+diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
+index f03c3c1b9263..78e26044ad17 100644
+--- a/target/s390x/cpu_features.c
++++ b/target/s390x/cpu_features.c
+@@ -105,6 +105,7 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
+     FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
+     FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
++    FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
+     FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
+ 
+     /* SCLP SCCB Byte 80 - 98  (bit numbers relative to byte-80) */
+@@ -235,6 +236,11 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),
+     FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),
+     FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),
++    FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
++    FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
++    FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
++    FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
++    FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
+ 
+     FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),
+     FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),
+@@ -291,6 +297,13 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),
+     FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),
+     FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),
++    FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
++    FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
++    FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
++    FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
++    FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
++    FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
++    FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
+ 
+     FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),
+     FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),
+@@ -302,6 +315,22 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),
+     FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),
+     FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),
++
++    FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
++    FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
++    FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
++    FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
++    FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
++    FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
++    FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
++    FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
++    FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
++    FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
++    FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
++    FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
++    FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
++    FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
++    FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
+ };
+ 
+ const S390FeatDef *s390_feat_def(S390Feat feat)
+@@ -364,6 +393,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
+     case S390_FEAT_TYPE_PCC:
+     case S390_FEAT_TYPE_PPNO:
+     case S390_FEAT_TYPE_KMA:
++    case S390_FEAT_TYPE_KDSA:
+         set_be_bit(0, data); /* query is always available */
+         break;
+     default:
+@@ -459,6 +489,8 @@ static S390FeatGroupDef s390_feature_groups[] = {
+     FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"),
+     FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"),
+     FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
++    FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
++    FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
+ };
+ 
+ const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
+diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
+index e306aa7ab2ac..23a89dbe63f8 100644
+--- a/target/s390x/cpu_features.h
++++ b/target/s390x/cpu_features.h
+@@ -38,6 +38,7 @@ typedef enum {
+     S390_FEAT_TYPE_PCC,
+     S390_FEAT_TYPE_PPNO,
+     S390_FEAT_TYPE_KMA,
++    S390_FEAT_TYPE_KDSA,
+ } S390FeatType;
+ 
+ /* Definition of a CPU feature */
+@@ -78,6 +79,8 @@ typedef enum {
+     S390_FEAT_GROUP_MSA_EXT_6,
+     S390_FEAT_GROUP_MSA_EXT_7,
+     S390_FEAT_GROUP_MSA_EXT_8,
++    S390_FEAT_GROUP_MSA_EXT_9,
++    S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
+     S390_FEAT_GROUP_MAX,
+ } S390FeatGroup;
+ 
+diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
+index b233b7137860..6ac8e6ded6f7 100644
+--- a/target/s390x/cpu_features_def.h
++++ b/target/s390x/cpu_features_def.h
+@@ -96,6 +96,7 @@ typedef enum {
+     S390_FEAT_INSERT_REFERENCE_BITS_MULT,
+     S390_FEAT_MSA_EXT_8,
+     S390_FEAT_CMM_NT,
++    S390_FEAT_MSA_EXT_9,
+     S390_FEAT_ETOKEN,
+ 
+     /* Sclp Conf Char */
+@@ -236,6 +237,11 @@ typedef enum {
+     S390_FEAT_PCKMO_AES_128,
+     S390_FEAT_PCKMO_AES_192,
+     S390_FEAT_PCKMO_AES_256,
++    S390_FEAT_PCKMO_ECC_P256,
++    S390_FEAT_PCKMO_ECC_P384,
++    S390_FEAT_PCKMO_ECC_P521,
++    S390_FEAT_PCKMO_ECC_ED25519,
++    S390_FEAT_PCKMO_ECC_ED448,
+ 
+     /* KMCTR */
+     S390_FEAT_KMCTR_DEA,
+@@ -296,6 +302,13 @@ typedef enum {
+     S390_FEAT_PCC_XTS_AES_256,
+     S390_FEAT_PCC_XTS_EAES_128,
+     S390_FEAT_PCC_XTS_EAES_256,
++    S390_FEAT_PCC_SCALAR_MULT_P256,
++    S390_FEAT_PCC_SCALAR_MULT_P384,
++    S390_FEAT_PCC_SCALAR_MULT_P512,
++    S390_FEAT_PCC_SCALAR_MULT_ED25519,
++    S390_FEAT_PCC_SCALAR_MULT_ED448,
++    S390_FEAT_PCC_SCALAR_MULT_X25519,
++    S390_FEAT_PCC_SCALAR_MULT_X448,
+ 
+     /* PPNO/PRNO */
+     S390_FEAT_PPNO_SHA_512_DRNG,
+@@ -309,6 +322,24 @@ typedef enum {
+     S390_FEAT_KMA_GCM_EAES_128,
+     S390_FEAT_KMA_GCM_EAES_192,
+     S390_FEAT_KMA_GCM_EAES_256,
++
++    /* KDSA */
++    S390_FEAT_ECDSA_VERIFY_P256,
++    S390_FEAT_ECDSA_VERIFY_P384,
++    S390_FEAT_ECDSA_VERIFY_P512,
++    S390_FEAT_ECDSA_SIGN_P256,
++    S390_FEAT_ECDSA_SIGN_P384,
++    S390_FEAT_ECDSA_SIGN_P512,
++    S390_FEAT_EECDSA_SIGN_P256,
++    S390_FEAT_EECDSA_SIGN_P384,
++    S390_FEAT_EECDSA_SIGN_P512,
++    S390_FEAT_EDDSA_VERIFY_ED25519,
++    S390_FEAT_EDDSA_VERIFY_ED448,
++    S390_FEAT_EDDSA_SIGN_ED25519,
++    S390_FEAT_EDDSA_SIGN_ED448,
++    S390_FEAT_EEDDSA_SIGN_ED25519,
++    S390_FEAT_EEDDSA_SIGN_ED448,
++
+     S390_FEAT_MAX,
+ } S390Feat;
+ 
+diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
+index 541840006edc..1e8714afe3a8 100644
+--- a/target/s390x/cpu_models.c
++++ b/target/s390x/cpu_models.c
+@@ -740,6 +740,8 @@ static void check_consistency(const S390CPUModel *model)
+         { S390_FEAT_SIE_CMMA, S390_FEAT_SIE_GSLS },
+         { S390_FEAT_SIE_PFMFI, S390_FEAT_EDAT },
+         { S390_FEAT_MSA_EXT_8, S390_FEAT_MSA_EXT_3 },
++        { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_3 },
++        { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
+         { S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
+         { S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
+         { S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
+diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
+index fb7a7f23fb58..8b042a15a410 100644
+--- a/target/s390x/gen-features.c
++++ b/target/s390x/gen-features.c
+@@ -209,6 +209,38 @@
+     S390_FEAT_KMA_GCM_EAES_192, \
+     S390_FEAT_KMA_GCM_EAES_256
+ 
++#define S390_FEAT_GROUP_MSA_EXT_9 \
++    S390_FEAT_MSA_EXT_9, \
++    S390_FEAT_ECDSA_VERIFY_P256, \
++    S390_FEAT_ECDSA_VERIFY_P384, \
++    S390_FEAT_ECDSA_VERIFY_P512, \
++    S390_FEAT_ECDSA_SIGN_P256, \
++    S390_FEAT_ECDSA_SIGN_P384, \
++    S390_FEAT_ECDSA_SIGN_P512, \
++    S390_FEAT_EECDSA_SIGN_P256, \
++    S390_FEAT_EECDSA_SIGN_P384, \
++    S390_FEAT_EECDSA_SIGN_P512, \
++    S390_FEAT_EDDSA_VERIFY_ED25519, \
++    S390_FEAT_EDDSA_VERIFY_ED448, \
++    S390_FEAT_EDDSA_SIGN_ED25519, \
++    S390_FEAT_EDDSA_SIGN_ED448, \
++    S390_FEAT_EEDDSA_SIGN_ED25519, \
++    S390_FEAT_EEDDSA_SIGN_ED448, \
++    S390_FEAT_PCC_SCALAR_MULT_P256, \
++    S390_FEAT_PCC_SCALAR_MULT_P384, \
++    S390_FEAT_PCC_SCALAR_MULT_P512, \
++    S390_FEAT_PCC_SCALAR_MULT_ED25519, \
++    S390_FEAT_PCC_SCALAR_MULT_ED448, \
++    S390_FEAT_PCC_SCALAR_MULT_X25519, \
++    S390_FEAT_PCC_SCALAR_MULT_X448
++
++#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
++    S390_FEAT_PCKMO_ECC_P256, \
++    S390_FEAT_PCKMO_ECC_P384, \
++    S390_FEAT_PCKMO_ECC_P521, \
++    S390_FEAT_PCKMO_ECC_ED25519, \
++    S390_FEAT_PCKMO_ECC_ED448
++
+ /* cpu feature groups */
+ static uint16_t group_PLO[] = {
+     S390_FEAT_GROUP_PLO,
+@@ -247,6 +279,14 @@ static uint16_t group_MSA_EXT_8[] = {
+     S390_FEAT_GROUP_MSA_EXT_8,
+ };
+ 
++static uint16_t group_MSA_EXT_9[] = {
++    S390_FEAT_GROUP_MSA_EXT_9,
++};
++
++static uint16_t group_MSA_EXT_9_PCKMO[] = {
++    S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
++};
++
+ /* Base features (in order of release)
+  * Only non-hypervisor managed features belong here.
+  * Base feature sets are static meaning they do not change in future QEMU
+@@ -631,6 +671,8 @@ static FeatGroupDefSpec FeatGroupDef[] = {
+     FEAT_GROUP_INITIALIZER(MSA_EXT_6),
+     FEAT_GROUP_INITIALIZER(MSA_EXT_7),
+     FEAT_GROUP_INITIALIZER(MSA_EXT_8),
++    FEAT_GROUP_INITIALIZER(MSA_EXT_9),
++    FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
+ };
+ 
+ static void set_bits(uint64_t list[], BitSpec bits)
+diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
+index 23a03d74a65e..de67450ebebb 100644
+--- a/target/s390x/kvm.c
++++ b/target/s390x/kvm.c
+@@ -2132,6 +2132,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
+     if (test_bit(S390_FEAT_MSA_EXT_8, features)) {
+         s390_add_from_feat_block(features, S390_FEAT_TYPE_KMA, prop.kma);
+     }
++    if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
++        s390_add_from_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
++    }
+     return 0;
+ }
+ 
+@@ -2176,6 +2179,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
+     if (test_bit(S390_FEAT_MSA_EXT_8, features)) {
+         s390_fill_feat_block(features, S390_FEAT_TYPE_KMA, prop.kma);
+     }
++    if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
++        s390_fill_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
++    }
+     return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
+ }
+ 
+-- 
+2.12.3
+
diff --git a/debian/patches/ubuntu/lp-1836154-04-s390x-cpumodel-vector-enhancements.patch b/debian/patches/ubuntu/lp-1836154-04-s390x-cpumodel-vector-enhancements.patch
new file mode 100644
index 0000000..9f039cc
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-04-s390x-cpumodel-vector-enhancements.patch
@@ -0,0 +1,51 @@
+From c83bd115bc91acde9931fc91b46df474d96ebb76 Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 29 Apr 2019 05:02:46 -0400
+Subject: [PATCH 4/9] s390x/cpumodel: vector enhancements
+
+Add vector enhancements to the cpu model.
+
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Reviewed-by: David Hildenbrand <[e-mail]>
+Message-Id: <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+(cherry picked from commit 54d65de0b525272edfa66eb75c3f67b183f8aff4)
+
+Author: Christian Borntraeger <[e-mail]>
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=54d65de0b525272edfa66eb75c3f67b183f8aff4
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-08-07
+---
+ target/s390x/cpu_features.c     | 2 ++
+ target/s390x/cpu_features_def.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
+index 78e26044ad17..7073dcb5d8ea 100644
+--- a/target/s390x/cpu_features.c
++++ b/target/s390x/cpu_features.c
+@@ -105,6 +105,8 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
+     FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
+     FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
++    FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
++    FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
+     FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
+     FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
+ 
+diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
+index 6ac8e6ded6f7..209303ea0d53 100644
+--- a/target/s390x/cpu_features_def.h
++++ b/target/s390x/cpu_features_def.h
+@@ -96,6 +96,8 @@ typedef enum {
+     S390_FEAT_INSERT_REFERENCE_BITS_MULT,
+     S390_FEAT_MSA_EXT_8,
+     S390_FEAT_CMM_NT,
++    S390_FEAT_VECTOR_ENH2,
++    S390_FEAT_VECTOR_BCD_ENH,
+     S390_FEAT_MSA_EXT_9,
+     S390_FEAT_ETOKEN,
+ 
+-- 
+2.12.3
+
diff --git a/debian/patches/ubuntu/lp-1836154-05-s390x-cpumodel-enhanced-sort-facility.patch b/debian/patches/ubuntu/lp-1836154-05-s390x-cpumodel-enhanced-sort-facility.patch
new file mode 100644
index 0000000..141b7d8
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-05-s390x-cpumodel-enhanced-sort-facility.patch
@@ -0,0 +1,186 @@
+From 0fa9768063532758fe4713421cffea2e555cae87 Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 29 Apr 2019 05:02:47 -0400
+Subject: [PATCH 5/9] s390x/cpumodel: enhanced sort facility
+
+add the enhanced sort facility.
+
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Reviewed-by: David Hildenbrand <[e-mail]>
+Message-Id: <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+(cherry picked from commit d220fabf16091ca5c26f3313541bdfb7435d6a08)
+
+Author: Christian Borntraeger <[e-mail]>
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=d220fabf16091ca5c26f3313541bdfb7435d6a08
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-08-07
+---
+ target/s390x/cpu_features.c     | 10 ++++++++++
+ target/s390x/cpu_features.h     |  2 ++
+ target/s390x/cpu_features_def.h |  8 ++++++++
+ target/s390x/gen-features.c     | 14 ++++++++++++++
+ target/s390x/kvm.c              |  6 ++++++
+ 5 files changed, 40 insertions(+)
+
+diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
+index 7073dcb5d8ea..f1d784beeb52 100644
+--- a/target/s390x/cpu_features.c
++++ b/target/s390x/cpu_features.c
+@@ -106,6 +106,7 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
+     FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
+     FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
++    FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
+     FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
+     FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
+     FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
+@@ -333,6 +334,12 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
+     FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
+     FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
++
++    FEAT_INIT("sortl-sflr", S390_FEAT_TYPE_SORTL, 1, "SORTL SFLR"),
++    FEAT_INIT("sortl-svlr", S390_FEAT_TYPE_SORTL, 2, "SORTL SVLR"),
++    FEAT_INIT("sortl-32", S390_FEAT_TYPE_SORTL, 130, "SORTL 32 input lists"),
++    FEAT_INIT("sortl-128", S390_FEAT_TYPE_SORTL, 132, "SORTL 128 input lists"),
++    FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
+ };
+ 
+ const S390FeatDef *s390_feat_def(S390Feat feat)
+@@ -396,6 +403,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
+     case S390_FEAT_TYPE_PPNO:
+     case S390_FEAT_TYPE_KMA:
+     case S390_FEAT_TYPE_KDSA:
++    case S390_FEAT_TYPE_SORTL:
+         set_be_bit(0, data); /* query is always available */
+         break;
+     default:
+@@ -423,6 +431,7 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,
+        nr_bits = 16384;
+        break;
+     case S390_FEAT_TYPE_PLO:
++    case S390_FEAT_TYPE_SORTL:
+        nr_bits = 256;
+        break;
+     default:
+@@ -493,6 +502,7 @@ static S390FeatGroupDef s390_feature_groups[] = {
+     FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
+     FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
+     FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
++    FEAT_GROUP_INIT("esort", ENH_SORT, "Enhanced-sort facility"),
+ };
+ 
+ const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
+diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
+index 23a89dbe63f8..c829f367861d 100644
+--- a/target/s390x/cpu_features.h
++++ b/target/s390x/cpu_features.h
+@@ -39,6 +39,7 @@ typedef enum {
+     S390_FEAT_TYPE_PPNO,
+     S390_FEAT_TYPE_KMA,
+     S390_FEAT_TYPE_KDSA,
++    S390_FEAT_TYPE_SORTL,
+ } S390FeatType;
+ 
+ /* Definition of a CPU feature */
+@@ -81,6 +82,7 @@ typedef enum {
+     S390_FEAT_GROUP_MSA_EXT_8,
+     S390_FEAT_GROUP_MSA_EXT_9,
+     S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
++    S390_FEAT_GROUP_ENH_SORT,
+     S390_FEAT_GROUP_MAX,
+ } S390FeatGroup;
+ 
+diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
+index 209303ea0d53..f13f74a3ade2 100644
+--- a/target/s390x/cpu_features_def.h
++++ b/target/s390x/cpu_features_def.h
+@@ -97,6 +97,7 @@ typedef enum {
+     S390_FEAT_MSA_EXT_8,
+     S390_FEAT_CMM_NT,
+     S390_FEAT_VECTOR_ENH2,
++    S390_FEAT_ESORT_BASE,
+     S390_FEAT_VECTOR_BCD_ENH,
+     S390_FEAT_MSA_EXT_9,
+     S390_FEAT_ETOKEN,
+@@ -342,6 +343,13 @@ typedef enum {
+     S390_FEAT_EEDDSA_SIGN_ED25519,
+     S390_FEAT_EEDDSA_SIGN_ED448,
+ 
++    /* SORTL */
++    S390_FEAT_SORTL_SFLR,
++    S390_FEAT_SORTL_SVLR,
++    S390_FEAT_SORTL_32,
++    S390_FEAT_SORTL_128,
++    S390_FEAT_SORTL_F0,
++
+     S390_FEAT_MAX,
+ } S390Feat;
+ 
+diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
+index 8b042a15a410..bb457afe8b64 100644
+--- a/target/s390x/gen-features.c
++++ b/target/s390x/gen-features.c
+@@ -241,6 +241,15 @@
+     S390_FEAT_PCKMO_ECC_ED25519, \
+     S390_FEAT_PCKMO_ECC_ED448
+ 
++#define S390_FEAT_GROUP_ENH_SORT \
++    S390_FEAT_ESORT_BASE, \
++    S390_FEAT_SORTL_SFLR, \
++    S390_FEAT_SORTL_SVLR, \
++    S390_FEAT_SORTL_32, \
++    S390_FEAT_SORTL_128, \
++    S390_FEAT_SORTL_F0
++
++
+ /* cpu feature groups */
+ static uint16_t group_PLO[] = {
+     S390_FEAT_GROUP_PLO,
+@@ -287,6 +296,10 @@ static uint16_t group_MSA_EXT_9_PCKMO[] = {
+     S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
+ };
+ 
++static uint16_t group_ENH_SORT[] = {
++    S390_FEAT_GROUP_ENH_SORT,
++};
++
+ /* Base features (in order of release)
+  * Only non-hypervisor managed features belong here.
+  * Base feature sets are static meaning they do not change in future QEMU
+@@ -673,6 +686,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
+     FEAT_GROUP_INITIALIZER(MSA_EXT_8),
+     FEAT_GROUP_INITIALIZER(MSA_EXT_9),
+     FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
++    FEAT_GROUP_INITIALIZER(ENH_SORT),
+ };
+ 
+ static void set_bits(uint64_t list[], BitSpec bits)
+diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
+index de67450ebebb..360b04db7698 100644
+--- a/target/s390x/kvm.c
++++ b/target/s390x/kvm.c
+@@ -2135,6 +2135,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
+     if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
+         s390_add_from_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
+     }
++    if (test_bit(S390_FEAT_ESORT_BASE, features)) {
++        s390_add_from_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
++    }
+     return 0;
+ }
+ 
+@@ -2182,6 +2185,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
+     if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
+         s390_fill_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
+     }
++    if (test_bit(S390_FEAT_ESORT_BASE, features)) {
++        s390_fill_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
++    }
+     return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
+ }
+ 
+-- 
+2.12.3
+
diff --git a/debian/patches/ubuntu/lp-1836154-06-s390x-cpumodel-add-Deflate-conversion-facility.patch b/debian/patches/ubuntu/lp-1836154-06-s390x-cpumodel-add-Deflate-conversion-facility.patch
new file mode 100644
index 0000000..7800ab1
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-06-s390x-cpumodel-add-Deflate-conversion-facility.patch
@@ -0,0 +1,182 @@
+From ee6b6209e534d15aa458cf0e20161c08da4fe31d Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 29 Apr 2019 05:02:48 -0400
+Subject: [PATCH 6/9] s390x/cpumodel: add Deflate-conversion facility
+
+add the deflate conversion facility.
+
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Message-Id: <[e-mail]>
+Reviewed-by: David Hildenbrand <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+(cherry picked from commit afc7b8666b62fe72fdbad7ab0c3f206d4c57c1d1)
+
+Author: Christian Borntraeger <[e-mail]>
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=afc7b8666b62fe72fdbad7ab0c3f206d4c57c1d1
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-08-07
+---
+ target/s390x/cpu_features.c     |  9 +++++++++
+ target/s390x/cpu_features.h     |  2 ++
+ target/s390x/cpu_features_def.h |  7 +++++++
+ target/s390x/gen-features.c     | 12 ++++++++++++
+ target/s390x/kvm.c              |  6 ++++++
+ 5 files changed, 36 insertions(+)
+
+diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
+index f1d784beeb52..98fa3a66dc81 100644
+--- a/target/s390x/cpu_features.c
++++ b/target/s390x/cpu_features.c
+@@ -107,6 +107,7 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
+     FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
+     FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
++    FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
+     FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
+     FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
+     FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
+@@ -340,6 +341,11 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("sortl-32", S390_FEAT_TYPE_SORTL, 130, "SORTL 32 input lists"),
+     FEAT_INIT("sortl-128", S390_FEAT_TYPE_SORTL, 132, "SORTL 128 input lists"),
+     FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
++
++    FEAT_INIT("dfltcc-gdht", S390_FEAT_TYPE_DFLTCC, 1, "DFLTCC GDHT"),
++    FEAT_INIT("dfltcc-cmpr", S390_FEAT_TYPE_DFLTCC, 2, "DFLTCC CMPR"),
++    FEAT_INIT("dfltcc-xpnd", S390_FEAT_TYPE_DFLTCC, 4, "DFLTCC XPND"),
++    FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
+ };
+ 
+ const S390FeatDef *s390_feat_def(S390Feat feat)
+@@ -404,6 +410,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
+     case S390_FEAT_TYPE_KMA:
+     case S390_FEAT_TYPE_KDSA:
+     case S390_FEAT_TYPE_SORTL:
++    case S390_FEAT_TYPE_DFLTCC:
+         set_be_bit(0, data); /* query is always available */
+         break;
+     default:
+@@ -432,6 +439,7 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,
+        break;
+     case S390_FEAT_TYPE_PLO:
+     case S390_FEAT_TYPE_SORTL:
++    case S390_FEAT_TYPE_DFLTCC:
+        nr_bits = 256;
+        break;
+     default:
+@@ -503,6 +511,7 @@ static S390FeatGroupDef s390_feature_groups[] = {
+     FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
+     FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
+     FEAT_GROUP_INIT("esort", ENH_SORT, "Enhanced-sort facility"),
++    FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
+ };
+ 
+ const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
+diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
+index c829f367861d..7e161380963b 100644
+--- a/target/s390x/cpu_features.h
++++ b/target/s390x/cpu_features.h
+@@ -40,6 +40,7 @@ typedef enum {
+     S390_FEAT_TYPE_KMA,
+     S390_FEAT_TYPE_KDSA,
+     S390_FEAT_TYPE_SORTL,
++    S390_FEAT_TYPE_DFLTCC,
+ } S390FeatType;
+ 
+ /* Definition of a CPU feature */
+@@ -83,6 +84,7 @@ typedef enum {
+     S390_FEAT_GROUP_MSA_EXT_9,
+     S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
+     S390_FEAT_GROUP_ENH_SORT,
++    S390_FEAT_GROUP_DEFLATE_CONVERSION,
+     S390_FEAT_GROUP_MAX,
+ } S390FeatGroup;
+ 
+diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
+index f13f74a3ade2..973ef0ccf982 100644
+--- a/target/s390x/cpu_features_def.h
++++ b/target/s390x/cpu_features_def.h
+@@ -98,6 +98,7 @@ typedef enum {
+     S390_FEAT_CMM_NT,
+     S390_FEAT_VECTOR_ENH2,
+     S390_FEAT_ESORT_BASE,
++    S390_FEAT_DEFLATE_BASE,
+     S390_FEAT_VECTOR_BCD_ENH,
+     S390_FEAT_MSA_EXT_9,
+     S390_FEAT_ETOKEN,
+@@ -350,6 +351,12 @@ typedef enum {
+     S390_FEAT_SORTL_128,
+     S390_FEAT_SORTL_F0,
+ 
++    /* DEFLATE */
++    S390_FEAT_DEFLATE_GHDT,
++    S390_FEAT_DEFLATE_CMPR,
++    S390_FEAT_DEFLATE_XPND,
++    S390_FEAT_DEFLATE_F0,
++
+     S390_FEAT_MAX,
+ } S390Feat;
+ 
+diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
+index bb457afe8b64..9ebef0506e5f 100644
+--- a/target/s390x/gen-features.c
++++ b/target/s390x/gen-features.c
+@@ -250,6 +250,13 @@
+     S390_FEAT_SORTL_F0
+ 
+ 
++#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
++    S390_FEAT_DEFLATE_BASE, \
++    S390_FEAT_DEFLATE_GHDT, \
++    S390_FEAT_DEFLATE_CMPR, \
++    S390_FEAT_DEFLATE_XPND, \
++    S390_FEAT_DEFLATE_F0
++
+ /* cpu feature groups */
+ static uint16_t group_PLO[] = {
+     S390_FEAT_GROUP_PLO,
+@@ -300,6 +307,10 @@ static uint16_t group_ENH_SORT[] = {
+     S390_FEAT_GROUP_ENH_SORT,
+ };
+ 
++static uint16_t group_DEFLATE_CONVERSION[] = {
++    S390_FEAT_GROUP_DEFLATE_CONVERSION,
++};
++
+ /* Base features (in order of release)
+  * Only non-hypervisor managed features belong here.
+  * Base feature sets are static meaning they do not change in future QEMU
+@@ -687,6 +698,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
+     FEAT_GROUP_INITIALIZER(MSA_EXT_9),
+     FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
+     FEAT_GROUP_INITIALIZER(ENH_SORT),
++    FEAT_GROUP_INITIALIZER(DEFLATE_CONVERSION),
+ };
+ 
+ static void set_bits(uint64_t list[], BitSpec bits)
+diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
+index 360b04db7698..4e425a9fd3a5 100644
+--- a/target/s390x/kvm.c
++++ b/target/s390x/kvm.c
+@@ -2138,6 +2138,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
+     if (test_bit(S390_FEAT_ESORT_BASE, features)) {
+         s390_add_from_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
+     }
++    if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
++        s390_add_from_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
++    }
+     return 0;
+ }
+ 
+@@ -2188,6 +2191,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
+     if (test_bit(S390_FEAT_ESORT_BASE, features)) {
+         s390_fill_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
+     }
++    if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
++        s390_fill_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
++    }
+     return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
+ }
+ 
+-- 
+2.12.3
+
diff --git a/debian/patches/ubuntu/lp-1836154-07-s390x-cpumodel-add-gen15-defintions.patch b/debian/patches/ubuntu/lp-1836154-07-s390x-cpumodel-add-gen15-defintions.patch
new file mode 100644
index 0000000..db0dc1b
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-07-s390x-cpumodel-add-gen15-defintions.patch
@@ -0,0 +1,119 @@
+From c30eac9c451ac6032f8a76ff1dd4e59e4109fef1 Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 29 Apr 2019 05:02:49 -0400
+Subject: [PATCH 7/9] s390x/cpumodel: add gen15 defintions
+
+add several new features (msa9, sort, deflate, additional vector
+instructions, new general purpose instructions) to generation 15.
+
+Also disable csske and bpb from the default and base models >=15.
+This will allow to migrate gen15 machines to future machines that
+do not have these features.
+
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Message-Id: <[e-mail]>
+Reviewed-by: David Hildenbrand <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+(cherry picked from commit caef62430fed6e732d3e43d76752d165cf02ad67)
+
+Author: Christian Borntraeger <[e-mail]>
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=caef62430fed6e732d3e43d76752d165cf02ad67
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-08-07
+---
+ target/s390x/gen-features.c | 37 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 37 insertions(+)
+
+diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
+index 9ebef0506e5f..f7b598d53ca5 100644
+--- a/target/s390x/gen-features.c
++++ b/target/s390x/gen-features.c
+@@ -15,6 +15,7 @@
+ 
+ #include "inttypes.h"
+ #include "stdio.h"
++#include <string.h>
+ #include "cpu_features_def.h"
+ 
+ #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
+@@ -410,6 +411,10 @@ static uint16_t base_GEN14_GA1[] = {
+     S390_FEAT_ORDER_PRESERVING_COMPRESSION,
+ };
+ 
++static uint16_t base_GEN15_GA1[] = {
++    S390_FEAT_MISC_INSTRUCTION_EXT3,
++};
++
+ /* Full features (in order of release)
+  * Automatically includes corresponding base features.
+  * Full features are all features this hardware supports even if kvm/QEMU do not
+@@ -536,6 +541,16 @@ static uint16_t full_GEN14_GA1[] = {
+     S390_FEAT_SIE_KSS,
+ };
+ 
++static uint16_t full_GEN15_GA1[] = {
++    S390_FEAT_VECTOR_ENH2,
++    S390_FEAT_GROUP_ENH_SORT,
++    S390_FEAT_GROUP_DEFLATE_CONVERSION,
++    S390_FEAT_VECTOR_BCD_ENH,
++    S390_FEAT_GROUP_MSA_EXT_9,
++    S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
++    S390_FEAT_ETOKEN,
++};
++
+ /* Default features (in order of release)
+  * Automatically includes corresponding base features.
+  * Default features are all features this version of QEMU supports for this
+@@ -606,6 +621,16 @@ static uint16_t default_GEN14_GA1[] = {
+     S390_FEAT_GROUP_MSA_EXT_8,
+ };
+ 
++static uint16_t default_GEN15_GA1[] = {
++    S390_FEAT_VECTOR_ENH2,
++    S390_FEAT_GROUP_ENH_SORT,
++    S390_FEAT_GROUP_DEFLATE_CONVERSION,
++    S390_FEAT_VECTOR_BCD_ENH,
++    S390_FEAT_GROUP_MSA_EXT_9,
++    S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
++    S390_FEAT_ETOKEN,
++};
++
+ /****** END FEATURE DEFS ******/
+ 
+ #define _YEARS  "2016"
+@@ -664,6 +689,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {
+     CPU_FEAT_INITIALIZER(GEN13_GA1),
+     CPU_FEAT_INITIALIZER(GEN13_GA2),
+     CPU_FEAT_INITIALIZER(GEN14_GA1),
++    CPU_FEAT_INITIALIZER(GEN15_GA1),
+ };
+ 
+ #define FEAT_GROUP_INITIALIZER(_name)                  \
+@@ -710,6 +736,11 @@ static void set_bits(uint64_t list[], BitSpec bits)
+     }
+ }
+ 
++static inline void clear_bit(uint64_t list[], unsigned long nr)
++{
++    list[nr / 64] &= ~(1ULL << (nr % 64));
++}
++
+ static void print_feature_defs(void)
+ {
+     uint64_t base_feat[S390_FEAT_MAX / 64 + 1] = {};
+@@ -720,6 +751,12 @@ static void print_feature_defs(void)
+     printf("\n/* CPU model feature list data */\n");
+ 
+     for (i = 0; i < ARRAY_SIZE(CpuFeatDef); i++) {
++        /* With gen15 CSSKE and BPB are deprecated */
++        if (strcmp(CpuFeatDef[i].name, "S390_FEAT_LIST_GEN15_GA1") == 0) {
++            clear_bit(base_feat, S390_FEAT_CONDITIONAL_SSKE);
++            clear_bit(default_feat, S390_FEAT_CONDITIONAL_SSKE);
++            clear_bit(default_feat, S390_FEAT_BPB);
++        }
+         set_bits(base_feat, CpuFeatDef[i].base_bits);
+         /* add the base to the default features */
+         set_bits(default_feat, CpuFeatDef[i].base_bits);
+-- 
+2.12.3
+
diff --git a/debian/patches/ubuntu/lp-1836154-08-s390x-cpumodel-wire-up-8561-and-8562-as-gen15-machin.patch b/debian/patches/ubuntu/lp-1836154-08-s390x-cpumodel-wire-up-8561-and-8562-as-gen15-machin.patch
new file mode 100644
index 0000000..e64f5ec
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-08-s390x-cpumodel-wire-up-8561-and-8562-as-gen15-machin.patch
@@ -0,0 +1,53 @@
+From 7ad963d1a299970a49da9372527cd3cc3990a39f Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 29 Apr 2019 05:02:50 -0400
+Subject: [PATCH 8/9] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
+
+8561 and 8562 will be gen15 machines. There is no name yet, let us use
+gen15a and gen15b as base name. Later on we can provide aliases with
+the proper name.
+
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Message-Id: <[e-mail]>
+Reviewed-by: David Hildenbrand <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+(cherry picked from commit c657e84faee48d6ab36665da5a008b8f0649593d)
+
+Author: Christian Borntraeger <[e-mail]>
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=c657e84faee48d6ab36665da5a008b8f0649593d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-08-07
+---
+ target/s390x/cpu_models.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
+index 1e8714afe3a8..6052983051d0 100644
+--- a/target/s390x/cpu_models.c
++++ b/target/s390x/cpu_models.c
+@@ -41,10 +41,9 @@
+     }
+ 
+ /*
+- * CPU definiton list in order of release. For now, base features of a
+- * following release are always a subset of base features of the previous
+- * release. Same is correct for the other feature sets.
+- * A BC release always follows the corresponding EC release.
++ * CPU definition list in order of release. Up to generation 14 base features
++ * of a following release have been a superset of the previous release. With
++ * generation 15 one base feature and one optional feature have been deprecated.
+  */
+ static S390CPUDef s390_cpu_defs[] = {
+     CPUDEF_INIT(0x2064, 7, 1, 38, 0x00000000U, "z900", "IBM zSeries 900 GA1"),
+@@ -80,6 +79,8 @@ static S390CPUDef s390_cpu_defs[] = {
+     CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"),
+     CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
+     CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
++    CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
++    CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
+ };
+ 
+ /* features part of a base model but not relevant for finding a base model */
+-- 
+2.12.3
+
diff --git a/debian/patches/ubuntu/lp-1836154-09-s390-cpumodel-fix-description-for-the-new-vector-fac.patch b/debian/patches/ubuntu/lp-1836154-09-s390-cpumodel-fix-description-for-the-new-vector-fac.patch
new file mode 100644
index 0000000..518d6aa
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-09-s390-cpumodel-fix-description-for-the-new-vector-fac.patch
@@ -0,0 +1,40 @@
+From 9b54810232977c2eb2b32b28c3dde39a1fa82e87 Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 8 Jul 2019 17:09:31 +0200
+Subject: [PATCH 9/9] s390: cpumodel: fix description for the new vector
+ facility
+
+The new facility is called "Vector-Packed-Decimal-Enhancement Facility"
+and not "Vector BCD enhancements facility 1". As the shortname might
+have already found its way into some backports, let's keep vxbeh.
+
+Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements")
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Message-Id: <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+(cherry picked from commit d05be57ddc2e1722f527aa4c20d84dfd15c840ec)
+
+Author: Christian Borntraeger <[e-mail]>
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=d05be57ddc2e1722f527aa4c20d84dfd15c840ec
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-08-07
+---
+ target/s390x/cpu_features.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
+index 98fa3a66dc81..24538fc6091e 100644
+--- a/target/s390x/cpu_features.c
++++ b/target/s390x/cpu_features.c
+@@ -108,7 +108,7 @@ static const S390FeatDef s390_features[] = {
+     FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
+     FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
+     FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
+-    FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
++    FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector-Packed-Decimal-Enhancement Facility"),
+     FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
+     FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
+ 
+-- 
+2.12.3
+
diff --git a/debian/patches/ubuntu/lp-1836154-s390x-cpumodel-also-change-name-of-vxbeh.patch b/debian/patches/ubuntu/lp-1836154-s390x-cpumodel-also-change-name-of-vxbeh.patch
new file mode 100644
index 0000000..2da5273
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-s390x-cpumodel-also-change-name-of-vxbeh.patch
@@ -0,0 +1,41 @@
+From 0d4cb295db7503fbac2f5bb3e878a56630231fed Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 15 Jul 2019 16:23:03 +0200
+Subject: [PATCH] s390x/cpumodel: also change name of vxbeh
+
+David suggested to keep everything in sync as 4.1 is not yet released.
+This patch fixes the name "vxbeh" into "vxpdeh".
+
+To simplify the backports this patch will not change VECTOR_BCD_ENH as
+this is just an internal name. That will be done by an extra patch that
+does not need to be backported.
+
+Suggested-by: David Hildenbrand <[e-mail]>
+Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility")
+Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements")
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Message-Id: <[e-mail]>
+[CH: vxp->vxpdeh, as discussed]
+Reviewed-by: David Hildenbrand <[e-mail]>
+Reviewed-by: Thomas Huth <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+
+Origin: backport, https://git.qemu.org/?p=qemu.git;a=commit;h=0d4cb295db75
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-07-17
+
+---
+ target/s390x/cpu_features_def.inc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/target/s390x/cpu_features.c
++++ b/target/s390x/cpu_features.c
+@@ -108,7 +108,7 @@ static const S390FeatDef s390_features[]
+     FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
+     FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
+     FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
+-    FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector-Packed-Decimal-Enhancement Facility"),
++    FEAT_INIT("vxpdeh", S390_FEAT_TYPE_STFL, 152, "Vector-Packed-Decimal-Enhancement Facility"),
+     FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
+     FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
+ 
diff --git a/debian/patches/ubuntu/lp-1836154-s390x-cpumodel-remove-esort-from-the-default-model.patch b/debian/patches/ubuntu/lp-1836154-s390x-cpumodel-remove-esort-from-the-default-model.patch
new file mode 100644
index 0000000..74df0f5
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1836154-s390x-cpumodel-remove-esort-from-the-default-model.patch
@@ -0,0 +1,37 @@
+From de6bb08570065eb318849dfd7f316448e51197b5 Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Mon, 15 Jul 2019 16:23:02 +0200
+Subject: [PATCH] s390x/cpumodel: remove esort from the default model
+
+esort might not be available on all models.
+
+Fixes: caef62430fed6e73 ("s390x/cpumodel: add gen15 defintions")
+Signed-off-by: Christian Borntraeger <[e-mail]>
+Message-Id: <[e-mail]>
+Reviewed-by: David Hildenbrand <[e-mail]>
+Reviewed-by: Thomas Huth <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=de6bb0857006
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1836154
+Last-Update: 2019-07-17
+
+---
+ target/s390x/gen-features.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
+index 9f216219ff..6debfc1d21 100644
+--- a/target/s390x/gen-features.c
++++ b/target/s390x/gen-features.c
+@@ -642,7 +642,6 @@ static uint16_t default_GEN14_GA1[] = {
+ 
+ static uint16_t default_GEN15_GA1[] = {
+     S390_FEAT_VECTOR_ENH2,
+-    S390_FEAT_GROUP_ENH_SORT,
+     S390_FEAT_GROUP_DEFLATE_CONVERSION,
+     S390_FEAT_VECTOR_BCD_ENH,
+     S390_FEAT_GROUP_MSA_EXT_9,
+-- 
+2.22.0
+