KVM: s390: vsie: allow guest FORMAT-0 CRYCB on host FORMAT-2

When the guest schedules a SIE with a FORMAT-0 CRYCB,
we are able to schedule it in the host with a FORMAT-2
CRYCB if the host uses FORMAT-2

Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
Message-Id: <20180925231641.4954-24-akrowiak@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index ca6466304731e9201a82ce6684be58ec0aa8181f..9117891651c662711a95090c71e52390583cdd33 100644 (file)
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -246,7 +246,9 @@ static int setup_apcb(struct kvm_vcpu *vcpu, struct kvm_s390_crypto_cb *crycb_s,
 
                switch (fmt_h) {
                case CRYCB_FORMAT2:
-                       return -EINVAL;
+                       return setup_apcb10(vcpu, &crycb_s->apcb1,
+                                           (unsigned long) &crycb->apcb0,
+                                           &crycb_h->apcb1);
                case CRYCB_FORMAT1:
                case CRYCB_FORMAT0:
                        return setup_apcb00(vcpu,