From: Tom Talpey <tom@talpey.com>
To: Chuck Lever <chuck.lever@oracle.com>,
linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org
Subject: Re: [PATCH v2 2/6] xprtrdma: Simplify rpcrdma_convert_kvec() and frwr_map()
Date: Wed, 3 Feb 2021 13:07:54 -0500 [thread overview]
Message-ID: <a26eed70-3f0f-907e-3c88-1b5f949c950c@talpey.com> (raw)
In-Reply-To: <161236944071.1030487.460353530274045763.stgit@manet.1015granger.net>
Reviewed-By: Tom Talpey <tom@talpey.com>
On 2/3/2021 11:24 AM, Chuck Lever wrote:
> Clean up.
>
> Remove a conditional branch from the SGL set-up loop in frwr_map():
> Instead of using either sg_set_page() or sg_set_buf(), initialize
> the mr_page field properly when rpcrdma_convert_kvec() converts the
> kvec to an SGL entry. frwr_map() can then invoke sg_set_page()
> unconditionally.
>
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
> net/sunrpc/xprtrdma/frwr_ops.c | 12 ++++--------
> net/sunrpc/xprtrdma/rpc_rdma.c | 2 +-
> net/sunrpc/xprtrdma/xprt_rdma.h | 9 +++++----
> 3 files changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
> index baca49fe83af..13a50f77dddb 100644
> --- a/net/sunrpc/xprtrdma/frwr_ops.c
> +++ b/net/sunrpc/xprtrdma/frwr_ops.c
> @@ -306,14 +306,10 @@ struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt,
> if (nsegs > ep->re_max_fr_depth)
> nsegs = ep->re_max_fr_depth;
> for (i = 0; i < nsegs;) {
> - if (seg->mr_page)
> - sg_set_page(&mr->mr_sg[i],
> - seg->mr_page,
> - seg->mr_len,
> - offset_in_page(seg->mr_offset));
> - else
> - sg_set_buf(&mr->mr_sg[i], seg->mr_offset,
> - seg->mr_len);
> + sg_set_page(&mr->mr_sg[i],
> + seg->mr_page,
> + seg->mr_len,
> + offset_in_page(seg->mr_offset));
>
> ++seg;
> ++i;
> diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
> index 832765f3ebba..529adb6ad4db 100644
> --- a/net/sunrpc/xprtrdma/rpc_rdma.c
> +++ b/net/sunrpc/xprtrdma/rpc_rdma.c
> @@ -214,7 +214,7 @@ rpcrdma_convert_kvec(struct kvec *vec, struct rpcrdma_mr_seg *seg,
> unsigned int *n)
> {
> if (vec->iov_len) {
> - seg->mr_page = NULL;
> + seg->mr_page = virt_to_page(vec->iov_base);
> seg->mr_offset = vec->iov_base;
> seg->mr_len = vec->iov_len;
> ++seg;
> diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
> index 94b28657aeeb..02971e183989 100644
> --- a/net/sunrpc/xprtrdma/xprt_rdma.h
> +++ b/net/sunrpc/xprtrdma/xprt_rdma.h
> @@ -283,10 +283,11 @@ enum {
> RPCRDMA_MAX_IOV_SEGS,
> };
>
> -struct rpcrdma_mr_seg { /* chunk descriptors */
> - u32 mr_len; /* length of chunk or segment */
> - struct page *mr_page; /* owning page, if any */
> - char *mr_offset; /* kva if no page, else offset */
> +/* Arguments for DMA mapping and registration */
> +struct rpcrdma_mr_seg {
> + u32 mr_len; /* length of segment */
> + struct page *mr_page; /* underlying struct page */
> + char *mr_offset; /* IN: page offset, OUT: iova */
> };
>
> /* The Send SGE array is provisioned to send a maximum size
>
>
>
next prev parent reply other threads:[~2021-02-03 18:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 16:23 [PATCH v2 0/6] RPC/RDMA client fixes Chuck Lever
2021-02-03 16:23 ` [PATCH v2 1/6] xprtrdma: Remove FMR support in rpcrdma_convert_iovs() Chuck Lever
2021-02-03 18:06 ` Tom Talpey
2021-02-03 18:09 ` Chuck Lever
2021-02-03 16:24 ` [PATCH v2 2/6] xprtrdma: Simplify rpcrdma_convert_kvec() and frwr_map() Chuck Lever
2021-02-03 18:07 ` Tom Talpey [this message]
2021-02-03 16:24 ` [PATCH v2 3/6] xprtrdma: Refactor invocations of offset_in_page() Chuck Lever
2021-02-03 18:09 ` Tom Talpey
2021-02-03 18:11 ` Chuck Lever
2021-02-03 18:19 ` Tom Talpey
2021-02-03 16:24 ` [PATCH v2 4/6] rpcrdma: Fix comments about reverse-direction operation Chuck Lever
2021-02-03 18:10 ` Tom Talpey
2021-02-03 16:24 ` [PATCH v2 5/6] xprtrdma: Pad optimization, revisited Chuck Lever
2021-02-03 18:13 ` Tom Talpey
2021-02-03 16:24 ` [PATCH v2 6/6] rpcrdma: Capture bytes received in Receive completion tracepoints Chuck Lever
2021-02-03 18:14 ` Tom Talpey
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=a26eed70-3f0f-907e-3c88-1b5f949c950c@talpey.com \
--to=tom@talpey.com \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).