1 files changed, 49 insertions, 30 deletions

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 07ced89740d7..49292869a5cd 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/timer.h>
+#include <asm/asm-offsets.h>
 #include <asm/lowcore.h>
 #include <asm/pgtable.h>
 #include <asm/nmi.h>
@@ -74,9 +75,10 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
 static unsigned long long *facilities;
 
 /* Section: not file related */
-void kvm_arch_hardware_enable(void *garbage)
+int kvm_arch_hardware_enable(void *garbage)
 {
         /* every s390 is virtualization enabled ;-) */
+        return 0;
 }
 
 void kvm_arch_hardware_disable(void *garbage)
@@ -116,10 +118,16 @@ long kvm_arch_dev_ioctl(struct file *filp,
 
 int kvm_dev_ioctl_check_extension(long ext)
 {
+        int r;
+
         switch (ext) {
+        case KVM_CAP_S390_PSW:
+                r = 1;
+                break;
         default:
-                return 0;
+                r = 0;
         }
+        return r;
 }
 
 /* Section: vm related */
@@ -150,7 +158,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
                 break;
         }
         default:
-                r = -EINVAL;
+                r = -ENOTTY;
         }
 
         return r;
@@ -234,6 +242,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
         kvm_free_physmem(kvm);
         free_page((unsigned long)(kvm->arch.sca));
         debug_unregister(kvm->arch.dbf);
+        cleanup_srcu_struct(&kvm->srcu);
         kfree(kvm);
 }
 
@@ -419,8 +428,10 @@ static int kvm_arch_vcpu_ioctl_set_initial_psw(struct kvm_vcpu *vcpu, psw_t psw)
         vcpu_load(vcpu);
         if (atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_RUNNING)
                 rc = -EBUSY;
-        else
-                vcpu->arch.sie_block->gpsw = psw;
+        else {
+                vcpu->run->psw_mask = psw.mask;
+                vcpu->run->psw_addr = psw.addr;
+        }
         vcpu_put(vcpu);
         return rc;
 }
@@ -508,9 +519,6 @@ rerun_vcpu:
 
         switch (kvm_run->exit_reason) {
         case KVM_EXIT_S390_SIEIC:
-                vcpu->arch.sie_block->gpsw.mask = kvm_run->s390_sieic.mask;
-                vcpu->arch.sie_block->gpsw.addr = kvm_run->s390_sieic.addr;
-                break;
         case KVM_EXIT_UNKNOWN:
         case KVM_EXIT_INTR:
         case KVM_EXIT_S390_RESET:
@@ -519,6 +527,9 @@ rerun_vcpu:
                 BUG();
         }
 
+        vcpu->arch.sie_block->gpsw.mask = kvm_run->psw_mask;
+        vcpu->arch.sie_block->gpsw.addr = kvm_run->psw_addr;
+
         might_fault();
 
         do {
@@ -534,12 +545,10 @@ rerun_vcpu:
                 rc = -EINTR;
         }
 
-        if (rc == -ENOTSUPP) {
+        if (rc == -EOPNOTSUPP) {
                 /* intercept cannot be handled in-kernel, prepare kvm-run */
                 kvm_run->exit_reason         = KVM_EXIT_S390_SIEIC;
                 kvm_run->s390_sieic.icptcode = vcpu->arch.sie_block->icptcode;
-                kvm_run->s390_sieic.mask     = vcpu->arch.sie_block->gpsw.mask;
-                kvm_run->s390_sieic.addr     = vcpu->arch.sie_block->gpsw.addr;
                 kvm_run->s390_sieic.ipa      = vcpu->arch.sie_block->ipa;
                 kvm_run->s390_sieic.ipb      = vcpu->arch.sie_block->ipb;
                 rc = 0;
@@ -551,6 +560,9 @@ rerun_vcpu:
                 rc = 0;
         }
 
+        kvm_run->psw_mask     = vcpu->arch.sie_block->gpsw.mask;
+        kvm_run->psw_addr     = vcpu->arch.sie_block->gpsw.addr;
+
         if (vcpu->sigset_active)
                 sigprocmask(SIG_SETMASK, &sigsaved, NULL);
 
@@ -593,45 +605,45 @@ int __kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
         } else
                 prefix = 0;
 
