fsi: sbefifo: Use interruptible mutex locking

Some SBE operations have extremely large responses and can require
several minutes to process the response. During this time, the device
lock must be held. If another process attempts an operation, it will
wait for the mutex for longer than the kernel hung task watchdog
allows. Therefore, use the interruptible function to lock the mutex.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20210803213016.44739-1-eajames@linux.ibm.com
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/drivers/fsi/fsi-sbefifo.c b/drivers/fsi/fsi-sbefifo.c
index b414ab4431ef1653f99198a86520ae92d102171a..52328adef643a33e32cc7c3b75a85a8347c2ae65 100644 (file)
--- a/drivers/fsi/fsi-sbefifo.c
+++ b/drivers/fsi/fsi-sbefifo.c
@@ -752,7 +752,9 @@ int sbefifo_submit(struct device *dev, const __be32 *command, size_t cmd_len,
         iov_iter_kvec(&resp_iter, WRITE, &resp_iov, 1, rbytes);
 
        /* Perform the command */
-       mutex_lock(&sbefifo->lock);
+       rc = mutex_lock_interruptible(&sbefifo->lock);
+       if (rc)
+               return rc;
        rc = __sbefifo_submit(sbefifo, command, cmd_len, &resp_iter);
        mutex_unlock(&sbefifo->lock);
 
@@ -832,7 +834,9 @@ static ssize_t sbefifo_user_read(struct file *file, char __user *buf,
        iov_iter_init(&resp_iter, WRITE, &resp_iov, 1, len);
 
        /* Perform the command */
-       mutex_lock(&sbefifo->lock);
+       rc = mutex_lock_interruptible(&sbefifo->lock);
+       if (rc)
+               goto bail;
        rc = __sbefifo_submit(sbefifo, user->pending_cmd, cmd_len, &resp_iter);
        mutex_unlock(&sbefifo->lock);
        if (rc < 0)
@@ -887,7 +891,9 @@ static ssize_t sbefifo_user_write(struct file *file, const char __user *buf,
                user->pending_len = 0;
 
                /* Trigger reset request */
-               mutex_lock(&sbefifo->lock);
+               rc = mutex_lock_interruptible(&sbefifo->lock);
+               if (rc)
+                       goto bail;
                rc = sbefifo_request_reset(user->sbefifo);
                mutex_unlock(&sbefifo->lock);
                if (rc == 0)