From: Chuck Lever <chuck.lever@oracle.com>
To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v2 03/21] xprtrdma: Clean up rpcrdma_create_req()
Date: Tue, 16 Apr 2019 09:37:06 -0400 [thread overview]
Message-ID: <20190416133706.23113.32437.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20190416133156.23113.91846.stgit@manet.1015granger.net>
Eventually, I'd like to invoke rpcrdma_create_req() during the
call_reserve step. Memory allocation there probably needs to use
GFP_NOIO. Therefore a set of GFP flags needs to be passed in.
As an additional clean up, just return a pointer or NULL, because
the only error return code here is -ENOMEM.
Lastly, clean up the function names to be consistent with the
pattern: "rpcrdma" _ object-type _ action
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
net/sunrpc/xprtrdma/backchannel.c | 6 +++---
net/sunrpc/xprtrdma/verbs.c | 29 ++++++++++++++++-------------
net/sunrpc/xprtrdma/xprt_rdma.h | 3 ++-
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c
index d79b18c..713961a 100644
--- a/net/sunrpc/xprtrdma/backchannel.c
+++ b/net/sunrpc/xprtrdma/backchannel.c
@@ -31,9 +31,9 @@ static int rpcrdma_bc_setup_reqs(struct rpcrdma_xprt *r_xprt,
struct rpcrdma_regbuf *rb;
size_t size;
- req = rpcrdma_create_req(r_xprt);
- if (IS_ERR(req))
- return PTR_ERR(req);
+ req = rpcrdma_req_create(r_xprt, GFP_KERNEL);
+ if (!req)
+ return -ENOMEM;
rqst = &req->rl_slot;
rqst->rq_xprt = xprt;
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 30cfc0e..71fc41f 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -996,22 +996,27 @@ struct rpcrdma_sendctx *rpcrdma_sendctx_get_locked(struct rpcrdma_buffer *buf)
rpcrdma_mrs_create(r_xprt);
}
-struct rpcrdma_req *
-rpcrdma_create_req(struct rpcrdma_xprt *r_xprt)
+/**
+ * rpcrdma_req_create - Allocate an rpcrdma_req object
+ * @r_xprt: controlling r_xprt
+ * @flags: GFP flags passed to memory allocators
+ *
+ * Returns an allocated and fully initialized rpcrdma_req or NULL.
+ */
+struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, gfp_t flags)
{
struct rpcrdma_buffer *buffer = &r_xprt->rx_buf;
struct rpcrdma_regbuf *rb;
struct rpcrdma_req *req;
- req = kzalloc(sizeof(*req), GFP_KERNEL);
+ req = kzalloc(sizeof(*req), flags);
if (req == NULL)
- return ERR_PTR(-ENOMEM);
+ return NULL;
- rb = rpcrdma_alloc_regbuf(RPCRDMA_HDRBUF_SIZE,
- DMA_TO_DEVICE, GFP_KERNEL);
+ rb = rpcrdma_alloc_regbuf(RPCRDMA_HDRBUF_SIZE, DMA_TO_DEVICE, flags);
if (IS_ERR(rb)) {
kfree(req);
- return ERR_PTR(-ENOMEM);
+ return NULL;
}
req->rl_rdmabuf = rb;
xdr_buf_init(&req->rl_hdrbuf, rb->rg_base, rdmab_length(rb));
@@ -1086,16 +1091,14 @@ struct rpcrdma_req *
INIT_LIST_HEAD(&buf->rb_send_bufs);
INIT_LIST_HEAD(&buf->rb_allreqs);
+
+ rc = -ENOMEM;
for (i = 0; i < buf->rb_max_requests; i++) {
struct rpcrdma_req *req;
- req = rpcrdma_create_req(r_xprt);
- if (IS_ERR(req)) {
- dprintk("RPC: %s: request buffer %d alloc"
- " failed\n", __func__, i);
- rc = PTR_ERR(req);
+ req = rpcrdma_req_create(r_xprt, GFP_KERNEL);
+ if (!req)
goto out;
- }
list_add(&req->rl_list, &buf->rb_send_bufs);
}
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 10f6593..539558f 100644
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -528,7 +528,8 @@ int rpcrdma_ep_post(struct rpcrdma_ia *, struct rpcrdma_ep *,
/*
* Buffer calls - xprtrdma/verbs.c
*/
-struct rpcrdma_req *rpcrdma_create_req(struct rpcrdma_xprt *);
+struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt,
+ gfp_t flags);
void rpcrdma_req_destroy(struct rpcrdma_req *req);
int rpcrdma_buffer_create(struct rpcrdma_xprt *);
void rpcrdma_buffer_destroy(struct rpcrdma_buffer *);
next prev parent reply other threads:[~2019-04-16 13:37 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 ` Chuck Lever [this message]
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 ` [PATCH v2 16/21] xprtrdma: Remove rpcrdma_create_data_internal::rsize and wsize Chuck Lever
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=20190416133706.23113.32437.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).