xprtrdma: Clean up the post_send path (97d0de88) · Commits · 戴 / test

net/sunrpc/xprtrdma/backchannel.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ int xprt_rdma_bc_send_reply(struct rpc_rqst *rqst)
		if (rc < 0)
		goto failed_marshal;

		if (rpcrdma_ep_post(&r_xprt->rx_ia, &r_xprt->rx_ep, req))
		if (rpcrdma_post_sends(r_xprt, req))
		goto drop_connection;
		return 0;

+9 −5

Original line number	Diff line number	Diff line
		@@ -374,18 +374,22 @@ static void frwr_wc_fastreg(struct ib_cq cq, struct ib_wc wc)
		}

		/**
		* frwr_send - post Send WR containing the RPC Call message
		* @ia: interface adapter
		* @req: Prepared RPC Call
		* frwr_send - post Send WRs containing the RPC Call message
		* @r_xprt: controlling transport instance
		* @req: prepared RPC Call
		*
		* For FRWR, chain any FastReg WRs to the Send WR. Only a
		* single ib_post_send call is needed to register memory
		* and then post the Send WR.
		*
		* Returns the result of ib_post_send.
		* Returns the return code from ib_post_send.
		*
		* Caller must hold the transport send lock to ensure that the
		* pointers to the transport's rdma_cm_id and QP are stable.
		*/
		int frwr_send(struct rpcrdma_ia ia, struct rpcrdma_req req)
		int frwr_send(struct rpcrdma_xprt r_xprt, struct rpcrdma_req req)
		{
		struct rpcrdma_ia *ia = &r_xprt->rx_ia;
		struct ib_send_wr *post_wr;
		struct rpcrdma_mr *mr;

+1 −1

Original line number	Diff line number	Diff line
		@@ -688,7 +688,7 @@ xprt_rdma_send_request(struct rpc_rqst *rqst)
		goto drop_connection;
		rqst->rq_xtime = ktime_get();

		if (rpcrdma_ep_post(&r_xprt->rx_ia, &r_xprt->rx_ep, req))
		if (rpcrdma_post_sends(r_xprt, req))
		goto drop_connection;

		rqst->rq_xmit_bytes_sent += rqst->rq_snd_buf.len;

+5 −8

Original line number	Diff line number	Diff line
		@@ -1461,20 +1461,17 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb)
		}

		/**
		* rpcrdma_ep_post - Post WRs to a transport's Send Queue
		* @ia: transport's device information
		* @ep: transport's RDMA endpoint information
		* rpcrdma_post_sends - Post WRs to a transport's Send Queue
		* @r_xprt: controlling transport instance
		* @req: rpcrdma_req containing the Send WR to post
		*
		* Returns 0 if the post was successful, otherwise -ENOTCONN
		* is returned.
		*/
		int
		rpcrdma_ep_post(struct rpcrdma_ia *ia,
		struct rpcrdma_ep *ep,
		struct rpcrdma_req *req)
		int rpcrdma_post_sends(struct rpcrdma_xprt r_xprt, struct rpcrdma_req req)
		{
		struct ib_send_wr *send_wr = &req->rl_wr;
		struct rpcrdma_ep *ep = &r_xprt->rx_ep;
		int rc;

		if (!ep->rep_send_count \|\| kref_read(&req->rl_kref) > 1) {
		@@ -1485,7 +1482,7 @@ rpcrdma_ep_post(struct rpcrdma_ia *ia,
		--ep->rep_send_count;
		}

		rc = frwr_send(ia, req);
		rc = frwr_send(r_xprt, req);
		trace_xprtrdma_post_send(req, rc);
		if (rc)
		return -ENOTCONN;

+2 −3

Original line number	Diff line number	Diff line
		@@ -467,8 +467,7 @@ void rpcrdma_ia_close(struct rpcrdma_ia *);
		int rpcrdma_ep_connect(struct rpcrdma_ep , struct rpcrdma_ia );
		void rpcrdma_ep_disconnect(struct rpcrdma_ep , struct rpcrdma_ia );

		int rpcrdma_ep_post(struct rpcrdma_ia , struct rpcrdma_ep ,
		struct rpcrdma_req *);
		int rpcrdma_post_sends(struct rpcrdma_xprt r_xprt, struct rpcrdma_req req);
		void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, bool temp);

		/*
		@@ -542,7 +541,7 @@ struct rpcrdma_mr_seg frwr_map(struct rpcrdma_xprt r_xprt,
		struct rpcrdma_mr_seg *seg,
		int nsegs, bool writing, __be32 xid,
		struct rpcrdma_mr *mr);
		int frwr_send(struct rpcrdma_ia ia, struct rpcrdma_req req);
		int frwr_send(struct rpcrdma_xprt r_xprt, struct rpcrdma_req req);
		void frwr_reminv(struct rpcrdma_rep rep, struct list_head mrs);
		void frwr_unmap_sync(struct rpcrdma_xprt r_xprt, struct rpcrdma_req req);
		void frwr_unmap_async(struct rpcrdma_xprt r_xprt, struct rpcrdma_req req);