Commit 596f2a19 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

svcrdma: Remove ->release_rqst call in bc reply handler 



Similar to a change made in the client's forward channel reply
handler: The xprt_release_rqst_cong() call is not necessary.

Also, release xprt->recv_lock when taking xprt->transport_lock
to avoid disabling and enabling BH's while holding another
spin lock.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent f3c1fd0e

net/sunrpc/xprtrdma/svc_rdma_backchannel.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ int svc_rdma_handle_bc_reply(struct rpc_xprt *xprt, __be32 *rdma_resp, 
	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);

	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);

	struct kvec *dst, *src = &rcvbuf->head[0];

	struct kvec *dst, *src = &rcvbuf->head[0];

	struct rpc_rqst *req;

	struct rpc_rqst *req;

	unsigned long cwnd;

	u32 credits;

	u32 credits;

	size_t len;

	size_t len;

	__be32 xid;

	__be32 xid;
@@ -66,6 +65,8 @@ int svc_rdma_handle_bc_reply(struct rpc_xprt *xprt, __be32 *rdma_resp, 
	if (dst->iov_len < len)

	if (dst->iov_len < len)

		goto out_unlock;

		goto out_unlock;

	memcpy(dst->iov_base, p, len);

	memcpy(dst->iov_base, p, len);

	xprt_pin_rqst(req);

	spin_unlock(&xprt->recv_lock);





	credits = be32_to_cpup(rdma_resp + 2);

	credits = be32_to_cpup(rdma_resp + 2);

	if (credits == 0)

	if (credits == 0)
@@ -74,15 +75,13 @@ int svc_rdma_handle_bc_reply(struct rpc_xprt *xprt, __be32 *rdma_resp, 
		credits = r_xprt->rx_buf.rb_bc_max_requests;

		credits = r_xprt->rx_buf.rb_bc_max_requests;





	spin_lock_bh(&xprt->transport_lock);

	spin_lock_bh(&xprt->transport_lock);

	cwnd = xprt->cwnd;

	xprt->cwnd = credits << RPC_CWNDSHIFT;

	xprt->cwnd = credits << RPC_CWNDSHIFT;

	if (xprt->cwnd > cwnd)

		xprt_release_rqst_cong(req->rq_task);

	spin_unlock_bh(&xprt->transport_lock);

	spin_unlock_bh(&xprt->transport_lock);







	spin_lock(&xprt->recv_lock);

	ret = 0;

	ret = 0;

	xprt_complete_rqst(req->rq_task, rcvbuf->len);

	xprt_complete_rqst(req->rq_task, rcvbuf->len);

	xprt_unpin_rqst(req);

	rcvbuf->len = 0;

	rcvbuf->len = 0;





out_unlock:

out_unlock:

CRA Git | Maintained and supported by SUSTech CRA and CCSE