Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 107c1d0a authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 91a08eae

net/sunrpc/xprtrdma/svc_rdma_rw.c

+5 −0
Original line number Diff line number Diff line
@@ -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 @@ int svc_rdma_send_write_chunk(struct svcxprt_rdma *rdma, __be32 *wr_ch, 
 *

 * 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).

net/sunrpc/xprtrdma/svc_rdma_sendto.c

+1 −1
Original line number Diff line number Diff line
@@ -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);