9 files changed, 158 insertions, 3 deletions

diff --git a/arch/s390/include/asm/kvm.h b/arch/s390/include/asm/kvm.h
index 96076676e224..bdcbe0f8dd7b 100644
--- a/arch/s390/include/asm/kvm.h
+++ b/arch/s390/include/asm/kvm.h
@@ -52,4 +52,9 @@ struct kvm_sync_regs {
         __u32 acrs[16]; /* access registers */
         __u64 crs[16];  /* control registers */
 };
+
+#define KVM_REG_S390_TODPR      (KVM_REG_S390 | KVM_REG_SIZE_U32 | 0x1)
+#define KVM_REG_S390_EPOCHDIFF  (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x2)
+#define KVM_REG_S390_CPU_TIMER  (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x3)
+#define KVM_REG_S390_CLOCK_COMP (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x4)
 #endif
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 7343872890a2..dd17537b9a9d 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -148,6 +148,7 @@ struct kvm_vcpu_stat {
         u32 instruction_sigp_restart;
         u32 diagnose_10;
         u32 diagnose_44;
+        u32 diagnose_9c;
 };
 
 struct kvm_s390_io_info {
diff --git a/arch/s390/include/asm/kvm_para.h b/arch/s390/include/asm/kvm_para.h
index 6964db226f83..a98832961035 100644
--- a/arch/s390/include/asm/kvm_para.h
+++ b/arch/s390/include/asm/kvm_para.h
@@ -149,6 +149,11 @@ static inline unsigned int kvm_arch_para_features(void)
         return 0;
 }
 
+static inline bool kvm_check_and_clear_guest_paused(void)
+{
+        return false;
+}
+
 #endif
 
 #endif /* __S390_KVM_PARA_H */
diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index fed7bee650a0..bf238c55740b 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -48,6 +48,7 @@ int sclp_cpu_deconfigure(u8 cpu);
 void sclp_facilities_detect(void);
 unsigned long long sclp_get_rnmax(void);
 unsigned long long sclp_get_rzm(void);
+u8 sclp_get_fac85(void);
 int sclp_sdias_blk_count(void);
 int sclp_sdias_copy(void *dest, int blk_num, int nr_blks);
 int sclp_chp_configure(struct chp_id chpid);
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
index a353f0ea45c2..b23d9ac77dfc 100644
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
@@ -47,9 +47,30 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu)
 {
         VCPU_EVENT(vcpu, 5, "%s", "diag time slice end");
         vcpu->stat.diagnose_44++;
-        vcpu_put(vcpu);
-        yield();
-        vcpu_load(vcpu);
+        kvm_vcpu_on_spin(vcpu);
+        return 0;
+}
+
+static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu)
+{
+        struct kvm *kvm = vcpu->kvm;
+        struct kvm_vcpu *tcpu;
+        int tid;
+        int i;
+
+        tid = vcpu->run->s.regs.gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4];
+        vcpu->stat.diagnose_9c++;
+        VCPU_EVENT(vcpu, 5, "diag time slice end directed to %d", tid);
+
+        if (tid == vcpu->vcpu_id)
+                return 0;
+
+        kvm_for_each_vcpu(i, tcpu, kvm)
+                if (tcpu->vcpu_id == tid) {
+                        kvm_vcpu_yield_to(tcpu);
+                        break;
+                }
+
         return 0;
 }
 
@@ -89,6 +110,8 @@ int kvm_s390_handle_diag(struct kvm_vcpu *vcpu)
                 return diag_release_pages(vcpu);
         case 0x44:
                 return __diag_time_slice_end(vcpu);
+        case 0x9c:
+                return __diag_time_slice_end_directed(vcpu);
         case 0x308:
                 return __diag_ipl_functions(vcpu);
         default:
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 361456577c6f..979cbe55bf5e 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -101,6 +101,7 @@ static int handle_lctl(struct kvm_vcpu *vcpu)
 }
 
 static intercept_handler_t instruction_handlers[256] = {
+        [0x01] = kvm_s390_handle_01,
         [0x83] = kvm_s390_handle_diag,
         [0xae] = kvm_s390_handle_sigp,
         [0xb2] = kvm_s390_handle_b2,
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 217ce44395a4..664766d0c83c 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -28,6 +28,7 @@
 #include <asm/pgtable.h>
 #include <asm/nmi.h>
 #include <asm/switch_to.h>
+#include <asm/sclp.h>
 #include "kvm-s390.h"
 #include "gaccess.h"
 
@@ -74,6 +75,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
         { "instruction_sigp_restart", VCPU_STAT(instruction_sigp_restart) },
         { "diagnose_10", VCPU_STAT(diagnose_10) },
         { "diagnose_44", VCPU_STAT(diagnose_44) },
+        { "diagnose_9c", VCPU_STAT(diagnose_9c) },
         { NULL }
 };
 
@@ -133,8 +135,16 @@ int kvm_dev_ioctl_check_extension(long ext)
         case KVM_CAP_S390_UCONTROL:
 #endif
         case KVM_CAP_SYNC_REGS:
+        case KVM_CAP_ONE_REG:
                 r = 1;
                 break;
+        case KVM_CAP_NR_VCPUS:
+        case KVM_CAP_MAX_VCPUS:
+                r = KVM_MAX_VCPUS;
+                break;
+        case KVM_CAP_S390_COW:
+                r = sclp_get_fac85() & 0x2;
+                break;
         default:
                 r = 0;
         }
@@ -423,6 +433,71 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
         return 0;
 }
 
+int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)
+{
+        /* kvm common code refers to this, but never calls it */
+        BUG();
+        return 0;
+}
+
+static int kvm_arch_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu,
+                                           struct kvm_one_reg *reg)
+{
+        int r = -EINVAL;
+
+        switch (reg->id) {
+        case KVM_REG_S390_TODPR:
+                r = put_user(vcpu->arch.sie_block->todpr,
+                             (u32 __user *)reg->addr);
+                break;
+        case KVM_REG_S390_EPOCHDIFF:
+                r = put_user(vcpu->arch.sie_block->epoch,
+                             (u64 __user *)reg->addr);
+                break;
+        case KVM_REG_S390_CPU_TIMER:
+                r = put_user(vcpu->arch.sie_block->cputm,
+                             (u64 __user *)reg->addr);
+                break;
+        case KVM_REG_S390_CLOCK_COMP:
+                r = put_user(vcpu->arch.sie_block->ckc,
+                             (u64 __user *)reg->addr);
+                break;
+        default:
+                break;
+        }
+
+        return r;
+}
+
+static int kvm_arch_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu,
+                                           struct kvm_one_reg *reg)
+{
+        int r = -EINVAL;
+
+        switch (reg->id) {
+        case KVM_REG_S390_TODPR:
+                r = get_user(vcpu->arch.sie_block->todpr,
+                             (u32 __user *)reg->addr);
+                break;
+        case KVM_REG_S390_EPOCHDIFF:
+                r = get_user(vcpu->arch.sie_block->epoch,
+                             (u64 __user *)reg->addr);
+                break;
+        case KVM_REG_S390_CPU_TIMER:
+                r = get_user(vcpu->arch.sie_block->cputm,
+                             (u64 __user *)reg->addr);
+                break;
+        case KVM_REG_S390_CLOCK_COMP:
+                r = get_user(vcpu->arch.sie_block->ckc,
+                             (u64 __user *)reg->addr);
+                break;
+        default:
+                break;
+        }
+
+        return r;
+}
+
 static int kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu)
 {
         kvm_s390_vcpu_initial_reset(vcpu);
@@ -753,6 +828,18 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
         case KVM_S390_INITIAL_RESET:
                 r = kvm_arch_vcpu_ioctl_initial_reset(vcpu);
                 break;
+        case KVM_SET_ONE_REG:
+        case KVM_GET_ONE_REG: {
+                struct kvm_one_reg reg;
+                r = -EFAULT;
+                if (copy_from_user(&reg, argp, sizeof(reg)))
+                        break;
+                if (ioctl == KVM_SET_ONE_REG)
+                        r = kvm_arch_vcpu_ioctl_set_one_reg(vcpu, &reg);
+                else
+                        r = kvm_arch_vcpu_ioctl_get_one_reg(vcpu, &reg);
+                break;
+        }
 #ifdef CONFIG_KVM_S390_UCONTROL
         case KVM_S390_UCAS_MAP: {
                 struct kvm_s390_ucas_mapping ucasmap;
diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h
index ff28f9d1c9eb..2294377975e8 100644
--- a/arch/s390/kvm/kvm-s390.h
+++ b/arch/s390/kvm/kvm-s390.h
@@ -79,6 +79,7 @@ int kvm_s390_inject_sigp_stop(struct kvm_vcpu *vcpu, int action);
 /* implemented in priv.c */
 int kvm_s390_handle_b2(struct kvm_vcpu *vcpu);
 int kvm_s390_handle_e5(struct kvm_vcpu *vcpu);
+int kvm_s390_handle_01(struct kvm_vcpu *vcpu);
 
 /* implemented in sigp.c */
 int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu);
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index e5a45dbd26ac..68a6b2ed16bf 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -380,3 +380,34 @@ int kvm_s390_handle_e5(struct kvm_vcpu *vcpu)
         return -EOPNOTSUPP;
 }
 
+static int handle_sckpf(struct kvm_vcpu *vcpu)
+{
+        u32 value;
+
+        if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
+                return kvm_s390_inject_program_int(vcpu,
+                                                   PGM_PRIVILEGED_OPERATION);
+
+        if (vcpu->run->s.regs.gprs[0] & 0x00000000ffff0000)
+                return kvm_s390_inject_program_int(vcpu,
+                                                   PGM_SPECIFICATION);
+
+        value = vcpu->run->s.regs.gprs[0] & 0x000000000000ffff;
+        vcpu->arch.sie_block->todpr = value;
+
+        return 0;
+}
+
+static intercept_handler_t x01_handlers[256] = {
+        [0x07] = handle_sckpf,
+};
+
+int kvm_s390_handle_01(struct kvm_vcpu *vcpu)
+{
+        intercept_handler_t handler;
+
+        handler = x01_handlers[vcpu->arch.sie_block->ipa & 0x00ff];
+        if (handler)
+                return handler(vcpu);
+        return -EOPNOTSUPP;
+}