From: Pierre Morel <pmorel@linux.ibm.com>
To: Cornelia Huck <cohuck@redhat.com>
Cc: borntraeger@de.ibm.com, alex.williamson@redhat.com,
linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org,
kvm@vger.kernel.org, frankja@linux.ibm.com,
akrowiak@linux.ibm.com, pasic@linux.ibm.com, david@redhat.com,
schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
freude@linux.ibm.com, mimu@linux.ibm.com
Subject: Re: [PATCH v2 3/3] vfio: ap: AP Queue Interrupt Control VFIO ioctl calls
Date: Mon, 3 Dec 2018 11:20:33 +0100 [thread overview]
Message-ID: <0119edfa-2feb-03f6-e082-e3773f4e42e2@linux.ibm.com> (raw)
In-Reply-To: <20181203110422.4d069a8c.cohuck@redhat.com>
On 03/12/2018 11:04, Cornelia Huck wrote:
> On Thu, 22 Nov 2018 18:11:15 +0100
> Pierre Morel <pmorel@linux.ibm.com> wrote:
>
>> This is the implementation of the VFIO ioctl calls to handle
>> the AQIC interception and use GISA to handle interrupts.
>>
>> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
>> ---
>> drivers/s390/crypto/vfio_ap_ops.c | 110 +++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 109 insertions(+), 1 deletion(-)
>>
>
>> +static int vfio_ap_ioctl_setirq(struct mdev_device *mdev, unsigned long arg)
>> +{
>> + struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev);
>> + struct vfio_ap_aqic parm;
>> + struct ap_qirq_ctrl aqic_gisa = {};
>> + struct kvm *kvm = matrix_mdev->kvm;
>> + struct kvm_s390_gisa *gisa = kvm->arch.gisa;
>> + struct ap_queue_status ap_status;
>> + unsigned long nib;
>> +
>> + if (copy_from_user(&parm, (void __user *)arg, sizeof(parm)))
>> + return -EFAULT;
>> +
>> + if (parm.isc > MAX_ISC)
>> + return -EINVAL;
>> +
>> + if (kvm->vcpus[0]->arch.sie_block->gd & 0x01)
>> + aqic_gisa.gf = 1;
>> +
>> + nib = vfio_ap_get_nib(kvm, &parm);
>> + if (!nib)
>> + return -ENODEV;
>> +
>> + aqic_gisa.gisc = parm.isc;
>> + aqic_gisa.isc = kvm_s390_gisc_register(kvm, parm.isc);
>
> Oh, and as I just looked at the callers of these functions: You'll want
> to check the return code here, even though the function should not fail
> with the checking you did beforehand.
>
I should check.
> [I assume you'll have similar code even when using a different
> interface.]
Yes.
>
>> + aqic_gisa.ir = 1;
>> + aqic_gisa.gisa = gisa->next_alert >> 4;
>> +
>> + ap_status = ap_aqic(parm.apqn, aqic_gisa, (void *)nib);
>> + parm.status = *(uint32_t *)(&ap_status);
>> +
>> + if (copy_to_user((void __user *)arg, &parm, sizeof(parm))) {
>> + kvm_s390_gisc_unregister(kvm, parm.isc);
>> + return -EFAULT;
>> + }
>> +
>> + if (ap_status.response_code) {
>> + kvm_s390_gisc_unregister(kvm, parm.isc);
>> + return -EIO;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int vfio_ap_ioctl_clrirq(struct mdev_device *mdev, unsigned long arg)
>> +{
>> + struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev);
>> + struct vfio_ap_aqic parm;
>> + struct ap_qirq_ctrl aqic_gisa = {};
>> + struct ap_queue_status ap_status;
>> + struct kvm *kvm = matrix_mdev->kvm;
>> +
>> + if (copy_from_user(&parm, (void __user *)arg, sizeof(parm)))
>> + return -EFAULT;
>> +
>> + if (kvm->vcpus[0]->arch.sie_block->gd & 0x01)
>> + aqic_gisa.gf = 1;
>> + aqic_gisa.ir = 0;
>> +
>> + ap_status = ap_aqic(parm.apqn, aqic_gisa, NULL);
>> + parm.status = *(uint32_t *)(&ap_status);
>> +
>> + kvm_s390_gisc_unregister(kvm, parm.isc);
>
> Here, you don't seem to verify the sanity of parm.isc beforehand...
> luckily the function can deal with that :)
You are right.
Anyway I will change this, because this relies on user's code which is
not right.
>
>> +
>> + if (copy_to_user((void __user *)arg, &parm, sizeof(parm)))
>> + return -EFAULT;
>> +
>> + return (ap_status.response_code) ? -EIO : 0;
>> +}
>> +
>
--
Pierre Morel
Linux/KVM/QEMU in Böblingen - Germany
prev parent reply other threads:[~2018-12-03 10:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-22 17:11 [PATCH v2 0/3] s390: vfio: ap: Using GISA for AP Interrupt Pierre Morel
2018-11-22 17:11 ` [PATCH v2 1/3] vfio: ap: Add AP Queue Interruption Control facility Pierre Morel
2018-11-22 17:11 ` [PATCH v2 2/3] vfio: ap: ioctl definitions for AP Queue Interrupt Control Pierre Morel
2018-11-27 17:22 ` Alex Williamson
2018-11-27 17:46 ` Pierre Morel
2018-11-22 17:11 ` [PATCH v2 3/3] vfio: ap: AP Queue Interrupt Control VFIO ioctl calls Pierre Morel
2018-11-29 11:37 ` Cornelia Huck
2018-11-29 12:44 ` Pierre Morel
2018-12-03 10:04 ` Cornelia Huck
2018-12-03 10:20 ` Pierre Morel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0119edfa-2feb-03f6-e082-e3773f4e42e2@linux.ibm.com \
--to=pmorel@linux.ibm.com \
--cc=akrowiak@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=freude@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mimu@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).