Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24160af6 authored by Michael Mueller's avatar Michael Mueller Committed by Christian Borntraeger
Browse files

KVM: s390: add GISA interrupts to FLIC ioctl interface 



Pending interrupts marked in the GISA IPM are required to
become part of the answer of ioctl KVM_DEV_FLIC_GET_ALL_IRQS.

The ioctl KVM_DEV_FLIC_ENQUEUE is already capable to enqueue
adapter interrupts when a GISA is present.

With ioctl KVM_DEV_FLIC_CLEAR_IRQS the GISA IPM wil be cleared
now as well.

Signed-off-by: default avatarMichael Mueller <mimu@linux.vnet.ibm.com>
Reviewed-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 2496c8e7

arch/s390/kvm/interrupt.c

+18 −0
Original line number Diff line number Diff line
@@ -1879,6 +1879,7 @@ void kvm_s390_clear_float_irqs(struct kvm *kvm) 
	for (i = 0; i < FIRQ_MAX_COUNT; i++)

		fi->counters[i] = 0;

	spin_unlock(&fi->lock);

	kvm_s390_gisa_clear(kvm);

};



static int get_all_floating_irqs(struct kvm *kvm, u8 __user *usrbuf, u64 len)
@@ -1906,6 +1907,22 @@ static int get_all_floating_irqs(struct kvm *kvm, u8 __user *usrbuf, u64 len) 


	max_irqs = len / sizeof(struct kvm_s390_irq);



	if (kvm->arch.gisa &&

	    kvm_s390_gisa_get_ipm(kvm->arch.gisa)) {

		for (i = 0; i <= MAX_ISC; i++) {

			if (n == max_irqs) {

				/* signal userspace to try again */

				ret = -ENOMEM;

				goto out_nolock;

			}

			if (kvm_s390_gisa_tac_ipm_gisc(kvm->arch.gisa, i)) {

				irq = (struct kvm_s390_irq *) &buf[n];

				irq->type = KVM_S390_INT_IO(1, 0, 0, 0);

				irq->u.io.io_int_word = isc_to_int_word(i);

				n++;

			}

		}

	}

	fi = &kvm->arch.float_int;

	spin_lock(&fi->lock);

	for (i = 0; i < FIRQ_LIST_COUNT; i++) {
@@ -1944,6 +1961,7 @@ static int get_all_floating_irqs(struct kvm *kvm, u8 __user *usrbuf, u64 len) 


out:

	spin_unlock(&fi->lock);

out_nolock:

	if (!ret && n > 0) {

		if (copy_to_user(usrbuf, buf, sizeof(struct kvm_s390_irq) * n))

			ret = -EFAULT;