-        if (__guestcopy(vcpu, addr + offsetof(struct save_area_s390x, fp_regs),
+        if (__guestcopy(vcpu, addr + offsetof(struct save_area, fp_regs),
                         vcpu->arch.guest_fpregs.fprs, 128, prefix))
                 return -EFAULT;
 
-        if (__guestcopy(vcpu, addr + offsetof(struct save_area_s390x, gp_regs),
+        if (__guestcopy(vcpu, addr + offsetof(struct save_area, gp_regs),
                         vcpu->arch.guest_gprs, 128, prefix))
                 return -EFAULT;
 
-        if (__guestcopy(vcpu, addr + offsetof(struct save_area_s390x, psw),
+        if (__guestcopy(vcpu, addr + offsetof(struct save_area, psw),
                         &vcpu->arch.sie_block->gpsw, 16, prefix))
                 return -EFAULT;
 
-        if (__guestcopy(vcpu, addr + offsetof(struct save_area_s390x, pref_reg),
+        if (__guestcopy(vcpu, addr + offsetof(struct save_area, pref_reg),
                         &vcpu->arch.sie_block->prefix, 4, prefix))
                 return -EFAULT;
 
         if (__guestcopy(vcpu,
-                        addr + offsetof(struct save_area_s390x, fp_ctrl_reg),
+                        addr + offsetof(struct save_area, fp_ctrl_reg),
                         &vcpu->arch.guest_fpregs.fpc, 4, prefix))
                 return -EFAULT;
 
-        if (__guestcopy(vcpu, addr + offsetof(struct save_area_s390x, tod_reg),
+        if (__guestcopy(vcpu, addr + offsetof(struct save_area, tod_reg),
                         &vcpu->arch.sie_block->todpr, 4, prefix))
                 return -EFAULT;
 
-        if (__guestcopy(vcpu, addr + offsetof(struct save_area_s390x, timer),
+        if (__guestcopy(vcpu, addr + offsetof(struct save_area, timer),
                         &vcpu->arch.sie_block->cputm, 8, prefix))
                 return -EFAULT;
 
-        if (__guestcopy(vcpu, addr + offsetof(struct save_area_s390x, clk_cmp),
+        if (__guestcopy(vcpu, addr + offsetof(struct save_area, clk_cmp),
                         &vcpu->arch.sie_block->ckc, 8, prefix))
                 return -EFAULT;
 
-        if (__guestcopy(vcpu, addr + offsetof(struct save_area_s390x, acc_regs),
+        if (__guestcopy(vcpu, addr + offsetof(struct save_area, acc_regs),
                         &vcpu->arch.guest_acrs, 64, prefix))
                 return -EFAULT;
 
         if (__guestcopy(vcpu,
-                        addr + offsetof(struct save_area_s390x, ctrl_regs),
+                        addr + offsetof(struct save_area, ctrl_regs),
                         &vcpu->arch.sie_block->gcr, 128, prefix))
                 return -EFAULT;
         return 0;
@@ -679,14 +691,12 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 }
 
 /* Section: memory related */
-int kvm_arch_set_memory_region(struct kvm *kvm,
-                                struct kvm_userspace_memory_region *mem,
-                                struct kvm_memory_slot old,
-                                int user_alloc)
+int kvm_arch_prepare_memory_region(struct kvm *kvm,
+                                   struct kvm_memory_slot *memslot,
+                                   struct kvm_memory_slot old,
+                                   struct kvm_userspace_memory_region *mem,
+                                   int user_alloc)
 {
-        int i;
-        struct kvm_vcpu *vcpu;
-
         /* A few sanity checks. We can have exactly one memory slot which has
            to start at guest virtual zero and which has to be located at a
            page boundary in userland and which has to end at a page boundary.
@@ -709,14 +719,23 @@ int kvm_arch_set_memory_region(struct kvm *kvm,
         if (!user_alloc)
                 return -EINVAL;
 
+        return 0;
+}
+
+void kvm_arch_commit_memory_region(struct kvm *kvm,
+                                struct kvm_userspace_memory_region *mem,
+                                struct kvm_memory_slot old,
+                                int user_alloc)
+{
+        int i;
+        struct kvm_vcpu *vcpu;
+
         /* request update of sie control block for all available vcpus */
         kvm_for_each_vcpu(i, vcpu, kvm) {
                 if (test_and_set_bit(KVM_REQ_MMU_RELOAD, &vcpu->requests))
                         continue;
                 kvm_s390_inject_sigp_stop(vcpu, ACTION_RELOADVCPU_ON_STOP);
         }
-
-        return 0;
 }
 
 void kvm_arch_flush_shadow(struct kvm *kvm)