9p/rdma: do not disconnect on down_interruptible EAGAIN
authorDominique Martinet <dominique.martinet@cea.fr>
Thu, 30 Aug 2018 10:29:36 +0000 (19:29 +0900)
committerDominique Martinet <dominique.martinet@cea.fr>
Fri, 7 Sep 2018 16:39:47 +0000 (01:39 +0900)
9p/rdma would sometimes drop the connection and display errors in
recv_done when the user does ^C.
The errors were caused by recv buffers that were posted at the time
of disconnect, and we just do not want to disconnect when
down_interruptible is... interrupted.

Link: http://lkml.kernel.org/r/1535625307-18019-1-git-send-email-asmadeus@codewreck.org
Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
net/9p/trans_rdma.c

index 9cc9b3a19ee708d5fc67544d7603406c846da110..9719bc4d9424f429d542e458733e949fbbe946d9 100644 (file)
@@ -477,7 +477,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
 
        err = post_recv(client, rpl_context);
        if (err) {
-               p9_debug(P9_DEBUG_FCALL, "POST RECV failed\n");
+               p9_debug(P9_DEBUG_ERROR, "POST RECV failed: %d\n", err);
                goto recv_error;
        }
        /* remove posted receive buffer from request structure */
@@ -546,7 +546,7 @@ dont_need_post_recv:
  recv_error:
        kfree(rpl_context);
        spin_lock_irqsave(&rdma->req_lock, flags);
-       if (rdma->state < P9_RDMA_CLOSING) {
+       if (err != -EINTR && rdma->state < P9_RDMA_CLOSING) {
                rdma->state = P9_RDMA_CLOSING;
                spin_unlock_irqrestore(&rdma->req_lock, flags);
                rdma_disconnect(rdma->cm_id);