Commit 6b19cc5c authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

svcrdma: Clean up RDMA_ERROR path 



Now that svc_rdma_sendto has been renovated, svc_rdma_send_error can
be refactored to reduce code duplication and remove C structure-
based XDR encoding. It is also relocated to the source file that
contains its only caller.

This is a refactoring change only.

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 9a6a180b

include/linux/sunrpc/rpc_rdma.h

+3 −0
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ enum rpcrdma_proc { 
#define rdma_done	cpu_to_be32(RDMA_DONE)

#define rdma_error	cpu_to_be32(RDMA_ERROR)



#define err_vers	cpu_to_be32(ERR_VERS)

#define err_chunk	cpu_to_be32(ERR_CHUNK)



/*

 * Private extension to RPC-over-RDMA Version One.

 * Message passed during RDMA-CM connection set-up.

include/linux/sunrpc/svc_rdma.h

+0 −5
Original line number Diff line number Diff line
@@ -209,9 +209,6 @@ extern int svc_rdma_handle_bc_reply(struct rpc_xprt *xprt, 


/* svc_rdma_marshal.c */

extern int svc_rdma_xdr_decode_req(struct xdr_buf *);

extern int svc_rdma_xdr_encode_error(struct svcxprt_rdma *,

				     struct rpcrdma_msg *,

				     enum rpcrdma_errcode, __be32 *);

extern void svc_rdma_xdr_encode_reply_array(struct rpcrdma_write_array *, int);

extern void svc_rdma_xdr_encode_array_chunk(struct rpcrdma_write_array *, int,

					    __be32, __be64, u32);
@@ -244,8 +241,6 @@ extern int svc_rdma_post_send_wr(struct svcxprt_rdma *rdma, 
				 struct svc_rdma_op_ctxt *ctxt,

				 int num_sge, u32 inv_rkey);

extern int svc_rdma_sendto(struct svc_rqst *);

extern void svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *,

				int);



/* svc_rdma_transport.c */

extern void svc_rdma_wc_send(struct ib_cq *, struct ib_wc *);

net/sunrpc/xprtrdma/svc_rdma_marshal.c

+0 −19
Original line number Diff line number Diff line
@@ -167,25 +167,6 @@ out_inval: 
	return -EINVAL;

}



int svc_rdma_xdr_encode_error(struct svcxprt_rdma *xprt,

			      struct rpcrdma_msg *rmsgp,

			      enum rpcrdma_errcode err, __be32 *va)

{

	__be32 *startp = va;



	*va++ = rmsgp->rm_xid;

	*va++ = rmsgp->rm_vers;

	*va++ = xprt->sc_fc_credits;

	*va++ = rdma_error;

	*va++ = cpu_to_be32(err);

	if (err == ERR_VERS) {

		*va++ = rpcrdma_version;

		*va++ = rpcrdma_version;

	}



	return (int)((unsigned long)va - (unsigned long)startp);

}



/**

 * svc_rdma_xdr_get_reply_hdr_length - Get length of Reply transport header

 * @rdma_resp: buffer containing Reply transport header

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

+51 −1
Original line number Diff line number Diff line
@@ -558,6 +558,56 @@ static void rdma_read_complete(struct svc_rqst *rqstp, 
	rqstp->rq_arg.buflen = head->arg.buflen;

}



static void svc_rdma_send_error(struct svcxprt_rdma *xprt,

				__be32 *rdma_argp, int status)

{

	struct svc_rdma_op_ctxt *ctxt;

	__be32 *p, *err_msgp;

	unsigned int length;

	struct page *page;

	int ret;



	ret = svc_rdma_repost_recv(xprt, GFP_KERNEL);

	if (ret)

		return;



	page = alloc_page(GFP_KERNEL);

	if (!page)

		return;

	err_msgp = page_address(page);



	p = err_msgp;

	*p++ = *rdma_argp;

	*p++ = *(rdma_argp + 1);

	*p++ = xprt->sc_fc_credits;

	*p++ = rdma_error;

	if (status == -EPROTONOSUPPORT) {

		*p++ = err_vers;

		*p++ = rpcrdma_version;

		*p++ = rpcrdma_version;

	} else {

		*p++ = err_chunk;

	}

	length = (unsigned long)p - (unsigned long)err_msgp;



	/* Map transport header; no RPC message payload */

	ctxt = svc_rdma_get_context(xprt);

	ret = svc_rdma_map_reply_hdr(xprt, ctxt, err_msgp, length);

	if (ret) {

		dprintk("svcrdma: Error %d mapping send for protocol error\n",

			ret);

		return;

	}



	ret = svc_rdma_post_send_wr(xprt, ctxt, 1, 0);

	if (ret) {

		dprintk("svcrdma: Error %d posting send for protocol error\n",

			ret);

		svc_rdma_unmap_dma(ctxt);

		svc_rdma_put_context(ctxt, 1);

	}

}



/* By convention, backchannel calls arrive via rdma_msg type

 * messages, and never populate the chunk lists. This makes

 * the RPC/RDMA header small and fixed in size, so it is
@@ -686,7 +736,7 @@ complete: 
	return ret;



out_err:

	svc_rdma_send_error(rdma_xprt, rmsgp, ret);

	svc_rdma_send_error(rdma_xprt, &rmsgp->rm_xid, ret);

	svc_rdma_put_context(ctxt, 0);

	return 0;

net/sunrpc/xprtrdma/svc_rdma_sendto.c

+0 −43
Original line number Diff line number Diff line
@@ -710,46 +710,3 @@ int svc_rdma_sendto(struct svc_rqst *rqstp) 
	set_bit(XPT_CLOSE, &xprt->xpt_flags);

	return -ENOTCONN;

}
 


void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,

			 int status)

{

	struct page *p;

	struct svc_rdma_op_ctxt *ctxt;

	enum rpcrdma_errcode err;

	__be32 *va;

	int length;

	int ret;



	ret = svc_rdma_repost_recv(xprt, GFP_KERNEL);

	if (ret)

		return;



	p = alloc_page(GFP_KERNEL);

	if (!p)

		return;

	va = page_address(p);



	/* XDR encode an error reply */

	err = ERR_CHUNK;

	if (status == -EPROTONOSUPPORT)

		err = ERR_VERS;

	length = svc_rdma_xdr_encode_error(xprt, rmsgp, err, va);



	/* Map transport header; no RPC message payload */

	ctxt = svc_rdma_get_context(xprt);

	ret = svc_rdma_map_reply_hdr(xprt, ctxt, &rmsgp->rm_xid, length);

	if (ret) {

		dprintk("svcrdma: Error %d mapping send for protocol error\n",

			ret);

		return;

	}



	ret = svc_rdma_post_send_wr(xprt, ctxt, 1, 0);

	if (ret) {

		dprintk("svcrdma: Error %d posting send for protocol error\n",

			ret);

		svc_rdma_unmap_dma(ctxt);

		svc_rdma_put_context(ctxt, 1);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE