leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svcrdma: Avoid Send Queue overflow

Browse Source 
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>
This commit is contained in:
Chuck Lever 2017-06-23 17:17:24 -04:00 committed by J. Bruce Fields
parent 91a08eae79
commit 107c1d0a99
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/sunrpc/xprtrdma/svc_rdma_rw.c
View File

@ -232,6 +232,9 @@ static int svc_rdma_post_chunk_ctxt(struct svc_rdma_chunk_ctxt *cc)
struct ib_cqe *cqe; struct ib_cqe *cqe;
int ret; int ret;
if (cc->cc_sqecount > rdma->sc_sq_depth)
return -EINVAL;
first_wr = NULL; first_wr = NULL;
cqe = &cc->cc_cqe; cqe = &cc->cc_cqe;
list_for_each(tmp, &cc->cc_rwctxts) { 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 * Returns a non-negative number of bytes the chunk consumed, or
* %-E2BIG if the payload was larger than the Write chunk, * %-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, * %-ENOMEM if rdma_rw context pool was exhausted,
* %-ENOTCONN if posting failed (connection is lost), * %-ENOTCONN if posting failed (connection is lost),
* %-EIO if rdma_rw initialization failed (DMA mapping, etc). * %-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 * Returns a non-negative number of bytes the chunk consumed, or
* %-E2BIG if the payload was larger than the Reply chunk, * %-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, * %-ENOMEM if rdma_rw context pool was exhausted,
* %-ENOTCONN if posting failed (connection is lost), * %-ENOTCONN if posting failed (connection is lost),
* %-EIO if rdma_rw initialization failed (DMA mapping, etc). * %-EIO if rdma_rw initialization failed (DMA mapping, etc).

2
net/sunrpc/xprtrdma/svc_rdma_sendto.c
View File

@ -684,7 +684,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
return 0; return 0;
err2: err2:
if (ret != -E2BIG) if (ret != -E2BIG || ret != -EINVAL)
goto err1; goto err1;
ret = svc_rdma_post_recv(rdma, GFP_KERNEL); ret = svc_rdma_post_recv(rdma, GFP_KERNEL);