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 3/6] xprtrdma: Refactor invocations of offset_in_page()
Date: Wed, 3 Feb 2021 13:09:59 -0500 [thread overview]
Message-ID: <d0bbab3e-851c-3388-3d1c-cbc6249a6803@talpey.com> (raw)
In-Reply-To: <161236944700.1030487.6859398915626711523.stgit@manet.1015granger.net>
This looks good, but the earlier 1/6 patch depends on the offset_in_page
conversion in rpcrdma_convert_kvec. Won't that complicate any bisection?
Reviewed-By: Tom Talpey <tom@talpey.com>
On 2/3/2021 11:24 AM, Chuck Lever wrote:
> Clean up so that offset_in_page() is invoked less often in the
> most common case, which is mapping xdr->pages.
>
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
> net/sunrpc/xprtrdma/frwr_ops.c | 8 +++-----
> net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++--
> net/sunrpc/xprtrdma/xprt_rdma.h | 2 +-
> 3 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
> index 13a50f77dddb..766a1048a48a 100644
> --- a/net/sunrpc/xprtrdma/frwr_ops.c
> +++ b/net/sunrpc/xprtrdma/frwr_ops.c
> @@ -306,16 +306,14 @@ 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;) {
> - sg_set_page(&mr->mr_sg[i],
> - seg->mr_page,
> - seg->mr_len,
> - offset_in_page(seg->mr_offset));
> + sg_set_page(&mr->mr_sg[i], seg->mr_page,
> + seg->mr_len, seg->mr_offset);
>
> ++seg;
> ++i;
> if (ep->re_mrtype == IB_MR_TYPE_SG_GAPS)
> continue;
> - if ((i < nsegs && offset_in_page(seg->mr_offset)) ||
> + if ((i < nsegs && seg->mr_offset) ||
> offset_in_page((seg-1)->mr_offset + (seg-1)->mr_len))
> break;
> }
> diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
> index 529adb6ad4db..b3e66b8f65ab 100644
> --- a/net/sunrpc/xprtrdma/rpc_rdma.c
> +++ b/net/sunrpc/xprtrdma/rpc_rdma.c
> @@ -215,7 +215,7 @@ rpcrdma_convert_kvec(struct kvec *vec, struct rpcrdma_mr_seg *seg,
> {
> if (vec->iov_len) {
> seg->mr_page = virt_to_page(vec->iov_base);
> - seg->mr_offset = vec->iov_base;
> + seg->mr_offset = offset_in_page(vec->iov_base);
> seg->mr_len = vec->iov_len;
> ++seg;
> ++(*n);
> @@ -248,7 +248,7 @@ rpcrdma_convert_iovs(struct rpcrdma_xprt *r_xprt, struct xdr_buf *xdrbuf,
> page_base = offset_in_page(xdrbuf->page_base);
> while (len) {
> seg->mr_page = *ppages;
> - seg->mr_offset = (char *)page_base;
> + seg->mr_offset = page_base;
> seg->mr_len = min_t(u32, PAGE_SIZE - page_base, len);
> len -= seg->mr_len;
> ++ppages;
> diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
> index 02971e183989..ed1c5444fb9d 100644
> --- a/net/sunrpc/xprtrdma/xprt_rdma.h
> +++ b/net/sunrpc/xprtrdma/xprt_rdma.h
> @@ -287,7 +287,7 @@ enum {
> 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 */
> + u64 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:11 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
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 [this message]
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=d0bbab3e-851c-3388-3d1c-cbc6249a6803@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 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.