From: Pierre Morel <pmorel@linux.ibm.com>
To: Tony Krowiak <akrowiak@linux.ibm.com>, borntraeger@de.ibm.com
Cc: alex.williamson@redhat.com, cohuck@redhat.com,
linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org,
kvm@vger.kernel.org, frankja@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 v1 6/7] vfio: ap: register guest ISC with GISA and GIB
Date: Wed, 7 Nov 2018 23:40:42 +0100 [thread overview]
Message-ID: <5a1f9900-e90a-541d-7801-e7fcfd9f48a3@linux.ibm.com> (raw)
In-Reply-To: <382fe325-e12d-8be8-7f30-c3c64bd37505@linux.ibm.com>
On 06/11/2018 21:21, Tony Krowiak wrote:
> On 10/31/18 2:12 PM, Pierre Morel wrote:
>> Register to the GIB Alert list and retrieve the GAL_ISC
>> to pass to the GISA registration.
>>
>> Unregister on error and when clearing the interrupt.
>>
>> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
>> Signed-off-by: Michael Mueller <mimu@linux.ibm.com>
>> ---
>> drivers/s390/crypto/vfio_ap_ops.c | 16 +++++++++++++---
>> 1 file changed, 13 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/s390/crypto/vfio_ap_ops.c
>> b/drivers/s390/crypto/vfio_ap_ops.c
>> index f68102163bf4..232168797fb8 100644
>> --- a/drivers/s390/crypto/vfio_ap_ops.c
>> +++ b/drivers/s390/crypto/vfio_ap_ops.c
>> @@ -903,16 +903,20 @@ static int ap_ioctl_setirq(struct ap_matrix_mdev
>> *matrix_mdev,
>> struct ap_status ap_status = reg2status(0);
>> unsigned long p;
>> int ret = -1;
>> - int apqn;
>> + int apqn, gal_isc;
>> uint32_t gd;
>> + gal_isc = kvm_s390_gisc_register(matrix_mdev->kvm,
>> matrix_mdev->gisc);
>> + if (gal_isc < 0)
>> + return -EIO;
>> +
>> apqn = (int)(parm->cmd & 0xffff);
>> gd = matrix_mdev->kvm->vcpus[0]->arch.sie_block->gd;
>> if (gd & 0x01)
>> aqic_gisa.f = 1;
>> aqic_gisa.gisc = matrix_mdev->gisc;
>> - aqic_gisa.isc = GAL_ISC;
>> + aqic_gisa.isc = gal_isc;
>> aqic_gisa.ir = 1;
>> aqic_gisa.gisao = gisa->next_alert >> 4;
>> @@ -923,7 +927,11 @@ static int ap_ioctl_setirq(struct ap_matrix_mdev
>> *matrix_mdev,
>> parm->status = ret;
>> ap_status = reg2status(ret);
>> - return (ap_status.rc) ? -EIO : 0;
>> + if (ap_status.rc) {
>> + kvm_s390_gisc_unregister(matrix_mdev->kvm, matrix_mdev->gisc);
>> + return -EIO;
>> + }
>> + return 0;
>> }
>> static int ap_ioctl_clrirq(struct ap_matrix_mdev *matrix_mdev,
>> @@ -946,6 +954,8 @@ static int ap_ioctl_clrirq(struct ap_matrix_mdev
>> *matrix_mdev,
>> parm->status = retval;
>> ap_status = reg2status(retval);
>> + /* unregister the IAM from the GIB anyway! */
>> + kvm_s390_gisc_unregister(matrix_mdev->kvm, matrix_mdev->gisc);
>
> The case statement in patch 4 does not set mdev->gisc, so the
> presumption here is that VFIO_AP_SET_IRQ has been previously called and
> has set the value for matrix_mdev->gisc. Is it possible for
> VFIO_AP_CLEAR_IRQ to get invoked without a prior call to
right, I will check this.
However if the IRQ is not registered there is no problem as we will get
an error when unregistering the IRQ
and unregistering the gisc 0 which was not registered will fail too.
But I think we better check before in case these functions change.
> VFIO_AP_SET_IRQ? In any case, shouldn't the GISC value be taken from
> bits 61-63 of 'parm'?
No this is not possible, the ISC field is not relevant when clearing
interrupts.
>
>> return (ap_status.rc) ? -EIO : 0;
>> }
>>
>
--
Pierre Morel
Linux/KVM/QEMU in Böblingen - Germany
next prev parent reply other threads:[~2018-11-07 22:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-31 18:12 [PATCH v1 0/7] s390: vfio: ap: Using GISA for AP Interrupt Pierre Morel
2018-10-31 18:12 ` [PATCH v1 1/7] vfio: ap: Add AP Queue Interruption Control facility Pierre Morel
2018-11-02 14:45 ` Tony Krowiak
2018-10-31 18:12 ` [PATCH v1 2/7] vfio: ap: VFIO AP Queue Interrupt Control Pierre Morel
2018-10-31 18:12 ` [PATCH v1 3/7] vfio: ap: AP Queue Interrupt structures definitions Pierre Morel
2018-11-02 15:14 ` Tony Krowiak
2018-11-05 8:46 ` Pierre Morel
2018-10-31 18:12 ` [PATCH v1 4/7] vfio: ap: AP Queue Interrupt Control VFIO ioctl calls Pierre Morel
2018-11-02 3:51 ` kbuild test robot
2018-11-06 20:21 ` Tony Krowiak
2018-11-07 22:31 ` Pierre Morel
2018-11-13 15:40 ` Tony Krowiak
2018-11-07 9:46 ` Cornelia Huck
2018-11-07 22:23 ` Pierre Morel
2018-11-08 9:14 ` Cornelia Huck
2018-11-08 18:00 ` Pierre Morel
2018-10-31 18:12 ` [PATCH v1 5/7] s390: kvm: export GIB registration Pierre Morel
2018-10-31 18:12 ` [PATCH v1 6/7] vfio: ap: register guest ISC with GISA and GIB Pierre Morel
2018-11-02 5:49 ` kbuild test robot
2018-11-06 20:21 ` Tony Krowiak
2018-11-07 22:40 ` Pierre Morel [this message]
2018-10-31 18:12 ` [PATCH v1 7/7] s390: kvm: Handle all GISA IPM bits through GISA Pierre Morel
2018-11-06 12:07 ` David Hildenbrand
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=5a1f9900-e90a-541d-7801-e7fcfd9f48a3@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).