KVM: s390: clear floating interrupt bitmap and parameters

commit f2ae45edbca7ba5324eef01719ede0151dc5cead upstream.

commit 6d3da24141 ("KVM: s390: deliver floating interrupts in order
of priority") introduced a regression for the reset handling.

We don't clear the bitmap of pending floating interrupts
and interrupt parameters. This could result in stale interrupts
even after a reset. Let's fix this by clearing the pending bitmap
and the parameters for service and machine check interrupts.

Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 2836b25f63d3..b745a109bfc1 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -1606,6 +1606,9 @@ void kvm_s390_clear_float_irqs(struct kvm *kvm)
         int i;
 
         spin_lock(&fi->lock);
+        fi->pending_irqs = 0;
+        memset(&fi->srv_signal, 0, sizeof(fi->srv_signal));
+        memset(&fi->mchk, 0, sizeof(fi->mchk));
         for (i = 0; i < FIRQ_LIST_COUNT; i++)
                 clear_irq_list(&fi->lists[i]);
         for (i = 0; i < FIRQ_MAX_COUNT; i++)