This series corrects two issues related to enablement of interrupts in
response to interception of the PQAP(AQIC) command:
1. Returning a status response code 06 (Invalid address of AP-queue
notification byte) when the call to register a guest ISC fails makes no
sense.
2. The pages containing the interrupt notification-indicator byte are not
freed after a failure to register the guest ISC fails.
Change log v2 ==> v3:
--------------------
* Added 'Co-developed-by' for Janosch (Christian)
* Added 'Reviewed-by' tag for Matt Rosato (Matt)
Anthony Krowiak (2):
s390/vfio-ap: unpin pages on gisc registration failure
s390/vfio-ap: set status response code to 06 on gisc registration
failure
Tony Krowiak (1):
s390/vfio-ap: improve reaction to response code 07 from PQAP(AQIC)
command
drivers/s390/crypto/vfio_ap_ops.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--
2.41.0
From: Anthony Krowiak <[email protected]>
The interception handler for the PQAP(AQIC) command calls the
kvm_s390_gisc_register function to register the guest ISC with the channel
subsystem. If that call fails, the status response code 08 - indicating
Invalid ZONE/GISA designation - is returned to the guest. This response
code does not make sense because the non-zero return code from the
kvm_s390_gisc_register function can be due one of two things: Either the
ISC passed as a parameter by the guest to the PQAP(AQIC) command is greater
than the maximum ISC value allowed, or the guest is not using a GISA.
Since this scenario is very unlikely to happen and there is no status
response code to indicate an invalid ISC value, let's set the
response code to 06 indicating 'Invalid address of AP-queue notification
byte'. While this is not entirely accurate, it is better than indicating
that the ZONE/GISA designation is invalid which is something the guest
can do nothing about since those values are set by the hypervisor.
Signed-off-by: Anthony Krowiak <[email protected]>
Suggested-by: Halil Pasic <[email protected]>
---
drivers/s390/crypto/vfio_ap_ops.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index 9cb28978c186..25d7ce2094f8 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -393,8 +393,8 @@ static int ensure_nib_shared(unsigned long addr, struct gmap *gmap)
* Register the guest ISC to GIB interface and retrieve the
* host ISC to issue the host side PQAP/AQIC
*
- * Response.status may be set to AP_RESPONSE_INVALID_ADDRESS in case the
- * vfio_pin_pages failed.
+ * status.response_code may be set to AP_RESPONSE_INVALID_ADDRESS in case the
+ * vfio_pin_pages or kvm_s390_gisc_register failed.
*
* Otherwise return the ap_queue_status returned by the ap_aqic(),
* all retry handling will be done by the guest.
@@ -458,7 +458,7 @@ static struct ap_queue_status vfio_ap_irq_enable(struct vfio_ap_queue *q,
__func__, nisc, isc, q->apqn);
vfio_unpin_pages(&q->matrix_mdev->vdev, nib, 1);
- status.response_code = AP_RESPONSE_INVALID_GISA;
+ status.response_code = AP_RESPONSE_INVALID_ADDRESS;
return status;
}
--
2.41.0
From: Anthony Krowiak <[email protected]>
In the vfio_ap_irq_enable function, after the page containing the
notification indicator byte (NIB) is pinned, the function attempts
to register the guest ISC. If registration fails, the function sets the
status response code and returns without unpinning the page containing
the NIB. In order to avoid a memory leak, the NIB should be unpinned before
returning from the vfio_ap_irq_enable function.
Co-developed-by: Janosch Frank <[email protected]>
Signed-off-by: Janosch Frank <[email protected]>
Signed-off-by: Anthony Krowiak <[email protected]>
Reviewed-by: Matthew Rosato <[email protected]>
Fixes: 783f0a3ccd79 ("s390/vfio-ap: add s390dbf logging to the vfio_ap_irq_enable function")
Cc: <[email protected]>
---
drivers/s390/crypto/vfio_ap_ops.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index 4db538a55192..9cb28978c186 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -457,6 +457,7 @@ static struct ap_queue_status vfio_ap_irq_enable(struct vfio_ap_queue *q,
VFIO_AP_DBF_WARN("%s: gisc registration failed: nisc=%d, isc=%d, apqn=%#04x\n",
__func__, nisc, isc, q->apqn);
+ vfio_unpin_pages(&q->matrix_mdev->vdev, nib, 1);
status.response_code = AP_RESPONSE_INVALID_GISA;
return status;
}
--
2.41.0
Let's improve the vfio_ap driver's reaction to reception of response code
07 from the PQAP(AQIC) command when enabling interrupts on behalf of a
guest:
* Unregister the guest's ISC before the pages containing the notification
indicator bytes are unpinned.
* Capture the return code from the kvm_s390_gisc_unregister function and
log a DBF warning if it fails.
Suggested-by: Matthew Rosato <[email protected]>
Signed-off-by: Tony Krowiak <[email protected]>
Reviewed-by: Matthew Rosato <[email protected]>
---
drivers/s390/crypto/vfio_ap_ops.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index 25d7ce2094f8..4e80c211ba47 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -476,8 +476,11 @@ static struct ap_queue_status vfio_ap_irq_enable(struct vfio_ap_queue *q,
break;
case AP_RESPONSE_OTHERWISE_CHANGED:
/* We could not modify IRQ settings: clear new configuration */
+ ret = kvm_s390_gisc_unregister(kvm, isc);
+ if (ret)
+ VFIO_AP_DBF_WARN("%s: kvm_s390_gisc_unregister: rc=%d isc=%d, apqn=%#04x\n",
+ __func__, ret, isc, q->apqn);
vfio_unpin_pages(&q->matrix_mdev->vdev, nib, 1);
- kvm_s390_gisc_unregister(kvm, isc);
break;
default:
pr_warn("%s: apqn %04x: response: %02x\n", __func__, q->apqn,
--
2.41.0
On 2023-10-26 20:32, Tony Krowiak wrote:
> From: Anthony Krowiak <[email protected]>
>
> The interception handler for the PQAP(AQIC) command calls the
> kvm_s390_gisc_register function to register the guest ISC with the
> channel
> subsystem. If that call fails, the status response code 08 - indicating
> Invalid ZONE/GISA designation - is returned to the guest. This response
> code does not make sense because the non-zero return code from the
> kvm_s390_gisc_register function can be due one of two things: Either
> the
> ISC passed as a parameter by the guest to the PQAP(AQIC) command is
> greater
> than the maximum ISC value allowed, or the guest is not using a GISA.
>
> Since this scenario is very unlikely to happen and there is no status
> response code to indicate an invalid ISC value, let's set the
> response code to 06 indicating 'Invalid address of AP-queue
> notification
> byte'. While this is not entirely accurate, it is better than
> indicating
> that the ZONE/GISA designation is invalid which is something the guest
> can do nothing about since those values are set by the hypervisor.
>
> Signed-off-by: Anthony Krowiak <[email protected]>
> Suggested-by: Halil Pasic <[email protected]>
> ---
> drivers/s390/crypto/vfio_ap_ops.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/s390/crypto/vfio_ap_ops.c
> b/drivers/s390/crypto/vfio_ap_ops.c
> index 9cb28978c186..25d7ce2094f8 100644
> --- a/drivers/s390/crypto/vfio_ap_ops.c
> +++ b/drivers/s390/crypto/vfio_ap_ops.c
> @@ -393,8 +393,8 @@ static int ensure_nib_shared(unsigned long addr,
> struct gmap *gmap)
> * Register the guest ISC to GIB interface and retrieve the
> * host ISC to issue the host side PQAP/AQIC
> *
> - * Response.status may be set to AP_RESPONSE_INVALID_ADDRESS in case
> the
> - * vfio_pin_pages failed.
> + * status.response_code may be set to AP_RESPONSE_INVALID_ADDRESS in
> case the
> + * vfio_pin_pages or kvm_s390_gisc_register failed.
> *
> * Otherwise return the ap_queue_status returned by the ap_aqic(),
> * all retry handling will be done by the guest.
> @@ -458,7 +458,7 @@ static struct ap_queue_status
> vfio_ap_irq_enable(struct vfio_ap_queue *q,
> __func__, nisc, isc, q->apqn);
>
> vfio_unpin_pages(&q->matrix_mdev->vdev, nib, 1);
> - status.response_code = AP_RESPONSE_INVALID_GISA;
> + status.response_code = AP_RESPONSE_INVALID_ADDRESS;
> return status;
> }
Interesting ... The INVALID_GISA is handled in the default arm of the
switch
in ap_queue.c but the INVALID_ADDRESS is handled as irq enablement
failed.
So this change fits more to the current AP bus code. Thanks
Reviewed-by: Harald Freudenberger <[email protected]>
On Thu, 26 Oct 2023 14:32:44 -0400
Tony Krowiak <[email protected]> wrote:
> Since this scenario is very unlikely to happen and there is no status
> response code to indicate an invalid ISC value, let's set the
Again invalid ISC won't happen except for hypervisor messes up.
> response code to 06 indicating 'Invalid address of AP-queue notification
> byte'. While this is not entirely accurate, it is better than indicating
> that the ZONE/GISA designation is invalid which is something the guest
> can do nothing about since those values are set by the hypervisor.
And more importantly AP_RESPONSE_INVALID_GISA is not valid for G2 in
the given scenario, since G2 is not trying to set up interrupts on behalf
of the G3 with a G3 GISA, but G2 is trying to set up interrupts for
itself. And then AP_RESPONSE_INVALID_GISA is architecturally simply not
a valid RC!
>
> Signed-off-by: Anthony Krowiak <[email protected]>
> Suggested-by: Halil Pasic <[email protected]>
Except for the explanation in the commit message, the patch is good. It
is up to you if you want to fix the commit message or not.
Reviewed-by: Halil Pasic <[email protected]>
On 10/27/23 07:19, Halil Pasic wrote:
> On Thu, 26 Oct 2023 14:32:44 -0400
> Tony Krowiak <[email protected]> wrote:
>
>> Since this scenario is very unlikely to happen and there is no status
>> response code to indicate an invalid ISC value, let's set the
>
> Again invalid ISC won't happen except for hypervisor messes up.
Again, that is one of the checks performed by the kvm_s390_gisc_register
function; however, I get your point and will remove reference in the
comment.
>
>> response code to 06 indicating 'Invalid address of AP-queue notification
>> byte'. While this is not entirely accurate, it is better than indicating
>> that the ZONE/GISA designation is invalid which is something the guest
>> can do nothing about since those values are set by the hypervisor.
>
> And more importantly AP_RESPONSE_INVALID_GISA is not valid for G2 in
> the given scenario, since G2 is not trying to set up interrupts on behalf
> of the G3 with a G3 GISA, but G2 is trying to set up interrupts for
> itself. And then AP_RESPONSE_INVALID_GISA is architecturally simply not
> a valid RC!
Got it.
>
>>
>> Signed-off-by: Anthony Krowiak <[email protected]>
>> Suggested-by: Halil Pasic <[email protected]>
>
> Except for the explanation in the commit message, the patch is good. It
> is up to you if you want to fix the commit message or not.
>
I'll fix the commit message.
> Reviewed-by: Halil Pasic <[email protected]>