[S390] zcrypt: fix request timeout handling

Under very high load zcrypt requests may timeout while waiting on the
request queue. Modify zcrypt that timeouts are based on crypto adapter
responses. A timeout occurs only if a crypto adapter does not respond
within a given time frame to sumitted requests.

Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 13 insertions, 27 deletions

diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index 252443b6bd1b..64948788d301 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -93,6 +93,7 @@ static struct ap_driver zcrypt_pcixcc_driver = {
         .remove = zcrypt_pcixcc_remove,
         .receive = zcrypt_pcixcc_receive,
         .ids = zcrypt_pcixcc_ids,
+        .request_timeout = PCIXCC_CLEANUP_TIME,
 };
 
 /**
@@ -641,18 +642,13 @@ static long zcrypt_pcixcc_modexpo(struct zcrypt_device *zdev,
                 goto out_free;
         init_completion(&resp_type.work);
         ap_queue_message(zdev->ap_dev, &ap_msg);
-        rc = wait_for_completion_interruptible_timeout(
-                                &resp_type.work, PCIXCC_CLEANUP_TIME);
-        if (rc > 0)
+        rc = wait_for_completion_interruptible(&resp_type.work);
+        if (rc == 0)
                 rc = convert_response_ica(zdev, &ap_msg, mex->outputdata,
                                           mex->outputdatalength);
-        else {
-                /* Signal pending or message timed out. */
+        else
+                /* Signal pending. */
                 ap_cancel_message(zdev->ap_dev, &ap_msg);
-                if (rc == 0)
-                        /* Message timed out. */
-                        rc = -ETIME;
-        }
 out_free:
         free_page((unsigned long) ap_msg.message);
         return rc;
@@ -685,18 +681,13 @@ static long zcrypt_pcixcc_modexpo_crt(struct zcrypt_device *zdev,
                 goto out_free;
         init_completion(&resp_type.work);
         ap_queue_message(zdev->ap_dev, &ap_msg);
-        rc = wait_for_completion_interruptible_timeout(
-                                &resp_type.work, PCIXCC_CLEANUP_TIME);
-        if (rc > 0)
+        rc = wait_for_completion_interruptible(&resp_type.work);
+        if (rc == 0)
                 rc = convert_response_ica(zdev, &ap_msg, crt->outputdata,
                                           crt->outputdatalength);
-        else {
-                /* Signal pending or message timed out. */
+        else
+                /* Signal pending. */
                 ap_cancel_message(zdev->ap_dev, &ap_msg);
-                if (rc == 0)
-                        /* Message timed out. */
-                        rc = -ETIME;
-        }
 out_free:
         free_page((unsigned long) ap_msg.message);
         return rc;
@@ -729,17 +720,12 @@ static long zcrypt_pcixcc_send_cprb(struct zcrypt_device *zdev,
                 goto out_free;
         init_completion(&resp_type.work);
         ap_queue_message(zdev->ap_dev, &ap_msg);
-        rc = wait_for_completion_interruptible_timeout(
-                                &resp_type.work, PCIXCC_CLEANUP_TIME);
-        if (rc > 0)
+        rc = wait_for_completion_interruptible(&resp_type.work);
+        if (rc == 0)
                 rc = convert_response_xcrb(zdev, &ap_msg, xcRB);
-        else {
-                /* Signal pending or message timed out. */
+        else
+                /* Signal pending. */
                 ap_cancel_message(zdev->ap_dev, &ap_msg);
-                if (rc == 0)
-                        /* Message timed out. */
-                        rc = -ETIME;
-        }
 out_free:
         memset(ap_msg.message, 0x0, ap_msg.length);
         kfree(ap_msg.message);