2 files changed, 13 insertions, 6 deletions

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 55aade49b6d1..6b049ee75a56 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -271,7 +271,7 @@ static int kvm_s390_mem_control(struct kvm *kvm, struct kvm_device_attr *attr)
         case KVM_S390_VM_MEM_CLR_CMMA:
                 mutex_lock(&kvm->lock);
                 idx = srcu_read_lock(&kvm->srcu);
-                page_table_reset_pgste(kvm->arch.gmap->mm, 0, TASK_SIZE, false);
+                s390_reset_cmma(kvm->arch.gmap->mm);
                 srcu_read_unlock(&kvm->srcu, idx);
                 mutex_unlock(&kvm->lock);
                 ret = 0;
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 72bb2dd8b9cd..f47cb0c6d906 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -156,21 +156,25 @@ static int handle_store_cpu_address(struct kvm_vcpu *vcpu)
         return 0;
 }
 
-static void __skey_check_enable(struct kvm_vcpu *vcpu)
+static int __skey_check_enable(struct kvm_vcpu *vcpu)
 {
+        int rc = 0;
         if (!(vcpu->arch.sie_block->ictl & (ICTL_ISKE | ICTL_SSKE | ICTL_RRBE)))
-                return;
+                return rc;
 
-        s390_enable_skey();
+        rc = s390_enable_skey();
         trace_kvm_s390_skey_related_inst(vcpu);
         vcpu->arch.sie_block->ictl &= ~(ICTL_ISKE | ICTL_SSKE | ICTL_RRBE);
+        return rc;
 }
 
 
 static int handle_skey(struct kvm_vcpu *vcpu)
 {
-        __skey_check_enable(vcpu);
+        int rc = __skey_check_enable(vcpu);
 
+        if (rc)
+                return rc;
         vcpu->stat.instruction_storage_key++;
 
         if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
@@ -683,7 +687,10 @@ static int handle_pfmf(struct kvm_vcpu *vcpu)
                 }
 
                 if (vcpu->run->s.regs.gprs[reg1] & PFMF_SK) {
-                        __skey_check_enable(vcpu);
+                        int rc = __skey_check_enable(vcpu);
+
+                        if (rc)
+                                return rc;
                         if (set_guest_storage_key(current->mm, useraddr,
                                         vcpu->run->s.regs.gprs[reg1] & PFMF_KEY,
                                         vcpu->run->s.regs.gprs[reg1] & PFMF_NQ))