Re: [PATCH 4/7] s390/vfio_ap: verify ZAPQ completion after return of response code zero

From: Anthony Krowiak
Date: Tue Dec 20 2022 - 09:24:41 EST



On 12/15/22 5:54 AM, Harald Freudenberger wrote:
On 2022-12-13 16:44, Tony Krowiak wrote:
Verification that the asynchronous ZAPQ function has completed only needs
to be done when the response code indicates the function was successfully
initiated; so, let's call the apq_reset_check function immediately after
the response code zero is returned from the ZAPQ.

Signed-off-by: Tony Krowiak <akrowiak@xxxxxxxxxxxxx>
---
 drivers/s390/crypto/vfio_ap_ops.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/s390/crypto/vfio_ap_ops.c
b/drivers/s390/crypto/vfio_ap_ops.c
index 5bf2d93ae8af..c0cf5050be59 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -1645,6 +1645,9 @@ static int vfio_ap_mdev_reset_queue(struct
vfio_ap_queue *q)
     switch (status.response_code) {
     case AP_RESPONSE_NORMAL:
         ret = 0;
+        /* if the reset has not completed, wait for it to take effect */
+        if (!status.queue_empty || status.irq_enabled)
+            ret = apq_reset_check(q);
         break;
     case AP_RESPONSE_RESET_IN_PROGRESS:
         /*
@@ -1674,10 +1677,6 @@ static int vfio_ap_mdev_reset_queue(struct
vfio_ap_queue *q)
         return -EIO;
     }

-    /* wait for the reset to take effect */
-    if (!status.queue_empty && status.irq_enabled)
-        ret = apq_reset_check(q);
-
 free_resources:
     vfio_ap_free_aqic_resources(q);

Reviewed-by: Harald Freudenberger <freude@xxxxxxxxxxxxx>


Thanks for the review.