KVM: s390: new parameter for SIGP STOP irqs

In order to get rid of the action_flags and to properly migrate pending SIGP
STOP irqs triggered e.g. by SIGP STOP AND STORE STATUS, we need to remember
whether to store the status when stopping.

For this reason, a new parameter (flags) for the SIGP STOP irq is introduced.
These flags further define details of the requested STOP and can be easily
migrated.

Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

2 files changed, 19 insertions, 1 deletions

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 9cba74d5d853..5eafe84a7b3d 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -378,6 +378,7 @@ struct kvm_s390_interrupt_info {
                 struct kvm_s390_emerg_info emerg;
                 struct kvm_s390_extcall_info extcall;
                 struct kvm_s390_prefix_info prefix;
+                struct kvm_s390_stop_info stop;
                 struct kvm_s390_mchk_info mchk;
         };
 };
@@ -393,6 +394,7 @@ struct kvm_s390_irq_payload {
         struct kvm_s390_emerg_info emerg;
         struct kvm_s390_extcall_info extcall;
         struct kvm_s390_prefix_info prefix;
+        struct kvm_s390_stop_info stop;
         struct kvm_s390_mchk_info mchk;
 };
 
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 7fbbcbcea6ac..73bafc3d0f41 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -394,13 +394,20 @@ static int __must_check __deliver_restart(struct kvm_vcpu *vcpu)
 
 static int __must_check __deliver_stop(struct kvm_vcpu *vcpu)
 {
+        struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;
+        struct kvm_s390_stop_info *stop = &li->irq.stop;
+
+        spin_lock(&li->lock);
+        stop->flags = 0;
+        clear_bit(IRQ_PEND_SIGP_STOP, &li->pending_irqs);
+        spin_unlock(&li->lock);
+
         VCPU_EVENT(vcpu, 4, "%s", "interrupt: cpu stop");
         vcpu->stat.deliver_stop_signal++;
         trace_kvm_s390_deliver_interrupt(vcpu->vcpu_id, KVM_S390_SIGP_STOP,
                                          0, 0);
 
         __set_cpuflag(vcpu, CPUSTAT_STOP_INT);
-        clear_bit(IRQ_PEND_SIGP_STOP, &vcpu->arch.local_int.pending_irqs);
         return 0;
 }
 
@@ -1031,13 +1038,19 @@ static int __inject_set_prefix(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq)
         return 0;
 }
 
+#define KVM_S390_STOP_SUPP_FLAGS 0
 static int __inject_sigp_stop(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq)
 {
         struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;
+        struct kvm_s390_stop_info *stop = &li->irq.stop;
 
         trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, KVM_S390_SIGP_STOP, 0, 0, 2);
 
+        if (irq->u.stop.flags & ~KVM_S390_STOP_SUPP_FLAGS)
+                return -EINVAL;
+
         li->action_bits |= ACTION_STOP_ON_STOP;
+        stop->flags = irq->u.stop.flags;
         set_bit(IRQ_PEND_SIGP_STOP, &li->pending_irqs);
         return 0;
 }
@@ -1306,6 +1319,9 @@ int s390int_to_s390irq(struct kvm_s390_interrupt *s390int,
         case KVM_S390_SIGP_SET_PREFIX:
                 irq->u.prefix.address = s390int->parm;
                 break;
+        case KVM_S390_SIGP_STOP:
+                irq->u.stop.flags = s390int->parm;
+                break;
         case KVM_S390_INT_EXTERNAL_CALL:
                 if (irq->u.extcall.code & 0xffff0000)
                         return -EINVAL;