All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anna Schumaker <Anna.Schumaker-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>
To: Chuck Lever <chuck.lever-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>,
	linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH v2 02/22] SUNRPC: Refactor rpc_xdr_buf_init()
Date: Fri, 26 Aug 2016 17:05:20 -0400	[thread overview]
Message-ID: <82e56623-ddab-7eb7-0c0b-e2adc177af76@Netapp.com> (raw)
In-Reply-To: <20160823175219.13038.22735.stgit-FYjufvaPoItvLzlybtyyYzGyq/o6K9yX@public.gmane.org>

On 08/23/2016 01:52 PM, Chuck Lever wrote:
> Clean up: there is some XDR initialization logic that is commoon
                                                           ^^^^^^^
nit: "common" has an extra "o"

Looks okay to me otherwise,
Anna

> to the forward channel and backchannel. Move it to an XDR header
> so it can be shared.
> 
> rpc_rqst::rq_buffer points to a buffer containing big-endian data.
> Update its annotation as part of the clean up.
> 
> Signed-off-by: Chuck Lever <chuck.lever-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> ---
>  include/linux/sunrpc/xdr.h        |   12 ++++++++++++
>  include/linux/sunrpc/xprt.h       |    2 +-
>  net/sunrpc/backchannel_rqst.c     |    8 +-------
>  net/sunrpc/clnt.c                 |   24 ++++++------------------
>  net/sunrpc/xprtrdma/backchannel.c |   12 +-----------
>  5 files changed, 21 insertions(+), 37 deletions(-)
> 
> diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
> index 70c6b92..56c48c8 100644
> --- a/include/linux/sunrpc/xdr.h
> +++ b/include/linux/sunrpc/xdr.h
> @@ -67,6 +67,18 @@ struct xdr_buf {
>  			len;		/* Length of XDR encoded message */
>  };
>  
> +static inline void
> +xdr_buf_init(struct xdr_buf *buf, void *start, size_t len)
> +{
> +	buf->head[0].iov_base = start;
> +	buf->head[0].iov_len = len;
> +	buf->tail[0].iov_len = 0;
> +	buf->page_len = 0;
> +	buf->flags = 0;
> +	buf->len = 0;
> +	buf->buflen = len;
> +}
> +
>  /*
>   * pre-xdr'ed macros.
>   */
> diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
> index a16070d..6f1d41b 100644
> --- a/include/linux/sunrpc/xprt.h
> +++ b/include/linux/sunrpc/xprt.h
> @@ -83,7 +83,7 @@ struct rpc_rqst {
>  	void (*rq_release_snd_buf)(struct rpc_rqst *); /* release rq_enc_pages */
>  	struct list_head	rq_list;
>  
> -	__u32 *			rq_buffer;	/* XDR encode buffer */
> +	void			*rq_buffer;	/* Call XDR encode buffer */
>  	size_t			rq_callsize,
>  				rq_rcvsize;
>  	size_t			rq_xmit_bytes_sent;	/* total bytes sent */
> diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c
> index 229956b..ac701c2 100644
> --- a/net/sunrpc/backchannel_rqst.c
> +++ b/net/sunrpc/backchannel_rqst.c
> @@ -76,13 +76,7 @@ static int xprt_alloc_xdr_buf(struct xdr_buf *buf, gfp_t gfp_flags)
>  	page = alloc_page(gfp_flags);
>  	if (page == NULL)
>  		return -ENOMEM;
> -	buf->head[0].iov_base = page_address(page);
> -	buf->head[0].iov_len = PAGE_SIZE;
> -	buf->tail[0].iov_base = NULL;
> -	buf->tail[0].iov_len = 0;
> -	buf->page_len = 0;
> -	buf->len = 0;
> -	buf->buflen = PAGE_SIZE;
> +	xdr_buf_init(buf, page_address(page), PAGE_SIZE);
>  	return 0;
>  }
>  
> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
> index 7f79fb7..236f9ff 100644
> --- a/net/sunrpc/clnt.c
> +++ b/net/sunrpc/clnt.c
> @@ -1748,18 +1748,6 @@ rpc_task_force_reencode(struct rpc_task *task)
>  	task->tk_rqstp->rq_bytes_sent = 0;
>  }
>  
> -static inline void
> -rpc_xdr_buf_init(struct xdr_buf *buf, void *start, size_t len)
> -{
> -	buf->head[0].iov_base = start;
> -	buf->head[0].iov_len = len;
> -	buf->tail[0].iov_len = 0;
> -	buf->page_len = 0;
> -	buf->flags = 0;
> -	buf->len = 0;
> -	buf->buflen = len;
> -}
> -
>  /*
>   * 3.	Encode arguments of an RPC call
>   */
> @@ -1772,12 +1760,12 @@ rpc_xdr_encode(struct rpc_task *task)
>  
>  	dprint_status(task);
>  
> -	rpc_xdr_buf_init(&req->rq_snd_buf,
> -			 req->rq_buffer,
> -			 req->rq_callsize);
> -	rpc_xdr_buf_init(&req->rq_rcv_buf,
> -			 (char *)req->rq_buffer + req->rq_callsize,
> -			 req->rq_rcvsize);
> +	xdr_buf_init(&req->rq_snd_buf,
> +		     req->rq_buffer,
> +		     req->rq_callsize);
> +	xdr_buf_init(&req->rq_rcv_buf,
> +		     (char *)req->rq_buffer + req->rq_callsize,
> +		     req->rq_rcvsize);
>  
>  	p = rpc_encode_header(task);
>  	if (p == NULL) {
> diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c
> index 5f60ab2..d3cfaf2 100644
> --- a/net/sunrpc/xprtrdma/backchannel.c
> +++ b/net/sunrpc/xprtrdma/backchannel.c
> @@ -38,7 +38,6 @@ static int rpcrdma_bc_setup_rqst(struct rpcrdma_xprt *r_xprt,
>  	struct rpcrdma_ia *ia = &r_xprt->rx_ia;
>  	struct rpcrdma_regbuf *rb;
>  	struct rpcrdma_req *req;
> -	struct xdr_buf *buf;
>  	size_t size;
>  
>  	req = rpcrdma_create_req(r_xprt);
> @@ -60,16 +59,7 @@ static int rpcrdma_bc_setup_rqst(struct rpcrdma_xprt *r_xprt,
>  	req->rl_sendbuf = rb;
>  	/* so that rpcr_to_rdmar works when receiving a request */
>  	rqst->rq_buffer = (void *)req->rl_sendbuf->rg_base;
> -
> -	buf = &rqst->rq_snd_buf;
> -	buf->head[0].iov_base = rqst->rq_buffer;
> -	buf->head[0].iov_len = 0;
> -	buf->tail[0].iov_base = NULL;
> -	buf->tail[0].iov_len = 0;
> -	buf->page_len = 0;
> -	buf->len = 0;
> -	buf->buflen = size;
> -
> +	xdr_buf_init(&rqst->rq_snd_buf, rqst->rq_buffer, size);
>  	return 0;
>  
>  out_fail:
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

WARNING: multiple messages have this Message-ID
From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: Chuck Lever <chuck.lever@oracle.com>,
	<linux-rdma@vger.kernel.org>, <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v2 02/22] SUNRPC: Refactor rpc_xdr_buf_init()
Date: Fri, 26 Aug 2016 17:05:20 -0400	[thread overview]
Message-ID: <82e56623-ddab-7eb7-0c0b-e2adc177af76@Netapp.com> (raw)
In-Reply-To: <20160823175219.13038.22735.stgit@manet.1015granger.net>

On 08/23/2016 01:52 PM, Chuck Lever wrote:
> Clean up: there is some XDR initialization logic that is commoon
                                                           ^^^^^^^
nit: "common" has an extra "o"

Looks okay to me otherwise,
Anna

> to the forward channel and backchannel. Move it to an XDR header
> so it can be shared.
> 
> rpc_rqst::rq_buffer points to a buffer containing big-endian data.
> Update its annotation as part of the clean up.
> 
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  include/linux/sunrpc/xdr.h        |   12 ++++++++++++
>  include/linux/sunrpc/xprt.h       |    2 +-
>  net/sunrpc/backchannel_rqst.c     |    8 +-------
>  net/sunrpc/clnt.c                 |   24 ++++++------------------
>  net/sunrpc/xprtrdma/backchannel.c |   12 +-----------
>  5 files changed, 21 insertions(+), 37 deletions(-)
> 
> diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
> index 70c6b92..56c48c8 100644
> --- a/include/linux/sunrpc/xdr.h
> +++ b/include/linux/sunrpc/xdr.h
> @@ -67,6 +67,18 @@ struct xdr_buf {
>  			len;		/* Length of XDR encoded message */
>  };
>  
> +static inline void
> +xdr_buf_init(struct xdr_buf *buf, void *start, size_t len)
> +{
> +	buf->head[0].iov_base = start;
> +	buf->head[0].iov_len = len;
> +	buf->tail[0].iov_len = 0;
> +	buf->page_len = 0;
> +	buf->flags = 0;
> +	buf->len = 0;
> +	buf->buflen = len;
> +}
> +
>  /*
>   * pre-xdr'ed macros.
>   */
> diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
> index a16070d..6f1d41b 100644
> --- a/include/linux/sunrpc/xprt.h
> +++ b/include/linux/sunrpc/xprt.h
> @@ -83,7 +83,7 @@ struct rpc_rqst {
>  	void (*rq_release_snd_buf)(struct rpc_rqst *); /* release rq_enc_pages */
>  	struct list_head	rq_list;
>  
> -	__u32 *			rq_buffer;	/* XDR encode buffer */
> +	void			*rq_buffer;	/* Call XDR encode buffer */
>  	size_t			rq_callsize,
>  				rq_rcvsize;
>  	size_t			rq_xmit_bytes_sent;	/* total bytes sent */
> diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c
> index 229956b..ac701c2 100644
> --- a/net/sunrpc/backchannel_rqst.c
> +++ b/net/sunrpc/backchannel_rqst.c
> @@ -76,13 +76,7 @@ static int xprt_alloc_xdr_buf(struct xdr_buf *buf, gfp_t gfp_flags)
>  	page = alloc_page(gfp_flags);
>  	if (page == NULL)
>  		return -ENOMEM;
> -	buf->head[0].iov_base = page_address(page);
> -	buf->head[0].iov_len = PAGE_SIZE;
> -	buf->tail[0].iov_base = NULL;
> -	buf->tail[0].iov_len = 0;
> -	buf->page_len = 0;
> -	buf->len = 0;
> -	buf->buflen = PAGE_SIZE;
> +	xdr_buf_init(buf, page_address(page), PAGE_SIZE);
>  	return 0;
>  }
>  
> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
> index 7f79fb7..236f9ff 100644
> --- a/net/sunrpc/clnt.c
> +++ b/net/sunrpc/clnt.c
> @@ -1748,18 +1748,6 @@ rpc_task_force_reencode(struct rpc_task *task)
>  	task->tk_rqstp->rq_bytes_sent = 0;
>  }
>  
> -static inline void
> -rpc_xdr_buf_init(struct xdr_buf *buf, void *start, size_t len)
> -{
> -	buf->head[0].iov_base = start;
> -	buf->head[0].iov_len = len;
> -	buf->tail[0].iov_len = 0;
> -	buf->page_len = 0;
> -	buf->flags = 0;
> -	buf->len = 0;
> -	buf->buflen = len;
> -}
> -
>  /*
>   * 3.	Encode arguments of an RPC call
>   */
> @@ -1772,12 +1760,12 @@ rpc_xdr_encode(struct rpc_task *task)
>  
>  	dprint_status(task);
>  
> -	rpc_xdr_buf_init(&req->rq_snd_buf,
> -			 req->rq_buffer,
> -			 req->rq_callsize);
> -	rpc_xdr_buf_init(&req->rq_rcv_buf,
> -			 (char *)req->rq_buffer + req->rq_callsize,
> -			 req->rq_rcvsize);
> +	xdr_buf_init(&req->rq_snd_buf,
> +		     req->rq_buffer,
> +		     req->rq_callsize);
> +	xdr_buf_init(&req->rq_rcv_buf,
> +		     (char *)req->rq_buffer + req->rq_callsize,
> +		     req->rq_rcvsize);
>  
>  	p = rpc_encode_header(task);
>  	if (p == NULL) {
> diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c
> index 5f60ab2..d3cfaf2 100644
> --- a/net/sunrpc/xprtrdma/backchannel.c
> +++ b/net/sunrpc/xprtrdma/backchannel.c
> @@ -38,7 +38,6 @@ static int rpcrdma_bc_setup_rqst(struct rpcrdma_xprt *r_xprt,
>  	struct rpcrdma_ia *ia = &r_xprt->rx_ia;
>  	struct rpcrdma_regbuf *rb;
>  	struct rpcrdma_req *req;
> -	struct xdr_buf *buf;
>  	size_t size;
>  
>  	req = rpcrdma_create_req(r_xprt);
> @@ -60,16 +59,7 @@ static int rpcrdma_bc_setup_rqst(struct rpcrdma_xprt *r_xprt,
>  	req->rl_sendbuf = rb;
>  	/* so that rpcr_to_rdmar works when receiving a request */
>  	rqst->rq_buffer = (void *)req->rl_sendbuf->rg_base;
> -
> -	buf = &rqst->rq_snd_buf;
> -	buf->head[0].iov_base = rqst->rq_buffer;
> -	buf->head[0].iov_len = 0;
> -	buf->tail[0].iov_base = NULL;
> -	buf->tail[0].iov_len = 0;
> -	buf->page_len = 0;
> -	buf->len = 0;
> -	buf->buflen = size;
> -
> +	xdr_buf_init(&rqst->rq_snd_buf, rqst->rq_buffer, size);
>  	return 0;
>  
>  out_fail:
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


  parent reply	other threads:[~2016-08-26 21:05 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-23 17:52 [PATCH v2 00/22] client-side NFS/RDMA patches proposed for v4.9 Chuck Lever
2016-08-23 17:52 ` Chuck Lever
     [not found] ` <20160823174402.13038.84561.stgit-FYjufvaPoItvLzlybtyyYzGyq/o6K9yX@public.gmane.org>
2016-08-23 17:52   ` [PATCH v2 01/22] xprtrdma: Eliminate INLINE_THRESHOLD macros Chuck Lever
2016-08-23 17:52     ` Chuck Lever
2016-08-23 17:52   ` [PATCH v2 02/22] SUNRPC: Refactor rpc_xdr_buf_init() Chuck Lever
2016-08-23 17:52     ` Chuck Lever
     [not found]     ` <20160823175219.13038.22735.stgit-FYjufvaPoItvLzlybtyyYzGyq/o6K9yX@public.gmane.org>
2016-08-26 21:05       ` Anna Schumaker [this message]
2016-08-26 21:05         ` Anna Schumaker
2016-08-23 17:52   ` [PATCH v2 03/22] SUNRPC: Generalize the RPC buffer allocation API Chuck Lever
2016-08-23 17:52     ` Chuck Lever
2016-08-23 17:52   ` [PATCH v2 04/22] SUNRPC: Generalize the RPC buffer release API Chuck Lever
2016-08-23 17:52     ` Chuck Lever
2016-08-23 17:52   ` [PATCH v2 05/22] SUNRPC: Separate buffer pointers for RPC Call and Reply messages Chuck Lever
2016-08-23 17:52     ` Chuck Lever
     [not found]     ` <20160823175244.13038.39619.stgit-FYjufvaPoItvLzlybtyyYzGyq/o6K9yX@public.gmane.org>
2016-08-29 14:23       ` Anna Schumaker
2016-08-29 14:23         ` Anna Schumaker
     [not found]         ` <1e9440d8-111a-4252-c706-2e3c26f7b09a-ZwjVKphTwtPQT0dZR+AlfA@public.gmane.org>
2016-08-29 15:33           ` Chuck Lever
2016-08-29 15:33             ` Chuck Lever
     [not found]             ` <10EFE631-06F6-4E4E-9EBC-F7ABFDF2C742-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2016-08-29 15:44               ` Anna Schumaker
2016-08-29 15:44                 ` Anna Schumaker
2016-08-23 17:52   ` [PATCH v2 06/22] SUNRPC: Add a transport-specific private field in rpc_rqst Chuck Lever
2016-08-23 17:52     ` Chuck Lever
2016-08-23 17:53   ` [PATCH v2 07/22] xprtrdma: Initialize separate RPC call and reply buffers Chuck Lever
2016-08-23 17:53     ` Chuck Lever
2016-08-23 17:53   ` [PATCH v2 08/22] xprtrdma: Use smaller buffers for RPC-over-RDMA headers Chuck Lever
2016-08-23 17:53     ` Chuck Lever
2016-08-23 17:53   ` [PATCH v2 09/22] xprtrdma: Replace DMA_BIDIRECTIONAL Chuck Lever
2016-08-23 17:53     ` Chuck Lever
2016-08-23 17:53   ` [PATCH v2 10/22] xprtrdma: Delay DMA mapping Send and Receive buffers Chuck Lever
2016-08-23 17:53     ` Chuck Lever
2016-08-23 17:53   ` [PATCH v2 11/22] xprtrdma: Eliminate "ia" argument in rpcrdma_{alloc, free}_regbuf Chuck Lever
2016-08-23 17:53     ` Chuck Lever
2016-08-23 17:53   ` [PATCH v2 12/22] xprtrdma: Simplify rpcrdma_ep_post_recv() Chuck Lever
2016-08-23 17:53     ` Chuck Lever
2016-08-23 17:53   ` [PATCH v2 13/22] xprtrdma: Move send_wr to struct rpcrdma_req Chuck Lever
2016-08-23 17:53     ` Chuck Lever
2016-08-23 17:53   ` [PATCH v2 14/22] xprtrdma: Move recv_wr to struct rpcrdma_rep Chuck Lever
2016-08-23 17:53     ` Chuck Lever
2016-08-23 17:54   ` [PATCH v2 15/22] rpcrdma: RDMA/CM private message data structure Chuck Lever
2016-08-23 17:54     ` Chuck Lever
2016-08-23 17:54   ` [PATCH v2 16/22] xprtrdma: Client-side support for rpcrdma_connect_private Chuck Lever
2016-08-23 17:54     ` Chuck Lever
2016-08-23 17:54   ` [PATCH v2 17/22] xprtrdma: Basic support for Remote Invalidation Chuck Lever
2016-08-23 17:54     ` Chuck Lever
2016-08-23 17:54   ` [PATCH v2 18/22] xprtrdma: Use gathered Send for large inline messages Chuck Lever
2016-08-23 17:54     ` Chuck Lever
2016-08-23 17:54   ` [PATCH v2 19/22] xprtrdma: Support larger inline thresholds Chuck Lever
2016-08-23 17:54     ` Chuck Lever
     [not found]     ` <20160823175438.13038.1624.stgit-FYjufvaPoItvLzlybtyyYzGyq/o6K9yX@public.gmane.org>
2016-08-29 19:52       ` Anna Schumaker
2016-08-29 19:52         ` Anna Schumaker
     [not found]         ` <c922120b-35f3-65bf-e778-3cef645cee48-ZwjVKphTwtPQT0dZR+AlfA@public.gmane.org>
2016-08-29 20:02           ` Chuck Lever
2016-08-29 20:02             ` Chuck Lever
2016-08-23 17:54   ` [PATCH v2 20/22] xprtrmda: Report address of frmr, not mw Chuck Lever
2016-08-23 17:54     ` Chuck Lever
     [not found]     ` <20160823175446.13038.58792.stgit-FYjufvaPoItvLzlybtyyYzGyq/o6K9yX@public.gmane.org>
2016-08-29 19:54       ` Anna Schumaker
2016-08-29 19:54         ` Anna Schumaker
     [not found]         ` <7f92664a-a16c-6c44-b8f8-391e4fec0a89-ZwjVKphTwtPQT0dZR+AlfA@public.gmane.org>
2016-08-29 20:13           ` Chuck Lever
2016-08-29 20:13             ` Chuck Lever
2016-08-23 17:54   ` [PATCH v2 21/22] xprtrdma: Rename rpcrdma_receive_wc() Chuck Lever
2016-08-23 17:54     ` Chuck Lever
2016-08-23 17:55   ` [PATCH v2 22/22] xprtrdma: Eliminate rpcrdma_receive_worker() Chuck Lever
2016-08-23 17:55     ` Chuck Lever

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=82e56623-ddab-7eb7-0c0b-e2adc177af76@Netapp.com \
    --to=anna.schumaker-hgovqubeegtqt0dzr+alfa@public.gmane.org \
    --cc=chuck.lever-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org \
    --cc=linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --subject='Re: [PATCH v2 02/22] SUNRPC: Refactor rpc_xdr_buf_init()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.