KVM: s390: interrupt subsystem, cpu timer, waitpsw

This patch contains the s390 interrupt subsystem (similar to in kernel apic)
including timer interrupts (similar to in-kernel-pit) and enabled wait
(similar to in kernel hlt).

In order to achieve that, this patch also introduces intercept handling
for instruction intercepts, and it implements load control instructions.

This patch introduces an ioctl KVM_S390_INTERRUPT which is valid for both
the vm file descriptors and the vcpu file descriptors. In case this ioctl is
issued against a vm file descriptor, the interrupt is considered floating.
Floating interrupts may be delivered to any virtual cpu in the configuration.

The following interrupts are supported:
SIGP STOP       - interprocessor signal that stops a remote cpu
SIGP SET PREFIX - interprocessor signal that sets the prefix register of a
                  (stopped) remote cpu
INT EMERGENCY   - interprocessor interrupt, usually used to signal need_reshed
                  and for smp_call_function() in the guest.
PROGRAM INT     - exception during program execution such as page fault, illegal
                  instruction and friends
RESTART         - interprocessor signal that starts a stopped cpu
INT VIRTIO      - floating interrupt for virtio signalisation
INT SERVICE     - floating interrupt for signalisations from the system
                  service processor

struct kvm_s390_interrupt, which is submitted as ioctl parameter when injecting
an interrupt, also carrys parameter data for interrupts along with the interrupt
type. Interrupts on s390 usually have a state that represents the current
operation, or identifies which device has caused the interruption on s390.

kvm_s390_handle_wait() does handle waitpsw in two flavors: in case of a
disabled wait (that is, disabled for interrupts), we exit to userspace. In case
of an enabled wait we set up a timer that equals the cpu clock comparator value
and sleep on a wait queue.

[christian: change virtio interrupt to 0x2603]

Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

1 files changed, 46 insertions, 2 deletions

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index a906499214bb..5e3473c9a639 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -20,6 +20,7 @@
 #include <linux/kvm_host.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/timer.h>
 #include <asm/lowcore.h>
 #include <asm/pgtable.h>
 
@@ -34,6 +35,19 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
         { "exit_stop_request", VCPU_STAT(exit_stop_request) },
         { "exit_external_request", VCPU_STAT(exit_external_request) },
         { "exit_external_interrupt", VCPU_STAT(exit_external_interrupt) },
+        { "exit_instruction", VCPU_STAT(exit_instruction) },
+        { "exit_program_interruption", VCPU_STAT(exit_program_interruption) },
+        { "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) },
+        { "instruction_lctg", VCPU_STAT(instruction_lctg) },
+        { "instruction_lctl", VCPU_STAT(instruction_lctl) },
+        { "deliver_emergency_signal", VCPU_STAT(deliver_emergency_signal) },
+        { "deliver_service_signal", VCPU_STAT(deliver_service_signal) },
+        { "deliver_virtio_interrupt", VCPU_STAT(deliver_virtio_interrupt) },
+        { "deliver_stop_signal", VCPU_STAT(deliver_stop_signal) },
+        { "deliver_prefix_signal", VCPU_STAT(deliver_prefix_signal) },
+        { "deliver_restart_signal", VCPU_STAT(deliver_restart_signal) },
+        { "deliver_program_interruption", VCPU_STAT(deliver_program_int) },
+        { "exit_wait_state", VCPU_STAT(exit_wait_state) },
         { NULL }
 };
 
@@ -106,6 +120,15 @@ long kvm_arch_vm_ioctl(struct file *filp,
         int r;
 
         switch (ioctl) {
+        case KVM_S390_INTERRUPT: {
+                struct kvm_s390_interrupt s390int;
+
+                r = -EFAULT;
+                if (copy_from_user(&s390int, argp, sizeof(s390int)))
+                        break;
+                r = kvm_s390_inject_vm(kvm, &s390int);
+                break;
+        }
         default:
                 r = -EINVAL;
         }
@@ -138,6 +161,9 @@ struct kvm *kvm_arch_create_vm(void)
         if (!kvm->arch.dbf)
                 goto out_nodbf;
 
+        spin_lock_init(&kvm->arch.float_int.lock);
+        INIT_LIST_HEAD(&kvm->arch.float_int.list);
+
         debug_register_view(kvm->arch.dbf, &debug_sprintf_view);
         VM_EVENT(kvm, 3, "%s", "vm created");
 
@@ -218,7 +244,8 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
         vcpu->arch.sie_block->gmsor = 0x000000000000;
         vcpu->arch.sie_block->ecb   = 2;
         vcpu->arch.sie_block->eca   = 0xC1002001U;
-
+        setup_timer(&vcpu->arch.ckc_timer, kvm_s390_idle_wakeup,
+                 (unsigned long) vcpu);
         return 0;
 }
 
@@ -243,6 +270,14 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
         vcpu->arch.sie_block->scaoh = (__u32)(((__u64)kvm->arch.sca) >> 32);
         vcpu->arch.sie_block->scaol = (__u32)(__u64)kvm->arch.sca;
 
+        spin_lock_init(&vcpu->arch.local_int.lock);
+        INIT_LIST_HEAD(&vcpu->arch.local_int.list);
+        vcpu->arch.local_int.float_int = &kvm->arch.float_int;
+        spin_lock_bh(&kvm->arch.float_int.lock);
+        kvm->arch.float_int.local_int[id] = &vcpu->arch.local_int;
+        init_waitqueue_head(&vcpu->arch.local_int.wq);
+        spin_unlock_bh(&kvm->arch.float_int.lock);
+
         rc = kvm_vcpu_init(vcpu, kvm, id);
         if (rc)
                 goto out_free_cpu;
@@ -395,6 +430,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 
         atomic_set_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
 
+        BUG_ON(vcpu->kvm->arch.float_int.local_int[vcpu->vcpu_id] == NULL);
+
         switch (kvm_run->exit_reason) {
         case KVM_EXIT_S390_SIEIC:
                 vcpu->arch.sie_block->gpsw.mask = kvm_run->s390_sieic.mask;
@@ -410,8 +447,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         might_sleep();
 
         do {
+                kvm_s390_deliver_pending_interrupts(vcpu);
                 __vcpu_run(vcpu);
-
                 rc = kvm_handle_sie_intercept(vcpu);
         } while (!signal_pending(current) && !rc);
 
@@ -538,6 +575,13 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
         void __user *argp = (void __user *)arg;
 
         switch (ioctl) {
+        case KVM_S390_INTERRUPT: {
+                struct kvm_s390_interrupt s390int;
+
+                if (copy_from_user(&s390int, argp, sizeof(s390int)))
+                        return -EFAULT;
+                return kvm_s390_inject_vcpu(vcpu, &s390int);
+        }
         case KVM_S390_STORE_STATUS:
                 return kvm_s390_vcpu_store_status(vcpu, arg);
         case KVM_S390_SET_INITIAL_PSW: {