svcrdma: Avoid Send Queue overflow

Sanity case: Catch the case where more Work Requests are being
posted to the Send Queue than there are Send Queue Entries.

This might happen if a client sends a chunk with more segments than
there are SQEs for the transport. The server can't send that reply,
so the transport will deadlock unless the client drops the RPC.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c
index 0cf6202776933bdd227a2a332c77835efe2228bd..3b35364d9a6ba973fd3d45f4083185c26b4720b6 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_rw.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c
@@ -232,6 +232,9 @@ static int svc_rdma_post_chunk_ctxt(struct svc_rdma_chunk_ctxt *cc)
        struct ib_cqe *cqe;
        int ret;
 
+       if (cc->cc_sqecount > rdma->sc_sq_depth)
+               return -EINVAL;
+
        first_wr = NULL;
        cqe = &cc->cc_cqe;
        list_for_each(tmp, &cc->cc_rwctxts) {
@@ -425,6 +428,7 @@ static int svc_rdma_send_xdr_pagelist(struct svc_rdma_write_info *info,
  *
  * Returns a non-negative number of bytes the chunk consumed, or
  *     %-E2BIG if the payload was larger than the Write chunk,
+ *     %-EINVAL if client provided too many segments,
  *     %-ENOMEM if rdma_rw context pool was exhausted,
  *     %-ENOTCONN if posting failed (connection is lost),
  *     %-EIO if rdma_rw initialization failed (DMA mapping, etc).
@@ -465,6 +469,7 @@ out_err:
  *
  * Returns a non-negative number of bytes the chunk consumed, or
  *     %-E2BIG if the payload was larger than the Reply chunk,
+ *     %-EINVAL if client provided too many segments,
  *     %-ENOMEM if rdma_rw context pool was exhausted,
  *     %-ENOTCONN if posting failed (connection is lost),
  *     %-EIO if rdma_rw initialization failed (DMA mapping, etc).

diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 5ba6d915c9067ba1d32036368407499b0595967e..19fd01e4b690075a90e6e2425f1eb99c5ac9295c 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -684,7 +684,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
        return 0;
 
  err2:
-       if (ret != -E2BIG)
+       if (ret != -E2BIG || ret != -EINVAL)
                goto err1;
 
        ret = svc_rdma_post_recv(rdma, GFP_KERNEL);