From: Chuck Lever <chuck.lever@oracle.com>
To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v2 16/21] xprtrdma: Remove rpcrdma_create_data_internal::rsize and wsize
Date: Tue, 16 Apr 2019 09:38:16 -0400 [thread overview]
Message-ID: <20190416133816.23113.56168.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20190416133156.23113.91846.stgit@manet.1015granger.net>
Clean up.
xprt_rdma_max_inline_{read,write} cannot be set to large values
by virtue of proc_dointvec_minmax. The current maximum is
RPCRDMA_MAX_INLINE, which is much smaller than RPCRDMA_MAX_SEGS *
PAGE_SIZE.
The .rsize and .wsize fields are otherwise unused in the current
code base, and thus can be removed.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
net/sunrpc/xprtrdma/transport.c | 9 ---------
net/sunrpc/xprtrdma/xprt_rdma.h | 2 --
2 files changed, 11 deletions(-)
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 47d2e00..f362642 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -350,17 +350,8 @@
xprt_rdma_format_addresses(xprt, sap);
cdata.max_requests = xprt_rdma_slot_table_entries;
-
- cdata.rsize = RPCRDMA_MAX_SEGS * PAGE_SIZE; /* RDMA write max */
- cdata.wsize = RPCRDMA_MAX_SEGS * PAGE_SIZE; /* RDMA read max */
-
cdata.inline_wsize = xprt_rdma_max_inline_write;
- if (cdata.inline_wsize > cdata.wsize)
- cdata.inline_wsize = cdata.wsize;
-
cdata.inline_rsize = xprt_rdma_max_inline_read;
- if (cdata.inline_rsize > cdata.rsize)
- cdata.inline_rsize = cdata.rsize;
/*
* Create new transport instance, which includes initialized
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 40912bb..d34371d 100644
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -419,8 +419,6 @@ enum {
*/
struct rpcrdma_create_data_internal {
unsigned int max_requests; /* max requests (slots) in flight */
- unsigned int rsize; /* mount rsize - max read hdr+data */
- unsigned int wsize; /* mount wsize - max write hdr+data */
unsigned int inline_rsize; /* max non-rdma read data payload */
unsigned int inline_wsize; /* max non-rdma write data payload */
};
next prev parent reply other threads:[~2019-04-16 13:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 13:36 [PATCH v2 00/21] Proposed NFS/RDMA patches for v5.2 Chuck Lever
2019-04-16 13:36 ` [PATCH v2 01/21] SUNRPC: Avoid digging into the ATOMIC pool Chuck Lever
2019-04-16 13:37 ` [PATCH v2 02/21] xprtrdma: Fix an frwr_map recovery nit Chuck Lever
2019-04-16 13:37 ` [PATCH v2 03/21] xprtrdma: Clean up rpcrdma_create_req() Chuck Lever
2019-04-16 13:37 ` [PATCH v2 04/21] xprtrdma: Clean up rpcrdma_create_rep() and rpcrdma_destroy_rep() Chuck Lever
2019-04-16 13:37 ` [PATCH v2 05/21] xprtrdma: rpcrdma_regbuf alignment Chuck Lever
2019-04-16 13:37 ` [PATCH v2 06/21] xprtrdma: Allocate req's regbufs at xprt create time Chuck Lever
2019-04-16 13:37 ` [PATCH v2 07/21] xprtrdma: De-duplicate "allocate new, free old regbuf" Chuck Lever
2019-04-16 13:37 ` [PATCH v2 08/21] xprtrdma: Clean up regbuf helpers Chuck Lever
2019-04-16 13:37 ` [PATCH v2 09/21] xprtrdma: Backchannel can use GFP_KERNEL allocations Chuck Lever
2019-04-16 13:37 ` [PATCH v2 10/21] xprtrdma: Increase maximum number of backchannel request Chuck Lever
2019-04-16 13:37 ` [PATCH v2 11/21] xprtrdma: Trace marshaling failures Chuck Lever
2019-04-16 13:37 ` [PATCH v2 12/21] xprtrdma: Clean up sendctx functions Chuck Lever
2019-04-16 13:38 ` [PATCH v2 13/21] xprtrdma: More Send completion batching Chuck Lever
2019-04-16 13:38 ` [PATCH v2 14/21] xprtrdma: Eliminate rpcrdma_ia::ri_device Chuck Lever
2019-04-16 13:38 ` [PATCH v2 15/21] SUNRPC: Update comments based on recent changes Chuck Lever
2019-04-16 13:38 ` Chuck Lever [this message]
2019-04-16 13:38 ` [PATCH v2 17/21] xprtrdma: Aggregate the inline settings in struct rpcrdma_ep Chuck Lever
2019-04-16 13:38 ` [PATCH v2 18/21] xprtrdma: Eliminate struct rpcrdma_create_data_internal Chuck Lever
2019-04-16 13:38 ` [PATCH v2 19/21] xprtrdma: Remove pr_err() call sites from completion handlers Chuck Lever
2019-04-16 13:38 ` [PATCH v2 20/21] xprtrdma: Update comments that reference ib_drain_qp Chuck Lever
2019-04-16 13:38 ` [PATCH v2 21/21] xprtrdma: Remove stale comment 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=20190416133816.23113.56168.stgit@manet.1015granger.net \
--to=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).