2007-09-11 01:50:12 +08:00
|
|
|
/*
|
2007-09-11 01:51:18 +08:00
|
|
|
* Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
|
|
|
|
*
|
|
|
|
* This software is available to you under a choice of one of two
|
|
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
|
|
* General Public License (GPL) Version 2, available from the file
|
|
|
|
* COPYING in the main directory of this source tree, or the BSD-type
|
|
|
|
* license below:
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
*
|
|
|
|
* Redistributions in binary form must reproduce the above
|
|
|
|
* copyright notice, this list of conditions and the following
|
|
|
|
* disclaimer in the documentation and/or other materials provided
|
|
|
|
* with the distribution.
|
|
|
|
*
|
|
|
|
* Neither the name of the Network Appliance, Inc. nor the names of
|
|
|
|
* its contributors may be used to endorse or promote products
|
|
|
|
* derived from this software without specific prior written
|
|
|
|
* permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
2007-09-11 01:50:12 +08:00
|
|
|
*/
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
/*
|
|
|
|
* verbs.c
|
|
|
|
*
|
|
|
|
* Encapsulates the major functions managing:
|
|
|
|
* o adapters
|
|
|
|
* o endpoints
|
|
|
|
* o connections
|
|
|
|
* o buffer memory
|
|
|
|
*/
|
|
|
|
|
2011-06-06 18:43:46 +08:00
|
|
|
#include <linux/interrupt.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2015-01-22 00:03:02 +08:00
|
|
|
#include <linux/prefetch.h>
|
2015-03-31 02:33:43 +08:00
|
|
|
#include <linux/sunrpc/addr.h>
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
#include <linux/sunrpc/svc_rdma.h>
|
xprtrdma: Reduce the number of hardway buffer allocations
While marshaling an RPC/RDMA request, the inline_{rsize,wsize}
settings determine whether an inline request is used, or whether
read or write chunks lists are built. The current default value of
these settings is 1024. Any RPC request smaller than 1024 bytes is
sent to the NFS server completely inline.
rpcrdma_buffer_create() allocates and pre-registers a set of RPC
buffers for each transport instance, also based on the inline rsize
and wsize settings.
RPC/RDMA requests and replies are built in these buffers. However,
if an RPC/RDMA request is expected to be larger than 1024, a buffer
has to be allocated and registered for that RPC, and deregistered
and released when the RPC is complete. This is known has a
"hardway allocation."
Since the introduction of NFSv4, the size of RPC requests has become
larger, and hardway allocations are thus more frequent. Hardway
allocations are significant overhead, and they waste the existing
RPC buffers pre-allocated by rpcrdma_buffer_create().
We'd like fewer hardway allocations.
Increasing the size of the pre-registered buffers is the most direct
way to do this. However, a blanket increase of the inline thresholds
has interoperability consequences.
On my 64-bit system, rpcrdma_buffer_create() requests roughly 7000
bytes for each RPC request buffer, using kmalloc(). Due to internal
fragmentation, this wastes nearly 1200 bytes because kmalloc()
already returns an 8192-byte piece of memory for a 7000-byte
allocation request, though the extra space remains unused.
So let's round up the size of the pre-allocated buffers, and make
use of the unused space in the kmalloc'd memory.
This change reduces the amount of hardway allocated memory for an
NFSv4 general connectathon run from 1322092 to 9472 bytes (99%).
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2014-05-28 22:33:59 +08:00
|
|
|
#include <asm/bitops.h>
|
2015-08-04 01:05:04 +08:00
|
|
|
#include <linux/module.h> /* try_module_get()/module_put() */
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2007-09-11 01:50:12 +08:00
|
|
|
#include "xprt_rdma.h"
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
/*
|
|
|
|
* Globals/Macros
|
|
|
|
*/
|
|
|
|
|
2014-11-18 05:58:04 +08:00
|
|
|
#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
|
2007-09-11 01:51:18 +08:00
|
|
|
# define RPCDBG_FACILITY RPCDBG_TRANS
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* internal functions
|
|
|
|
*/
|
|
|
|
|
2015-10-25 05:27:10 +08:00
|
|
|
static struct workqueue_struct *rpcrdma_receive_wq;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2015-10-25 05:27:10 +08:00
|
|
|
int
|
|
|
|
rpcrdma_alloc_wq(void)
|
2007-09-11 01:51:18 +08:00
|
|
|
{
|
2015-10-25 05:27:10 +08:00
|
|
|
struct workqueue_struct *recv_wq;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2015-10-25 05:27:10 +08:00
|
|
|
recv_wq = alloc_workqueue("xprtrdma_receive",
|
|
|
|
WQ_MEM_RECLAIM | WQ_UNBOUND | WQ_HIGHPRI,
|
|
|
|
0);
|
|
|
|
if (!recv_wq)
|
|
|
|
return -ENOMEM;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2015-10-25 05:27:10 +08:00
|
|
|
rpcrdma_receive_wq = recv_wq;
|
|
|
|
return 0;
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
2015-10-25 05:27:10 +08:00
|
|
|
void
|
|
|
|
rpcrdma_destroy_wq(void)
|
2014-11-09 09:14:37 +08:00
|
|
|
{
|
2015-10-25 05:27:10 +08:00
|
|
|
struct workqueue_struct *wq;
|
2014-11-09 09:14:37 +08:00
|
|
|
|
2015-10-25 05:27:10 +08:00
|
|
|
if (rpcrdma_receive_wq) {
|
|
|
|
wq = rpcrdma_receive_wq;
|
|
|
|
rpcrdma_receive_wq = NULL;
|
|
|
|
destroy_workqueue(wq);
|
|
|
|
}
|
2014-11-09 09:14:37 +08:00
|
|
|
}
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
static void
|
|
|
|
rpcrdma_qp_async_error_upcall(struct ib_event *event, void *context)
|
|
|
|
{
|
|
|
|
struct rpcrdma_ep *ep = context;
|
|
|
|
|
2016-11-29 23:53:21 +08:00
|
|
|
pr_err("rpcrdma: %s on device %s ep %p\n",
|
|
|
|
ib_event_msg(event->event), event->device->name, context);
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
if (ep->rep_connected == 1) {
|
|
|
|
ep->rep_connected = -EIO;
|
2015-01-22 00:03:11 +08:00
|
|
|
rpcrdma_conn_func(ep);
|
2007-09-11 01:51:18 +08:00
|
|
|
wake_up_all(&ep->rep_connect_wait);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-05 00:28:53 +08:00
|
|
|
/**
|
|
|
|
* rpcrdma_wc_send - Invoked by RDMA provider for each polled Send WC
|
|
|
|
* @cq: completion queue (ignored)
|
|
|
|
* @wc: completed WR
|
|
|
|
*
|
2014-05-28 22:33:25 +08:00
|
|
|
*/
|
|
|
|
static void
|
2016-03-05 00:28:53 +08:00
|
|
|
rpcrdma_wc_send(struct ib_cq *cq, struct ib_wc *wc)
|
2014-05-28 22:33:25 +08:00
|
|
|
{
|
2016-03-05 00:28:53 +08:00
|
|
|
/* WARNING: Only wr_cqe and status are reliable at this point */
|
|
|
|
if (wc->status != IB_WC_SUCCESS && wc->status != IB_WC_WR_FLUSH_ERR)
|
|
|
|
pr_err("rpcrdma: Send: %s (%u/0x%x)\n",
|
|
|
|
ib_wc_status_msg(wc->status),
|
|
|
|
wc->status, wc->vendor_err);
|
2014-05-28 22:33:25 +08:00
|
|
|
}
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2016-03-05 00:28:27 +08:00
|
|
|
/* Perform basic sanity checking to avoid using garbage
|
|
|
|
* to update the credit grant value.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
rpcrdma_update_granted_credits(struct rpcrdma_rep *rep)
|
|
|
|
{
|
|
|
|
struct rpcrdma_msg *rmsgp = rdmab_to_msg(rep->rr_rdmabuf);
|
|
|
|
struct rpcrdma_buffer *buffer = &rep->rr_rxprt->rx_buf;
|
|
|
|
u32 credits;
|
|
|
|
|
|
|
|
if (rep->rr_len < RPCRDMA_HDRLEN_ERR)
|
|
|
|
return;
|
|
|
|
|
|
|
|
credits = be32_to_cpu(rmsgp->rm_credit);
|
|
|
|
if (credits == 0)
|
|
|
|
credits = 1; /* don't deadlock */
|
|
|
|
else if (credits > buffer->rb_max_requests)
|
|
|
|
credits = buffer->rb_max_requests;
|
|
|
|
|
|
|
|
atomic_set(&buffer->rb_credits, credits);
|
|
|
|
}
|
|
|
|
|
2016-03-05 00:28:36 +08:00
|
|
|
/**
|
2016-09-15 22:57:49 +08:00
|
|
|
* rpcrdma_wc_receive - Invoked by RDMA provider for each polled Receive WC
|
2016-03-05 00:28:36 +08:00
|
|
|
* @cq: completion queue (ignored)
|
|
|
|
* @wc: completed WR
|
|
|
|
*
|
|
|
|
*/
|
2014-05-28 22:33:25 +08:00
|
|
|
static void
|
2016-09-15 22:57:49 +08:00
|
|
|
rpcrdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc)
|
2014-05-28 22:33:25 +08:00
|
|
|
{
|
2016-03-05 00:28:36 +08:00
|
|
|
struct ib_cqe *cqe = wc->wr_cqe;
|
|
|
|
struct rpcrdma_rep *rep = container_of(cqe, struct rpcrdma_rep,
|
|
|
|
rr_cqe);
|
2014-05-28 22:33:25 +08:00
|
|
|
|
2015-01-22 00:02:04 +08:00
|
|
|
/* WARNING: Only wr_id and status are reliable at this point */
|
|
|
|
if (wc->status != IB_WC_SUCCESS)
|
|
|
|
goto out_fail;
|
2014-05-28 22:33:25 +08:00
|
|
|
|
2015-01-22 00:02:04 +08:00
|
|
|
/* status == SUCCESS means all fields in wc are trustworthy */
|
2014-05-28 22:33:25 +08:00
|
|
|
if (wc->opcode != IB_WC_RECV)
|
|
|
|
return;
|
|
|
|
|
2015-01-22 00:02:04 +08:00
|
|
|
dprintk("RPC: %s: rep %p opcode 'recv', length %u: success\n",
|
|
|
|
__func__, rep, wc->byte_len);
|
|
|
|
|
2014-05-28 22:33:25 +08:00
|
|
|
rep->rr_len = wc->byte_len;
|
2016-09-15 22:57:16 +08:00
|
|
|
rep->rr_wc_flags = wc->wc_flags;
|
|
|
|
rep->rr_inv_rkey = wc->ex.invalidate_rkey;
|
|
|
|
|
2015-05-26 23:51:56 +08:00
|
|
|
ib_dma_sync_single_for_cpu(rep->rr_device,
|
2015-01-22 00:04:25 +08:00
|
|
|
rdmab_addr(rep->rr_rdmabuf),
|
|
|
|
rep->rr_len, DMA_FROM_DEVICE);
|
2016-03-05 00:28:27 +08:00
|
|
|
|
|
|
|
rpcrdma_update_granted_credits(rep);
|
2014-05-28 22:33:25 +08:00
|
|
|
|
|
|
|
out_schedule:
|
2015-10-25 05:27:10 +08:00
|
|
|
queue_work(rpcrdma_receive_wq, &rep->rr_work);
|
2015-01-22 00:02:04 +08:00
|
|
|
return;
|
2015-10-25 05:27:10 +08:00
|
|
|
|
2015-01-22 00:02:04 +08:00
|
|
|
out_fail:
|
|
|
|
if (wc->status != IB_WC_WR_FLUSH_ERR)
|
2016-03-05 00:28:36 +08:00
|
|
|
pr_err("rpcrdma: Recv: %s (%u/0x%x)\n",
|
|
|
|
ib_wc_status_msg(wc->status),
|
|
|
|
wc->status, wc->vendor_err);
|
2015-10-25 05:26:54 +08:00
|
|
|
rep->rr_len = RPCRDMA_BAD_LEN;
|
2015-01-22 00:02:04 +08:00
|
|
|
goto out_schedule;
|
2014-05-28 22:33:25 +08:00
|
|
|
}
|
|
|
|
|
2016-09-15 22:57:07 +08:00
|
|
|
static void
|
|
|
|
rpcrdma_update_connect_private(struct rpcrdma_xprt *r_xprt,
|
|
|
|
struct rdma_conn_param *param)
|
|
|
|
{
|
|
|
|
struct rpcrdma_create_data_internal *cdata = &r_xprt->rx_data;
|
|
|
|
const struct rpcrdma_connect_private *pmsg = param->private_data;
|
|
|
|
unsigned int rsize, wsize;
|
|
|
|
|
2016-09-15 22:57:16 +08:00
|
|
|
/* Default settings for RPC-over-RDMA Version One */
|
|
|
|
r_xprt->rx_ia.ri_reminv_expected = false;
|
2017-02-09 05:59:54 +08:00
|
|
|
r_xprt->rx_ia.ri_implicit_roundup = xprt_rdma_pad_optimize;
|
2016-09-15 22:57:07 +08:00
|
|
|
rsize = RPCRDMA_V1_DEF_INLINE_SIZE;
|
|
|
|
wsize = RPCRDMA_V1_DEF_INLINE_SIZE;
|
|
|
|
|
|
|
|
if (pmsg &&
|
|
|
|
pmsg->cp_magic == rpcrdma_cmp_magic &&
|
|
|
|
pmsg->cp_version == RPCRDMA_CMP_VERSION) {
|
2016-09-15 22:57:16 +08:00
|
|
|
r_xprt->rx_ia.ri_reminv_expected = true;
|
2017-02-09 06:00:02 +08:00
|
|
|
r_xprt->rx_ia.ri_implicit_roundup = true;
|
2016-09-15 22:57:07 +08:00
|
|
|
rsize = rpcrdma_decode_buffer_size(pmsg->cp_send_size);
|
|
|
|
wsize = rpcrdma_decode_buffer_size(pmsg->cp_recv_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rsize < cdata->inline_rsize)
|
|
|
|
cdata->inline_rsize = rsize;
|
|
|
|
if (wsize < cdata->inline_wsize)
|
|
|
|
cdata->inline_wsize = wsize;
|
2016-11-29 23:53:13 +08:00
|
|
|
dprintk("RPC: %s: max send %u, max recv %u\n",
|
|
|
|
__func__, cdata->inline_wsize, cdata->inline_rsize);
|
2016-09-15 22:57:07 +08:00
|
|
|
rpcrdma_set_max_header_sizes(r_xprt);
|
|
|
|
}
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
static int
|
|
|
|
rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)
|
|
|
|
{
|
|
|
|
struct rpcrdma_xprt *xprt = id->context;
|
|
|
|
struct rpcrdma_ia *ia = &xprt->rx_ia;
|
|
|
|
struct rpcrdma_ep *ep = &xprt->rx_ep;
|
2014-11-18 05:58:04 +08:00
|
|
|
#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
|
2015-03-31 02:33:43 +08:00
|
|
|
struct sockaddr *sap = (struct sockaddr *)&ep->rep_remote_addr;
|
2008-11-26 08:58:42 +08:00
|
|
|
#endif
|
2015-01-22 00:03:35 +08:00
|
|
|
struct ib_qp_attr *attr = &ia->ri_qp_attr;
|
|
|
|
struct ib_qp_init_attr *iattr = &ia->ri_qp_init_attr;
|
2007-09-11 01:51:18 +08:00
|
|
|
int connstate = 0;
|
|
|
|
|
|
|
|
switch (event->event) {
|
|
|
|
case RDMA_CM_EVENT_ADDR_RESOLVED:
|
|
|
|
case RDMA_CM_EVENT_ROUTE_RESOLVED:
|
2008-10-10 03:01:41 +08:00
|
|
|
ia->ri_async_rc = 0;
|
2007-09-11 01:51:18 +08:00
|
|
|
complete(&ia->ri_done);
|
|
|
|
break;
|
|
|
|
case RDMA_CM_EVENT_ADDR_ERROR:
|
|
|
|
ia->ri_async_rc = -EHOSTUNREACH;
|
|
|
|
dprintk("RPC: %s: CM address resolution error, ep 0x%p\n",
|
|
|
|
__func__, ep);
|
|
|
|
complete(&ia->ri_done);
|
|
|
|
break;
|
|
|
|
case RDMA_CM_EVENT_ROUTE_ERROR:
|
|
|
|
ia->ri_async_rc = -ENETUNREACH;
|
|
|
|
dprintk("RPC: %s: CM route resolution error, ep 0x%p\n",
|
|
|
|
__func__, ep);
|
|
|
|
complete(&ia->ri_done);
|
|
|
|
break;
|
|
|
|
case RDMA_CM_EVENT_ESTABLISHED:
|
|
|
|
connstate = 1;
|
2015-01-22 00:03:35 +08:00
|
|
|
ib_query_qp(ia->ri_id->qp, attr,
|
|
|
|
IB_QP_MAX_QP_RD_ATOMIC | IB_QP_MAX_DEST_RD_ATOMIC,
|
|
|
|
iattr);
|
2007-09-11 01:51:18 +08:00
|
|
|
dprintk("RPC: %s: %d responder resources"
|
|
|
|
" (%d initiator)\n",
|
2015-01-22 00:03:35 +08:00
|
|
|
__func__, attr->max_dest_rd_atomic,
|
|
|
|
attr->max_rd_atomic);
|
2016-09-15 22:57:07 +08:00
|
|
|
rpcrdma_update_connect_private(xprt, &event->param.conn);
|
2007-09-11 01:51:18 +08:00
|
|
|
goto connected;
|
|
|
|
case RDMA_CM_EVENT_CONNECT_ERROR:
|
|
|
|
connstate = -ENOTCONN;
|
|
|
|
goto connected;
|
|
|
|
case RDMA_CM_EVENT_UNREACHABLE:
|
|
|
|
connstate = -ENETDOWN;
|
|
|
|
goto connected;
|
|
|
|
case RDMA_CM_EVENT_REJECTED:
|
|
|
|
connstate = -ECONNREFUSED;
|
|
|
|
goto connected;
|
|
|
|
case RDMA_CM_EVENT_DISCONNECTED:
|
|
|
|
connstate = -ECONNABORTED;
|
|
|
|
goto connected;
|
|
|
|
case RDMA_CM_EVENT_DEVICE_REMOVAL:
|
|
|
|
connstate = -ENODEV;
|
|
|
|
connected:
|
|
|
|
dprintk("RPC: %s: %sconnected\n",
|
|
|
|
__func__, connstate > 0 ? "" : "dis");
|
2016-03-05 00:28:27 +08:00
|
|
|
atomic_set(&xprt->rx_buf.rb_credits, 1);
|
2007-09-11 01:51:18 +08:00
|
|
|
ep->rep_connected = connstate;
|
2015-01-22 00:03:11 +08:00
|
|
|
rpcrdma_conn_func(ep);
|
2007-09-11 01:51:18 +08:00
|
|
|
wake_up_all(&ep->rep_connect_wait);
|
2014-07-30 05:26:12 +08:00
|
|
|
/*FALLTHROUGH*/
|
2007-09-11 01:51:18 +08:00
|
|
|
default:
|
2015-03-31 02:33:43 +08:00
|
|
|
dprintk("RPC: %s: %pIS:%u (ep 0x%p): %s\n",
|
|
|
|
__func__, sap, rpc_get_port(sap), ep,
|
2015-05-18 18:40:32 +08:00
|
|
|
rdma_event_msg(event->event));
|
2007-09-11 01:51:18 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-11-18 05:58:04 +08:00
|
|
|
#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
|
2008-10-10 03:02:02 +08:00
|
|
|
if (connstate == 1) {
|
2015-01-22 00:03:35 +08:00
|
|
|
int ird = attr->max_dest_rd_atomic;
|
2008-10-10 03:02:02 +08:00
|
|
|
int tird = ep->rep_remote_cma.responder_resources;
|
2015-03-31 02:33:43 +08:00
|
|
|
|
2015-03-31 02:34:21 +08:00
|
|
|
pr_info("rpcrdma: connection to %pIS:%u on %s, memreg '%s', %d credits, %d responders%s\n",
|
2015-03-31 02:33:43 +08:00
|
|
|
sap, rpc_get_port(sap),
|
2015-05-26 23:51:56 +08:00
|
|
|
ia->ri_device->name,
|
2015-03-31 02:34:21 +08:00
|
|
|
ia->ri_ops->ro_displayname,
|
2008-10-10 03:02:02 +08:00
|
|
|
xprt->rx_buf.rb_max_requests,
|
|
|
|
ird, ird < 4 && ird < tird / 2 ? " (low!)" : "");
|
|
|
|
} else if (connstate < 0) {
|
2015-03-31 02:33:43 +08:00
|
|
|
pr_info("rpcrdma: connection to %pIS:%u closed (%d)\n",
|
|
|
|
sap, rpc_get_port(sap), connstate);
|
2008-10-10 03:02:02 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-08-04 01:05:04 +08:00
|
|
|
static void rpcrdma_destroy_id(struct rdma_cm_id *id)
|
|
|
|
{
|
|
|
|
if (id) {
|
|
|
|
module_put(id->device->owner);
|
|
|
|
rdma_destroy_id(id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
static struct rdma_cm_id *
|
|
|
|
rpcrdma_create_id(struct rpcrdma_xprt *xprt,
|
|
|
|
struct rpcrdma_ia *ia, struct sockaddr *addr)
|
|
|
|
{
|
2016-11-29 23:52:40 +08:00
|
|
|
unsigned long wtimeout = msecs_to_jiffies(RDMA_RESOLVE_TIMEOUT) + 1;
|
2007-09-11 01:51:18 +08:00
|
|
|
struct rdma_cm_id *id;
|
|
|
|
int rc;
|
|
|
|
|
2008-10-10 03:01:31 +08:00
|
|
|
init_completion(&ia->ri_done);
|
|
|
|
|
2015-10-22 20:20:10 +08:00
|
|
|
id = rdma_create_id(&init_net, rpcrdma_conn_upcall, xprt, RDMA_PS_TCP,
|
|
|
|
IB_QPT_RC);
|
2007-09-11 01:51:18 +08:00
|
|
|
if (IS_ERR(id)) {
|
|
|
|
rc = PTR_ERR(id);
|
|
|
|
dprintk("RPC: %s: rdma_create_id() failed %i\n",
|
|
|
|
__func__, rc);
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2008-10-10 03:01:41 +08:00
|
|
|
ia->ri_async_rc = -ETIMEDOUT;
|
2007-09-11 01:51:18 +08:00
|
|
|
rc = rdma_resolve_addr(id, NULL, addr, RDMA_RESOLVE_TIMEOUT);
|
|
|
|
if (rc) {
|
|
|
|
dprintk("RPC: %s: rdma_resolve_addr() failed %i\n",
|
|
|
|
__func__, rc);
|
|
|
|
goto out;
|
|
|
|
}
|
2016-11-29 23:52:40 +08:00
|
|
|
rc = wait_for_completion_interruptible_timeout(&ia->ri_done, wtimeout);
|
|
|
|
if (rc < 0) {
|
|
|
|
dprintk("RPC: %s: wait() exited: %i\n",
|
|
|
|
__func__, rc);
|
|
|
|
goto out;
|
|
|
|
}
|
2015-08-04 01:05:04 +08:00
|
|
|
|
|
|
|
/* FIXME:
|
|
|
|
* Until xprtrdma supports DEVICE_REMOVAL, the provider must
|
|
|
|
* be pinned while there are active NFS/RDMA mounts to prevent
|
|
|
|
* hangs and crashes at umount time.
|
|
|
|
*/
|
|
|
|
if (!ia->ri_async_rc && !try_module_get(id->device->owner)) {
|
|
|
|
dprintk("RPC: %s: Failed to get device module\n",
|
|
|
|
__func__);
|
|
|
|
ia->ri_async_rc = -ENODEV;
|
|
|
|
}
|
2007-09-11 01:51:18 +08:00
|
|
|
rc = ia->ri_async_rc;
|
|
|
|
if (rc)
|
|
|
|
goto out;
|
|
|
|
|
2008-10-10 03:01:41 +08:00
|
|
|
ia->ri_async_rc = -ETIMEDOUT;
|
2007-09-11 01:51:18 +08:00
|
|
|
rc = rdma_resolve_route(id, RDMA_RESOLVE_TIMEOUT);
|
|
|
|
if (rc) {
|
|
|
|
dprintk("RPC: %s: rdma_resolve_route() failed %i\n",
|
|
|
|
__func__, rc);
|
2015-08-04 01:05:04 +08:00
|
|
|
goto put;
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
2016-11-29 23:52:40 +08:00
|
|
|
rc = wait_for_completion_interruptible_timeout(&ia->ri_done, wtimeout);
|
|
|
|
if (rc < 0) {
|
|
|
|
dprintk("RPC: %s: wait() exited: %i\n",
|
|
|
|
__func__, rc);
|
|
|
|
goto put;
|
|
|
|
}
|
2007-09-11 01:51:18 +08:00
|
|
|
rc = ia->ri_async_rc;
|
|
|
|
if (rc)
|
2015-08-04 01:05:04 +08:00
|
|
|
goto put;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
|
|
|
return id;
|
2015-08-04 01:05:04 +08:00
|
|
|
put:
|
|
|
|
module_put(id->device->owner);
|
2007-09-11 01:51:18 +08:00
|
|
|
out:
|
|
|
|
rdma_destroy_id(id);
|
|
|
|
return ERR_PTR(rc);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Exported functions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Open and initialize an Interface Adapter.
|
|
|
|
* o initializes fields of struct rpcrdma_ia, including
|
|
|
|
* interface and provider attributes and protection zone.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
|
|
|
|
{
|
|
|
|
struct rpcrdma_ia *ia = &xprt->rx_ia;
|
2015-08-04 01:03:30 +08:00
|
|
|
int rc;
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
ia->ri_id = rpcrdma_create_id(xprt, ia, addr);
|
|
|
|
if (IS_ERR(ia->ri_id)) {
|
|
|
|
rc = PTR_ERR(ia->ri_id);
|
|
|
|
goto out1;
|
|
|
|
}
|
2015-05-26 23:51:56 +08:00
|
|
|
ia->ri_device = ia->ri_id->device;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2016-09-05 18:56:17 +08:00
|
|
|
ia->ri_pd = ib_alloc_pd(ia->ri_device, 0);
|
2007-09-11 01:51:18 +08:00
|
|
|
if (IS_ERR(ia->ri_pd)) {
|
|
|
|
rc = PTR_ERR(ia->ri_pd);
|
2016-06-30 01:53:27 +08:00
|
|
|
pr_err("rpcrdma: ib_alloc_pd() returned %d\n", rc);
|
2007-09-11 01:51:18 +08:00
|
|
|
goto out2;
|
|
|
|
}
|
|
|
|
|
2008-10-10 03:00:09 +08:00
|
|
|
switch (memreg) {
|
2008-10-10 03:00:20 +08:00
|
|
|
case RPCRDMA_FRMR:
|
2016-06-30 01:53:27 +08:00
|
|
|
if (frwr_is_supported(ia)) {
|
|
|
|
ia->ri_ops = &rpcrdma_frwr_memreg_ops;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*FALLTHROUGH*/
|
2008-10-10 03:00:09 +08:00
|
|
|
case RPCRDMA_MTHCAFMR:
|
2016-06-30 01:53:27 +08:00
|
|
|
if (fmr_is_supported(ia)) {
|
|
|
|
ia->ri_ops = &rpcrdma_fmr_memreg_ops;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*FALLTHROUGH*/
|
2008-10-10 03:00:09 +08:00
|
|
|
default:
|
2016-06-30 01:53:27 +08:00
|
|
|
pr_err("rpcrdma: Unsupported memory registration mode: %d\n",
|
|
|
|
memreg);
|
|
|
|
rc = -EINVAL;
|
2015-01-22 00:03:19 +08:00
|
|
|
goto out3;
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2015-01-22 00:03:19 +08:00
|
|
|
|
|
|
|
out3:
|
|
|
|
ib_dealloc_pd(ia->ri_pd);
|
|
|
|
ia->ri_pd = NULL;
|
2007-09-11 01:51:18 +08:00
|
|
|
out2:
|
2015-08-04 01:05:04 +08:00
|
|
|
rpcrdma_destroy_id(ia->ri_id);
|
2008-10-10 03:01:00 +08:00
|
|
|
ia->ri_id = NULL;
|
2007-09-11 01:51:18 +08:00
|
|
|
out1:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clean up/close an IA.
|
|
|
|
* o if event handles and PD have been initialized, free them.
|
|
|
|
* o close the IA
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
rpcrdma_ia_close(struct rpcrdma_ia *ia)
|
|
|
|
{
|
|
|
|
dprintk("RPC: %s: entering\n", __func__);
|
2008-10-10 03:01:00 +08:00
|
|
|
if (ia->ri_id != NULL && !IS_ERR(ia->ri_id)) {
|
|
|
|
if (ia->ri_id->qp)
|
|
|
|
rdma_destroy_qp(ia->ri_id);
|
2015-08-04 01:05:04 +08:00
|
|
|
rpcrdma_destroy_id(ia->ri_id);
|
2008-10-10 03:01:00 +08:00
|
|
|
ia->ri_id = NULL;
|
|
|
|
}
|
2015-05-26 23:51:27 +08:00
|
|
|
|
|
|
|
/* If the pd is still busy, xprtrdma missed freeing a resource */
|
|
|
|
if (ia->ri_pd && !IS_ERR(ia->ri_pd))
|
2015-08-06 04:34:31 +08:00
|
|
|
ib_dealloc_pd(ia->ri_pd);
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create unconnected endpoint.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia,
|
|
|
|
struct rpcrdma_create_data_internal *cdata)
|
|
|
|
{
|
2016-09-15 22:57:07 +08:00
|
|
|
struct rpcrdma_connect_private *pmsg = &ep->rep_cm_private;
|
2014-05-28 22:33:25 +08:00
|
|
|
struct ib_cq *sendcq, *recvcq;
|
2015-10-25 05:27:51 +08:00
|
|
|
unsigned int max_qp_wr;
|
2016-03-05 00:28:53 +08:00
|
|
|
int rc;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
xprtrdma: Use gathered Send for large inline messages
An RPC Call message that is sent inline but that has a data payload
(ie, one or more items in rq_snd_buf's page list) must be "pulled
up:"
- call_allocate has to reserve enough RPC Call buffer space to
accommodate the data payload
- call_transmit has to memcopy the rq_snd_buf's page list and tail
into its head iovec before it is sent
As the inline threshold is increased beyond its current 1KB default,
however, this means data payloads of more than a few KB are copied
by the host CPU. For example, if the inline threshold is increased
just to 4KB, then NFS WRITE requests up to 4KB would involve a
memcpy of the NFS WRITE's payload data into the RPC Call buffer.
This is an undesirable amount of participation by the host CPU.
The inline threshold may be much larger than 4KB in the future,
after negotiation with a peer server.
Instead of copying the components of rq_snd_buf into its head iovec,
construct a gather list of these components, and send them all in
place. The same approach is already used in the Linux server's
RPC-over-RDMA reply path.
This mechanism also eliminates the need for rpcrdma_tail_pullup,
which is used to manage the XDR pad and trailing inline content when
a Read list is present.
This requires that the pages in rq_snd_buf's page list be DMA-mapped
during marshaling, and unmapped when a data-bearing RPC is
completed. This is slightly less efficient for very small I/O
payloads, but significantly more efficient as data payload size and
inline threshold increase past a kilobyte.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:57:24 +08:00
|
|
|
if (ia->ri_device->attrs.max_sge < RPCRDMA_MAX_SEND_SGES) {
|
2015-08-04 01:03:39 +08:00
|
|
|
dprintk("RPC: %s: insufficient sge's available\n",
|
|
|
|
__func__);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2015-12-18 16:59:48 +08:00
|
|
|
if (ia->ri_device->attrs.max_qp_wr <= RPCRDMA_BACKWARD_WRS) {
|
2015-10-25 05:27:51 +08:00
|
|
|
dprintk("RPC: %s: insufficient wqe's available\n",
|
|
|
|
__func__);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2016-05-03 02:41:47 +08:00
|
|
|
max_qp_wr = ia->ri_device->attrs.max_qp_wr - RPCRDMA_BACKWARD_WRS - 1;
|
2015-10-25 05:27:51 +08:00
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
/* check provider's send/recv wr limits */
|
2015-10-25 05:27:51 +08:00
|
|
|
if (cdata->max_requests > max_qp_wr)
|
|
|
|
cdata->max_requests = max_qp_wr;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
|
|
|
ep->rep_attr.event_handler = rpcrdma_qp_async_error_upcall;
|
|
|
|
ep->rep_attr.qp_context = ep;
|
|
|
|
ep->rep_attr.srq = NULL;
|
|
|
|
ep->rep_attr.cap.max_send_wr = cdata->max_requests;
|
2015-10-25 05:27:51 +08:00
|
|
|
ep->rep_attr.cap.max_send_wr += RPCRDMA_BACKWARD_WRS;
|
2016-05-03 02:41:47 +08:00
|
|
|
ep->rep_attr.cap.max_send_wr += 1; /* drain cqe */
|
2015-03-31 02:35:26 +08:00
|
|
|
rc = ia->ri_ops->ro_open(ia, ep, cdata);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
2007-09-11 01:51:18 +08:00
|
|
|
ep->rep_attr.cap.max_recv_wr = cdata->max_requests;
|
2015-10-25 05:27:51 +08:00
|
|
|
ep->rep_attr.cap.max_recv_wr += RPCRDMA_BACKWARD_WRS;
|
2016-05-03 02:41:47 +08:00
|
|
|
ep->rep_attr.cap.max_recv_wr += 1; /* drain cqe */
|
xprtrdma: Use gathered Send for large inline messages
An RPC Call message that is sent inline but that has a data payload
(ie, one or more items in rq_snd_buf's page list) must be "pulled
up:"
- call_allocate has to reserve enough RPC Call buffer space to
accommodate the data payload
- call_transmit has to memcopy the rq_snd_buf's page list and tail
into its head iovec before it is sent
As the inline threshold is increased beyond its current 1KB default,
however, this means data payloads of more than a few KB are copied
by the host CPU. For example, if the inline threshold is increased
just to 4KB, then NFS WRITE requests up to 4KB would involve a
memcpy of the NFS WRITE's payload data into the RPC Call buffer.
This is an undesirable amount of participation by the host CPU.
The inline threshold may be much larger than 4KB in the future,
after negotiation with a peer server.
Instead of copying the components of rq_snd_buf into its head iovec,
construct a gather list of these components, and send them all in
place. The same approach is already used in the Linux server's
RPC-over-RDMA reply path.
This mechanism also eliminates the need for rpcrdma_tail_pullup,
which is used to manage the XDR pad and trailing inline content when
a Read list is present.
This requires that the pages in rq_snd_buf's page list be DMA-mapped
during marshaling, and unmapped when a data-bearing RPC is
completed. This is slightly less efficient for very small I/O
payloads, but significantly more efficient as data payload size and
inline threshold increase past a kilobyte.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:57:24 +08:00
|
|
|
ep->rep_attr.cap.max_send_sge = RPCRDMA_MAX_SEND_SGES;
|
2007-09-11 01:51:18 +08:00
|
|
|
ep->rep_attr.cap.max_recv_sge = 1;
|
|
|
|
ep->rep_attr.cap.max_inline_data = 0;
|
|
|
|
ep->rep_attr.sq_sig_type = IB_SIGNAL_REQ_WR;
|
|
|
|
ep->rep_attr.qp_type = IB_QPT_RC;
|
|
|
|
ep->rep_attr.port_num = ~0;
|
|
|
|
|
|
|
|
dprintk("RPC: %s: requested max: dtos: send %d recv %d; "
|
|
|
|
"iovs: send %d recv %d\n",
|
|
|
|
__func__,
|
|
|
|
ep->rep_attr.cap.max_send_wr,
|
|
|
|
ep->rep_attr.cap.max_recv_wr,
|
|
|
|
ep->rep_attr.cap.max_send_sge,
|
|
|
|
ep->rep_attr.cap.max_recv_sge);
|
|
|
|
|
|
|
|
/* set trigger for requesting send completion */
|
2014-05-28 22:33:25 +08:00
|
|
|
ep->rep_cqinit = ep->rep_attr.cap.max_send_wr/2 - 1;
|
2015-12-17 06:23:20 +08:00
|
|
|
if (ep->rep_cqinit <= 2)
|
|
|
|
ep->rep_cqinit = 0; /* always signal? */
|
2016-11-29 23:52:16 +08:00
|
|
|
rpcrdma_init_cqcount(ep, 0);
|
2007-09-11 01:51:18 +08:00
|
|
|
init_waitqueue_head(&ep->rep_connect_wait);
|
2014-05-28 22:32:17 +08:00
|
|
|
INIT_DELAYED_WORK(&ep->rep_connect_worker, rpcrdma_connect_worker);
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2016-03-05 00:28:53 +08:00
|
|
|
sendcq = ib_alloc_cq(ia->ri_device, NULL,
|
|
|
|
ep->rep_attr.cap.max_send_wr + 1,
|
|
|
|
0, IB_POLL_SOFTIRQ);
|
2014-05-28 22:33:25 +08:00
|
|
|
if (IS_ERR(sendcq)) {
|
|
|
|
rc = PTR_ERR(sendcq);
|
|
|
|
dprintk("RPC: %s: failed to create send CQ: %i\n",
|
2007-09-11 01:51:18 +08:00
|
|
|
__func__, rc);
|
|
|
|
goto out1;
|
|
|
|
}
|
|
|
|
|
2016-03-05 00:28:36 +08:00
|
|
|
recvcq = ib_alloc_cq(ia->ri_device, NULL,
|
|
|
|
ep->rep_attr.cap.max_recv_wr + 1,
|
|
|
|
0, IB_POLL_SOFTIRQ);
|
2014-05-28 22:33:25 +08:00
|
|
|
if (IS_ERR(recvcq)) {
|
|
|
|
rc = PTR_ERR(recvcq);
|
|
|
|
dprintk("RPC: %s: failed to create recv CQ: %i\n",
|
|
|
|
__func__, rc);
|
|
|
|
goto out2;
|
|
|
|
}
|
|
|
|
|
|
|
|
ep->rep_attr.send_cq = sendcq;
|
|
|
|
ep->rep_attr.recv_cq = recvcq;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
|
|
|
/* Initialize cma parameters */
|
2016-05-03 02:43:03 +08:00
|
|
|
memset(&ep->rep_remote_cma, 0, sizeof(ep->rep_remote_cma));
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2016-09-15 22:57:07 +08:00
|
|
|
/* Prepare RDMA-CM private message */
|
|
|
|
pmsg->cp_magic = rpcrdma_cmp_magic;
|
|
|
|
pmsg->cp_version = RPCRDMA_CMP_VERSION;
|
2016-09-15 22:57:16 +08:00
|
|
|
pmsg->cp_flags |= ia->ri_ops->ro_send_w_inv_ok;
|
2016-09-15 22:57:07 +08:00
|
|
|
pmsg->cp_send_size = rpcrdma_encode_buffer_size(cdata->inline_wsize);
|
|
|
|
pmsg->cp_recv_size = rpcrdma_encode_buffer_size(cdata->inline_rsize);
|
|
|
|
ep->rep_remote_cma.private_data = pmsg;
|
|
|
|
ep->rep_remote_cma.private_data_len = sizeof(*pmsg);
|
2007-09-11 01:51:18 +08:00
|
|
|
|
|
|
|
/* Client offers RDMA Read but does not initiate */
|
2008-10-10 03:00:30 +08:00
|
|
|
ep->rep_remote_cma.initiator_depth = 0;
|
2015-12-18 16:59:48 +08:00
|
|
|
if (ia->ri_device->attrs.max_qp_rd_atom > 32) /* arbitrary but <= 255 */
|
2008-10-10 03:00:30 +08:00
|
|
|
ep->rep_remote_cma.responder_resources = 32;
|
|
|
|
else
|
2015-01-22 00:03:27 +08:00
|
|
|
ep->rep_remote_cma.responder_resources =
|
2015-12-18 16:59:48 +08:00
|
|
|
ia->ri_device->attrs.max_qp_rd_atom;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2016-05-03 02:43:03 +08:00
|
|
|
/* Limit transport retries so client can detect server
|
|
|
|
* GID changes quickly. RPC layer handles re-establishing
|
|
|
|
* transport connection and retransmission.
|
|
|
|
*/
|
|
|
|
ep->rep_remote_cma.retry_count = 6;
|
|
|
|
|
|
|
|
/* RPC-over-RDMA handles its own flow control. In addition,
|
|
|
|
* make all RNR NAKs visible so we know that RPC-over-RDMA
|
|
|
|
* flow control is working correctly (no NAKs should be seen).
|
|
|
|
*/
|
2007-09-11 01:51:18 +08:00
|
|
|
ep->rep_remote_cma.flow_control = 0;
|
|
|
|
ep->rep_remote_cma.rnr_retry_count = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out2:
|
2016-03-05 00:28:53 +08:00
|
|
|
ib_free_cq(sendcq);
|
2007-09-11 01:51:18 +08:00
|
|
|
out1:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* rpcrdma_ep_destroy
|
|
|
|
*
|
|
|
|
* Disconnect and destroy endpoint. After this, the only
|
|
|
|
* valid operations on the ep are to free it (if dynamically
|
|
|
|
* allocated) or re-create it.
|
|
|
|
*/
|
2014-05-28 22:33:16 +08:00
|
|
|
void
|
2007-09-11 01:51:18 +08:00
|
|
|
rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia)
|
|
|
|
{
|
|
|
|
dprintk("RPC: %s: entering, connected is %d\n",
|
|
|
|
__func__, ep->rep_connected);
|
|
|
|
|
2014-05-28 22:32:17 +08:00
|
|
|
cancel_delayed_work_sync(&ep->rep_connect_worker);
|
|
|
|
|
2015-09-22 01:24:23 +08:00
|
|
|
if (ia->ri_id->qp) {
|
2016-05-03 02:41:47 +08:00
|
|
|
rpcrdma_ep_disconnect(ep, ia);
|
2008-10-10 03:01:00 +08:00
|
|
|
rdma_destroy_qp(ia->ri_id);
|
|
|
|
ia->ri_id->qp = NULL;
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
2016-03-05 00:28:36 +08:00
|
|
|
ib_free_cq(ep->rep_attr.recv_cq);
|
2016-03-05 00:28:53 +08:00
|
|
|
ib_free_cq(ep->rep_attr.send_cq);
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Connect unconnected endpoint.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
rpcrdma_ep_connect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia)
|
|
|
|
{
|
2014-07-30 05:23:25 +08:00
|
|
|
struct rdma_cm_id *id, *old;
|
2007-09-11 01:51:18 +08:00
|
|
|
int rc = 0;
|
|
|
|
int retry_count = 0;
|
|
|
|
|
2008-10-10 23:32:45 +08:00
|
|
|
if (ep->rep_connected != 0) {
|
2007-09-11 01:51:18 +08:00
|
|
|
struct rpcrdma_xprt *xprt;
|
|
|
|
retry:
|
2014-05-28 22:34:07 +08:00
|
|
|
dprintk("RPC: %s: reconnecting...\n", __func__);
|
2014-07-30 05:25:55 +08:00
|
|
|
|
|
|
|
rpcrdma_ep_disconnect(ep, ia);
|
2007-09-11 01:51:18 +08:00
|
|
|
|
|
|
|
xprt = container_of(ia, struct rpcrdma_xprt, rx_ia);
|
|
|
|
id = rpcrdma_create_id(xprt, ia,
|
|
|
|
(struct sockaddr *)&xprt->rx_data.addr);
|
|
|
|
if (IS_ERR(id)) {
|
2014-05-28 22:34:07 +08:00
|
|
|
rc = -EHOSTUNREACH;
|
2007-09-11 01:51:18 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* TEMP TEMP TEMP - fail if new device:
|
|
|
|
* Deregister/remarshal *all* requests!
|
|
|
|
* Close and recreate adapter, pd, etc!
|
|
|
|
* Re-determine all attributes still sane!
|
|
|
|
* More stuff I haven't thought of!
|
|
|
|
* Rrrgh!
|
|
|
|
*/
|
2015-05-26 23:51:56 +08:00
|
|
|
if (ia->ri_device != id->device) {
|
2007-09-11 01:51:18 +08:00
|
|
|
printk("RPC: %s: can't reconnect on "
|
|
|
|
"different device!\n", __func__);
|
2015-08-04 01:05:04 +08:00
|
|
|
rpcrdma_destroy_id(id);
|
2014-05-28 22:34:07 +08:00
|
|
|
rc = -ENETUNREACH;
|
2007-09-11 01:51:18 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* END TEMP */
|
2014-05-28 22:34:07 +08:00
|
|
|
rc = rdma_create_qp(id, ia->ri_pd, &ep->rep_attr);
|
|
|
|
if (rc) {
|
|
|
|
dprintk("RPC: %s: rdma_create_qp failed %i\n",
|
|
|
|
__func__, rc);
|
2015-08-04 01:05:04 +08:00
|
|
|
rpcrdma_destroy_id(id);
|
2014-05-28 22:34:07 +08:00
|
|
|
rc = -ENETUNREACH;
|
|
|
|
goto out;
|
|
|
|
}
|
2014-07-30 05:23:25 +08:00
|
|
|
|
|
|
|
old = ia->ri_id;
|
2007-09-11 01:51:18 +08:00
|
|
|
ia->ri_id = id;
|
2014-07-30 05:23:25 +08:00
|
|
|
|
|
|
|
rdma_destroy_qp(old);
|
2015-08-04 01:05:04 +08:00
|
|
|
rpcrdma_destroy_id(old);
|
2014-05-28 22:34:07 +08:00
|
|
|
} else {
|
|
|
|
dprintk("RPC: %s: connecting...\n", __func__);
|
|
|
|
rc = rdma_create_qp(ia->ri_id, ia->ri_pd, &ep->rep_attr);
|
|
|
|
if (rc) {
|
|
|
|
dprintk("RPC: %s: rdma_create_qp failed %i\n",
|
|
|
|
__func__, rc);
|
|
|
|
/* do not update ep->rep_connected */
|
|
|
|
return -ENETUNREACH;
|
|
|
|
}
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
ep->rep_connected = 0;
|
|
|
|
|
|
|
|
rc = rdma_connect(ia->ri_id, &ep->rep_remote_cma);
|
|
|
|
if (rc) {
|
|
|
|
dprintk("RPC: %s: rdma_connect() failed with %i\n",
|
|
|
|
__func__, rc);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
wait_event_interruptible(ep->rep_connect_wait, ep->rep_connected != 0);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check state. A non-peer reject indicates no listener
|
|
|
|
* (ECONNREFUSED), which may be a transient state. All
|
|
|
|
* others indicate a transport condition which has already
|
|
|
|
* undergone a best-effort.
|
|
|
|
*/
|
2009-11-30 08:55:45 +08:00
|
|
|
if (ep->rep_connected == -ECONNREFUSED &&
|
|
|
|
++retry_count <= RDMA_CONNECT_RETRY_MAX) {
|
2007-09-11 01:51:18 +08:00
|
|
|
dprintk("RPC: %s: non-peer_reject, retry\n", __func__);
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
if (ep->rep_connected <= 0) {
|
|
|
|
/* Sometimes, the only way to reliably connect to remote
|
|
|
|
* CMs is to use same nonzero values for ORD and IRD. */
|
2008-10-10 03:00:30 +08:00
|
|
|
if (retry_count++ <= RDMA_CONNECT_RETRY_MAX + 1 &&
|
|
|
|
(ep->rep_remote_cma.responder_resources == 0 ||
|
|
|
|
ep->rep_remote_cma.initiator_depth !=
|
|
|
|
ep->rep_remote_cma.responder_resources)) {
|
|
|
|
if (ep->rep_remote_cma.responder_resources == 0)
|
|
|
|
ep->rep_remote_cma.responder_resources = 1;
|
|
|
|
ep->rep_remote_cma.initiator_depth =
|
|
|
|
ep->rep_remote_cma.responder_resources;
|
2007-09-11 01:51:18 +08:00
|
|
|
goto retry;
|
2008-10-10 03:00:30 +08:00
|
|
|
}
|
2007-09-11 01:51:18 +08:00
|
|
|
rc = ep->rep_connected;
|
|
|
|
} else {
|
2015-10-25 05:27:43 +08:00
|
|
|
struct rpcrdma_xprt *r_xprt;
|
|
|
|
unsigned int extras;
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
dprintk("RPC: %s: connected\n", __func__);
|
2015-10-25 05:27:43 +08:00
|
|
|
|
|
|
|
r_xprt = container_of(ia, struct rpcrdma_xprt, rx_ia);
|
|
|
|
extras = r_xprt->rx_buf.rb_bc_srv_max_requests;
|
|
|
|
|
|
|
|
if (extras) {
|
|
|
|
rc = rpcrdma_ep_post_extra_recv(r_xprt, extras);
|
2015-11-05 16:37:08 +08:00
|
|
|
if (rc) {
|
2015-10-25 05:27:43 +08:00
|
|
|
pr_warn("%s: rpcrdma_ep_post_extra_recv: %i\n",
|
|
|
|
__func__, rc);
|
|
|
|
rc = 0;
|
2015-11-05 16:37:08 +08:00
|
|
|
}
|
2015-10-25 05:27:43 +08:00
|
|
|
}
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (rc)
|
|
|
|
ep->rep_connected = rc;
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* rpcrdma_ep_disconnect
|
|
|
|
*
|
|
|
|
* This is separate from destroy to facilitate the ability
|
|
|
|
* to reconnect without recreating the endpoint.
|
|
|
|
*
|
|
|
|
* This call is not reentrant, and must not be made in parallel
|
|
|
|
* on the same endpoint.
|
|
|
|
*/
|
2014-07-30 05:25:55 +08:00
|
|
|
void
|
2007-09-11 01:51:18 +08:00
|
|
|
rpcrdma_ep_disconnect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = rdma_disconnect(ia->ri_id);
|
|
|
|
if (!rc) {
|
|
|
|
/* returns without wait if not connected */
|
|
|
|
wait_event_interruptible(ep->rep_connect_wait,
|
|
|
|
ep->rep_connected != 1);
|
|
|
|
dprintk("RPC: %s: after wait, %sconnected\n", __func__,
|
|
|
|
(ep->rep_connected == 1) ? "still " : "dis");
|
|
|
|
} else {
|
|
|
|
dprintk("RPC: %s: rdma_disconnect %i\n", __func__, rc);
|
|
|
|
ep->rep_connected = rc;
|
|
|
|
}
|
2016-05-03 02:41:47 +08:00
|
|
|
|
|
|
|
ib_drain_qp(ia->ri_id->qp);
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
2016-06-30 01:52:54 +08:00
|
|
|
static void
|
|
|
|
rpcrdma_mr_recovery_worker(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct rpcrdma_buffer *buf = container_of(work, struct rpcrdma_buffer,
|
|
|
|
rb_recovery_worker.work);
|
|
|
|
struct rpcrdma_mw *mw;
|
|
|
|
|
|
|
|
spin_lock(&buf->rb_recovery_lock);
|
|
|
|
while (!list_empty(&buf->rb_stale_mrs)) {
|
|
|
|
mw = list_first_entry(&buf->rb_stale_mrs,
|
|
|
|
struct rpcrdma_mw, mw_list);
|
|
|
|
list_del_init(&mw->mw_list);
|
|
|
|
spin_unlock(&buf->rb_recovery_lock);
|
|
|
|
|
|
|
|
dprintk("RPC: %s: recovering MR %p\n", __func__, mw);
|
|
|
|
mw->mw_xprt->rx_ia.ri_ops->ro_recover_mr(mw);
|
|
|
|
|
|
|
|
spin_lock(&buf->rb_recovery_lock);
|
2016-07-16 06:02:05 +08:00
|
|
|
}
|
2016-06-30 01:52:54 +08:00
|
|
|
spin_unlock(&buf->rb_recovery_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
rpcrdma_defer_mr_recovery(struct rpcrdma_mw *mw)
|
|
|
|
{
|
|
|
|
struct rpcrdma_xprt *r_xprt = mw->mw_xprt;
|
|
|
|
struct rpcrdma_buffer *buf = &r_xprt->rx_buf;
|
|
|
|
|
|
|
|
spin_lock(&buf->rb_recovery_lock);
|
|
|
|
list_add(&mw->mw_list, &buf->rb_stale_mrs);
|
|
|
|
spin_unlock(&buf->rb_recovery_lock);
|
|
|
|
|
|
|
|
schedule_delayed_work(&buf->rb_recovery_worker, 0);
|
|
|
|
}
|
|
|
|
|
2016-06-30 01:54:00 +08:00
|
|
|
static void
|
|
|
|
rpcrdma_create_mrs(struct rpcrdma_xprt *r_xprt)
|
|
|
|
{
|
|
|
|
struct rpcrdma_buffer *buf = &r_xprt->rx_buf;
|
|
|
|
struct rpcrdma_ia *ia = &r_xprt->rx_ia;
|
|
|
|
unsigned int count;
|
|
|
|
LIST_HEAD(free);
|
|
|
|
LIST_HEAD(all);
|
|
|
|
|
|
|
|
for (count = 0; count < 32; count++) {
|
|
|
|
struct rpcrdma_mw *mw;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
mw = kzalloc(sizeof(*mw), GFP_KERNEL);
|
|
|
|
if (!mw)
|
|
|
|
break;
|
|
|
|
|
|
|
|
rc = ia->ri_ops->ro_init_mr(ia, mw);
|
|
|
|
if (rc) {
|
|
|
|
kfree(mw);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
mw->mw_xprt = r_xprt;
|
|
|
|
|
|
|
|
list_add(&mw->mw_list, &free);
|
|
|
|
list_add(&mw->mw_all, &all);
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_lock(&buf->rb_mwlock);
|
|
|
|
list_splice(&free, &buf->rb_mws);
|
|
|
|
list_splice(&all, &buf->rb_all);
|
|
|
|
r_xprt->rx_stats.mrs_allocated += count;
|
|
|
|
spin_unlock(&buf->rb_mwlock);
|
|
|
|
|
|
|
|
dprintk("RPC: %s: created %u MRs\n", __func__, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
rpcrdma_mr_refresh_worker(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct rpcrdma_buffer *buf = container_of(work, struct rpcrdma_buffer,
|
|
|
|
rb_refresh_worker.work);
|
|
|
|
struct rpcrdma_xprt *r_xprt = container_of(buf, struct rpcrdma_xprt,
|
|
|
|
rx_buf);
|
|
|
|
|
|
|
|
rpcrdma_create_mrs(r_xprt);
|
|
|
|
}
|
|
|
|
|
2015-10-25 05:27:43 +08:00
|
|
|
struct rpcrdma_req *
|
2015-01-22 00:03:52 +08:00
|
|
|
rpcrdma_create_req(struct rpcrdma_xprt *r_xprt)
|
|
|
|
{
|
2015-10-25 05:27:43 +08:00
|
|
|
struct rpcrdma_buffer *buffer = &r_xprt->rx_buf;
|
2015-01-22 00:03:52 +08:00
|
|
|
struct rpcrdma_req *req;
|
|
|
|
|
2015-01-22 00:04:16 +08:00
|
|
|
req = kzalloc(sizeof(*req), GFP_KERNEL);
|
2015-01-22 00:03:52 +08:00
|
|
|
if (req == NULL)
|
2015-01-22 00:04:16 +08:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2015-01-22 00:03:52 +08:00
|
|
|
|
2015-10-25 05:27:43 +08:00
|
|
|
INIT_LIST_HEAD(&req->rl_free);
|
|
|
|
spin_lock(&buffer->rb_reqslock);
|
|
|
|
list_add(&req->rl_all, &buffer->rb_allreqs);
|
|
|
|
spin_unlock(&buffer->rb_reqslock);
|
2016-03-05 00:28:53 +08:00
|
|
|
req->rl_cqe.done = rpcrdma_wc_send;
|
2015-01-22 00:03:52 +08:00
|
|
|
req->rl_buffer = &r_xprt->rx_buf;
|
2016-06-30 01:54:16 +08:00
|
|
|
INIT_LIST_HEAD(&req->rl_registered);
|
2016-09-15 22:56:43 +08:00
|
|
|
req->rl_send_wr.next = NULL;
|
|
|
|
req->rl_send_wr.wr_cqe = &req->rl_cqe;
|
xprtrdma: Use gathered Send for large inline messages
An RPC Call message that is sent inline but that has a data payload
(ie, one or more items in rq_snd_buf's page list) must be "pulled
up:"
- call_allocate has to reserve enough RPC Call buffer space to
accommodate the data payload
- call_transmit has to memcopy the rq_snd_buf's page list and tail
into its head iovec before it is sent
As the inline threshold is increased beyond its current 1KB default,
however, this means data payloads of more than a few KB are copied
by the host CPU. For example, if the inline threshold is increased
just to 4KB, then NFS WRITE requests up to 4KB would involve a
memcpy of the NFS WRITE's payload data into the RPC Call buffer.
This is an undesirable amount of participation by the host CPU.
The inline threshold may be much larger than 4KB in the future,
after negotiation with a peer server.
Instead of copying the components of rq_snd_buf into its head iovec,
construct a gather list of these components, and send them all in
place. The same approach is already used in the Linux server's
RPC-over-RDMA reply path.
This mechanism also eliminates the need for rpcrdma_tail_pullup,
which is used to manage the XDR pad and trailing inline content when
a Read list is present.
This requires that the pages in rq_snd_buf's page list be DMA-mapped
during marshaling, and unmapped when a data-bearing RPC is
completed. This is slightly less efficient for very small I/O
payloads, but significantly more efficient as data payload size and
inline threshold increase past a kilobyte.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:57:24 +08:00
|
|
|
req->rl_send_wr.sg_list = req->rl_send_sge;
|
2016-09-15 22:56:43 +08:00
|
|
|
req->rl_send_wr.opcode = IB_WR_SEND;
|
2015-01-22 00:03:52 +08:00
|
|
|
return req;
|
|
|
|
}
|
|
|
|
|
2015-10-25 05:27:43 +08:00
|
|
|
struct rpcrdma_rep *
|
2015-01-22 00:03:52 +08:00
|
|
|
rpcrdma_create_rep(struct rpcrdma_xprt *r_xprt)
|
|
|
|
{
|
|
|
|
struct rpcrdma_create_data_internal *cdata = &r_xprt->rx_data;
|
|
|
|
struct rpcrdma_ia *ia = &r_xprt->rx_ia;
|
|
|
|
struct rpcrdma_rep *rep;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = -ENOMEM;
|
2015-01-22 00:04:25 +08:00
|
|
|
rep = kzalloc(sizeof(*rep), GFP_KERNEL);
|
2015-01-22 00:03:52 +08:00
|
|
|
if (rep == NULL)
|
|
|
|
goto out;
|
|
|
|
|
2016-09-15 22:56:26 +08:00
|
|
|
rep->rr_rdmabuf = rpcrdma_alloc_regbuf(cdata->inline_rsize,
|
2016-09-15 22:56:10 +08:00
|
|
|
DMA_FROM_DEVICE, GFP_KERNEL);
|
2015-01-22 00:04:25 +08:00
|
|
|
if (IS_ERR(rep->rr_rdmabuf)) {
|
|
|
|
rc = PTR_ERR(rep->rr_rdmabuf);
|
2015-01-22 00:03:52 +08:00
|
|
|
goto out_free;
|
2015-01-22 00:04:25 +08:00
|
|
|
}
|
2015-01-22 00:03:52 +08:00
|
|
|
|
2015-05-26 23:51:56 +08:00
|
|
|
rep->rr_device = ia->ri_device;
|
2016-09-15 22:57:49 +08:00
|
|
|
rep->rr_cqe.done = rpcrdma_wc_receive;
|
2015-05-26 23:51:37 +08:00
|
|
|
rep->rr_rxprt = r_xprt;
|
2016-09-15 22:57:57 +08:00
|
|
|
INIT_WORK(&rep->rr_work, rpcrdma_reply_handler);
|
2016-09-15 22:56:51 +08:00
|
|
|
rep->rr_recv_wr.next = NULL;
|
|
|
|
rep->rr_recv_wr.wr_cqe = &rep->rr_cqe;
|
|
|
|
rep->rr_recv_wr.sg_list = &rep->rr_rdmabuf->rg_iov;
|
|
|
|
rep->rr_recv_wr.num_sge = 1;
|
2015-01-22 00:03:52 +08:00
|
|
|
return rep;
|
|
|
|
|
|
|
|
out_free:
|
|
|
|
kfree(rep);
|
|
|
|
out:
|
|
|
|
return ERR_PTR(rc);
|
|
|
|
}
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
int
|
2015-01-22 00:03:44 +08:00
|
|
|
rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt)
|
2007-09-11 01:51:18 +08:00
|
|
|
{
|
2015-01-22 00:03:44 +08:00
|
|
|
struct rpcrdma_buffer *buf = &r_xprt->rx_buf;
|
2007-09-11 01:51:18 +08:00
|
|
|
int i, rc;
|
|
|
|
|
2015-10-25 05:27:02 +08:00
|
|
|
buf->rb_max_requests = r_xprt->rx_data.max_requests;
|
2015-10-25 05:27:43 +08:00
|
|
|
buf->rb_bc_srv_max_requests = 0;
|
2016-03-05 00:28:27 +08:00
|
|
|
atomic_set(&buf->rb_credits, 1);
|
2016-06-30 01:54:00 +08:00
|
|
|
spin_lock_init(&buf->rb_mwlock);
|
2016-06-30 01:52:54 +08:00
|
|
|
spin_lock_init(&buf->rb_lock);
|
|
|
|
spin_lock_init(&buf->rb_recovery_lock);
|
2016-06-30 01:54:00 +08:00
|
|
|
INIT_LIST_HEAD(&buf->rb_mws);
|
|
|
|
INIT_LIST_HEAD(&buf->rb_all);
|
2016-06-30 01:52:54 +08:00
|
|
|
INIT_LIST_HEAD(&buf->rb_stale_mrs);
|
2016-06-30 01:54:00 +08:00
|
|
|
INIT_DELAYED_WORK(&buf->rb_refresh_worker,
|
|
|
|
rpcrdma_mr_refresh_worker);
|
2016-06-30 01:52:54 +08:00
|
|
|
INIT_DELAYED_WORK(&buf->rb_recovery_worker,
|
|
|
|
rpcrdma_mr_recovery_worker);
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2016-06-30 01:54:00 +08:00
|
|
|
rpcrdma_create_mrs(r_xprt);
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2015-10-25 05:27:02 +08:00
|
|
|
INIT_LIST_HEAD(&buf->rb_send_bufs);
|
2015-10-25 05:27:43 +08:00
|
|
|
INIT_LIST_HEAD(&buf->rb_allreqs);
|
|
|
|
spin_lock_init(&buf->rb_reqslock);
|
2007-09-11 01:51:18 +08:00
|
|
|
for (i = 0; i < buf->rb_max_requests; i++) {
|
|
|
|
struct rpcrdma_req *req;
|
|
|
|
|
2015-01-22 00:03:52 +08:00
|
|
|
req = rpcrdma_create_req(r_xprt);
|
|
|
|
if (IS_ERR(req)) {
|
2007-09-11 01:51:18 +08:00
|
|
|
dprintk("RPC: %s: request buffer %d alloc"
|
|
|
|
" failed\n", __func__, i);
|
2015-01-22 00:03:52 +08:00
|
|
|
rc = PTR_ERR(req);
|
2007-09-11 01:51:18 +08:00
|
|
|
goto out;
|
|
|
|
}
|
2015-10-25 05:27:43 +08:00
|
|
|
req->rl_backchannel = false;
|
2015-10-25 05:27:02 +08:00
|
|
|
list_add(&req->rl_free, &buf->rb_send_bufs);
|
|
|
|
}
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&buf->rb_recv_bufs);
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
for (i = 0; i < buf->rb_max_requests + RPCRDMA_MAX_BC_REQUESTS; i++) {
|
2015-10-25 05:27:02 +08:00
|
|
|
struct rpcrdma_rep *rep;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2015-01-22 00:03:52 +08:00
|
|
|
rep = rpcrdma_create_rep(r_xprt);
|
|
|
|
if (IS_ERR(rep)) {
|
2007-09-11 01:51:18 +08:00
|
|
|
dprintk("RPC: %s: reply buffer %d alloc failed\n",
|
|
|
|
__func__, i);
|
2015-01-22 00:03:52 +08:00
|
|
|
rc = PTR_ERR(rep);
|
2007-09-11 01:51:18 +08:00
|
|
|
goto out;
|
|
|
|
}
|
2015-10-25 05:27:02 +08:00
|
|
|
list_add(&rep->rr_list, &buf->rb_recv_bufs);
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
2015-01-22 00:03:52 +08:00
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
return 0;
|
|
|
|
out:
|
|
|
|
rpcrdma_buffer_destroy(buf);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2015-10-25 05:27:02 +08:00
|
|
|
static struct rpcrdma_req *
|
|
|
|
rpcrdma_buffer_get_req_locked(struct rpcrdma_buffer *buf)
|
|
|
|
{
|
|
|
|
struct rpcrdma_req *req;
|
|
|
|
|
|
|
|
req = list_first_entry(&buf->rb_send_bufs,
|
|
|
|
struct rpcrdma_req, rl_free);
|
|
|
|
list_del(&req->rl_free);
|
|
|
|
return req;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct rpcrdma_rep *
|
|
|
|
rpcrdma_buffer_get_rep_locked(struct rpcrdma_buffer *buf)
|
|
|
|
{
|
|
|
|
struct rpcrdma_rep *rep;
|
|
|
|
|
|
|
|
rep = list_first_entry(&buf->rb_recv_bufs,
|
|
|
|
struct rpcrdma_rep, rr_list);
|
|
|
|
list_del(&rep->rr_list);
|
|
|
|
return rep;
|
|
|
|
}
|
|
|
|
|
2015-01-22 00:03:52 +08:00
|
|
|
static void
|
2016-09-15 22:56:26 +08:00
|
|
|
rpcrdma_destroy_rep(struct rpcrdma_rep *rep)
|
2015-01-22 00:03:52 +08:00
|
|
|
{
|
2016-09-15 22:56:26 +08:00
|
|
|
rpcrdma_free_regbuf(rep->rr_rdmabuf);
|
2015-01-22 00:03:52 +08:00
|
|
|
kfree(rep);
|
|
|
|
}
|
|
|
|
|
2015-10-25 05:27:43 +08:00
|
|
|
void
|
2016-09-15 22:56:26 +08:00
|
|
|
rpcrdma_destroy_req(struct rpcrdma_req *req)
|
2015-01-22 00:03:52 +08:00
|
|
|
{
|
2016-09-15 22:56:26 +08:00
|
|
|
rpcrdma_free_regbuf(req->rl_recvbuf);
|
|
|
|
rpcrdma_free_regbuf(req->rl_sendbuf);
|
|
|
|
rpcrdma_free_regbuf(req->rl_rdmabuf);
|
2015-01-22 00:03:52 +08:00
|
|
|
kfree(req);
|
|
|
|
}
|
|
|
|
|
2016-06-30 01:54:00 +08:00
|
|
|
static void
|
|
|
|
rpcrdma_destroy_mrs(struct rpcrdma_buffer *buf)
|
|
|
|
{
|
|
|
|
struct rpcrdma_xprt *r_xprt = container_of(buf, struct rpcrdma_xprt,
|
|
|
|
rx_buf);
|
|
|
|
struct rpcrdma_ia *ia = rdmab_to_ia(buf);
|
|
|
|
struct rpcrdma_mw *mw;
|
|
|
|
unsigned int count;
|
|
|
|
|
|
|
|
count = 0;
|
|
|
|
spin_lock(&buf->rb_mwlock);
|
|
|
|
while (!list_empty(&buf->rb_all)) {
|
|
|
|
mw = list_entry(buf->rb_all.next, struct rpcrdma_mw, mw_all);
|
|
|
|
list_del(&mw->mw_all);
|
|
|
|
|
|
|
|
spin_unlock(&buf->rb_mwlock);
|
|
|
|
ia->ri_ops->ro_release_mr(mw);
|
|
|
|
count++;
|
|
|
|
spin_lock(&buf->rb_mwlock);
|
|
|
|
}
|
|
|
|
spin_unlock(&buf->rb_mwlock);
|
|
|
|
r_xprt->rx_stats.mrs_allocated = 0;
|
|
|
|
|
|
|
|
dprintk("RPC: %s: released %u MRs\n", __func__, count);
|
|
|
|
}
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
void
|
|
|
|
rpcrdma_buffer_destroy(struct rpcrdma_buffer *buf)
|
|
|
|
{
|
2016-06-30 01:52:54 +08:00
|
|
|
cancel_delayed_work_sync(&buf->rb_recovery_worker);
|
|
|
|
|
2015-10-25 05:27:02 +08:00
|
|
|
while (!list_empty(&buf->rb_recv_bufs)) {
|
|
|
|
struct rpcrdma_rep *rep;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2015-10-25 05:27:02 +08:00
|
|
|
rep = rpcrdma_buffer_get_rep_locked(buf);
|
2016-09-15 22:56:26 +08:00
|
|
|
rpcrdma_destroy_rep(rep);
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
buf->rb_send_count = 0;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2015-10-25 05:27:43 +08:00
|
|
|
spin_lock(&buf->rb_reqslock);
|
|
|
|
while (!list_empty(&buf->rb_allreqs)) {
|
2015-10-25 05:27:02 +08:00
|
|
|
struct rpcrdma_req *req;
|
2014-05-28 22:32:09 +08:00
|
|
|
|
2015-10-25 05:27:43 +08:00
|
|
|
req = list_first_entry(&buf->rb_allreqs,
|
|
|
|
struct rpcrdma_req, rl_all);
|
|
|
|
list_del(&req->rl_all);
|
|
|
|
|
|
|
|
spin_unlock(&buf->rb_reqslock);
|
2016-09-15 22:56:26 +08:00
|
|
|
rpcrdma_destroy_req(req);
|
2015-10-25 05:27:43 +08:00
|
|
|
spin_lock(&buf->rb_reqslock);
|
2015-10-25 05:27:02 +08:00
|
|
|
}
|
2015-10-25 05:27:43 +08:00
|
|
|
spin_unlock(&buf->rb_reqslock);
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
buf->rb_recv_count = 0;
|
2014-05-28 22:32:09 +08:00
|
|
|
|
2016-06-30 01:54:00 +08:00
|
|
|
rpcrdma_destroy_mrs(buf);
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
2015-05-26 23:52:06 +08:00
|
|
|
struct rpcrdma_mw *
|
|
|
|
rpcrdma_get_mw(struct rpcrdma_xprt *r_xprt)
|
2014-07-30 05:24:36 +08:00
|
|
|
{
|
2015-05-26 23:52:06 +08:00
|
|
|
struct rpcrdma_buffer *buf = &r_xprt->rx_buf;
|
|
|
|
struct rpcrdma_mw *mw = NULL;
|
|
|
|
|
2015-05-26 23:53:13 +08:00
|
|
|
spin_lock(&buf->rb_mwlock);
|
2015-05-26 23:52:06 +08:00
|
|
|
if (!list_empty(&buf->rb_mws)) {
|
|
|
|
mw = list_first_entry(&buf->rb_mws,
|
|
|
|
struct rpcrdma_mw, mw_list);
|
|
|
|
list_del_init(&mw->mw_list);
|
2014-07-30 05:24:36 +08:00
|
|
|
}
|
2015-05-26 23:53:13 +08:00
|
|
|
spin_unlock(&buf->rb_mwlock);
|
2015-05-26 23:52:06 +08:00
|
|
|
|
|
|
|
if (!mw)
|
2016-06-30 01:54:00 +08:00
|
|
|
goto out_nomws;
|
2015-05-26 23:52:06 +08:00
|
|
|
return mw;
|
2016-06-30 01:54:00 +08:00
|
|
|
|
|
|
|
out_nomws:
|
|
|
|
dprintk("RPC: %s: no MWs available\n", __func__);
|
|
|
|
schedule_delayed_work(&buf->rb_refresh_worker, 0);
|
|
|
|
|
|
|
|
/* Allow the reply handler and refresh worker to run */
|
|
|
|
cond_resched();
|
|
|
|
|
|
|
|
return NULL;
|
2014-07-30 05:24:36 +08:00
|
|
|
}
|
|
|
|
|
2015-05-26 23:52:06 +08:00
|
|
|
void
|
|
|
|
rpcrdma_put_mw(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mw *mw)
|
2014-07-30 05:24:36 +08:00
|
|
|
{
|
2015-05-26 23:52:06 +08:00
|
|
|
struct rpcrdma_buffer *buf = &r_xprt->rx_buf;
|
2014-07-30 05:24:36 +08:00
|
|
|
|
2015-05-26 23:53:13 +08:00
|
|
|
spin_lock(&buf->rb_mwlock);
|
2015-05-26 23:52:06 +08:00
|
|
|
list_add_tail(&mw->mw_list, &buf->rb_mws);
|
2015-05-26 23:53:13 +08:00
|
|
|
spin_unlock(&buf->rb_mwlock);
|
2014-07-30 05:24:36 +08:00
|
|
|
}
|
|
|
|
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
static struct rpcrdma_rep *
|
|
|
|
rpcrdma_buffer_get_rep(struct rpcrdma_buffer *buffers)
|
|
|
|
{
|
|
|
|
/* If an RPC previously completed without a reply (say, a
|
|
|
|
* credential problem or a soft timeout occurs) then hold off
|
|
|
|
* on supplying more Receive buffers until the number of new
|
|
|
|
* pending RPCs catches up to the number of posted Receives.
|
|
|
|
*/
|
|
|
|
if (unlikely(buffers->rb_send_count < buffers->rb_recv_count))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (unlikely(list_empty(&buffers->rb_recv_bufs)))
|
|
|
|
return NULL;
|
|
|
|
buffers->rb_recv_count++;
|
|
|
|
return rpcrdma_buffer_get_rep_locked(buffers);
|
|
|
|
}
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
/*
|
|
|
|
* Get a set of request/reply buffers.
|
2016-09-06 23:22:49 +08:00
|
|
|
*
|
|
|
|
* Reply buffer (if available) is attached to send buffer upon return.
|
2007-09-11 01:51:18 +08:00
|
|
|
*/
|
|
|
|
struct rpcrdma_req *
|
|
|
|
rpcrdma_buffer_get(struct rpcrdma_buffer *buffers)
|
|
|
|
{
|
|
|
|
struct rpcrdma_req *req;
|
2015-05-26 23:52:35 +08:00
|
|
|
|
2015-10-25 05:27:27 +08:00
|
|
|
spin_lock(&buffers->rb_lock);
|
2015-10-25 05:27:02 +08:00
|
|
|
if (list_empty(&buffers->rb_send_bufs))
|
|
|
|
goto out_reqbuf;
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
buffers->rb_send_count++;
|
2015-10-25 05:27:02 +08:00
|
|
|
req = rpcrdma_buffer_get_req_locked(buffers);
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
req->rl_reply = rpcrdma_buffer_get_rep(buffers);
|
2015-10-25 05:27:27 +08:00
|
|
|
spin_unlock(&buffers->rb_lock);
|
2015-10-25 05:27:02 +08:00
|
|
|
return req;
|
2014-07-30 05:24:54 +08:00
|
|
|
|
2015-10-25 05:27:02 +08:00
|
|
|
out_reqbuf:
|
2015-10-25 05:27:27 +08:00
|
|
|
spin_unlock(&buffers->rb_lock);
|
2016-09-06 23:22:49 +08:00
|
|
|
pr_warn("RPC: %s: out of request buffers\n", __func__);
|
2015-10-25 05:27:02 +08:00
|
|
|
return NULL;
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Put request/reply buffers back into pool.
|
|
|
|
* Pre-decrement counter/array index.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
rpcrdma_buffer_put(struct rpcrdma_req *req)
|
|
|
|
{
|
|
|
|
struct rpcrdma_buffer *buffers = req->rl_buffer;
|
2015-10-25 05:27:02 +08:00
|
|
|
struct rpcrdma_rep *rep = req->rl_reply;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2016-09-15 22:56:43 +08:00
|
|
|
req->rl_send_wr.num_sge = 0;
|
2015-10-25 05:27:02 +08:00
|
|
|
req->rl_reply = NULL;
|
|
|
|
|
2015-10-25 05:27:27 +08:00
|
|
|
spin_lock(&buffers->rb_lock);
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
buffers->rb_send_count--;
|
2015-10-25 05:27:02 +08:00
|
|
|
list_add_tail(&req->rl_free, &buffers->rb_send_bufs);
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
if (rep) {
|
|
|
|
buffers->rb_recv_count--;
|
2015-10-25 05:27:02 +08:00
|
|
|
list_add_tail(&rep->rr_list, &buffers->rb_recv_bufs);
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
}
|
2015-10-25 05:27:27 +08:00
|
|
|
spin_unlock(&buffers->rb_lock);
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Recover reply buffers from pool.
|
2015-10-25 05:27:02 +08:00
|
|
|
* This happens when recovering from disconnect.
|
2007-09-11 01:51:18 +08:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
rpcrdma_recv_buffer_get(struct rpcrdma_req *req)
|
|
|
|
{
|
|
|
|
struct rpcrdma_buffer *buffers = req->rl_buffer;
|
|
|
|
|
2015-10-25 05:27:27 +08:00
|
|
|
spin_lock(&buffers->rb_lock);
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
req->rl_reply = rpcrdma_buffer_get_rep(buffers);
|
2015-10-25 05:27:27 +08:00
|
|
|
spin_unlock(&buffers->rb_lock);
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Put reply buffers back into pool when not attached to
|
2014-05-28 22:32:34 +08:00
|
|
|
* request. This happens in error conditions.
|
2007-09-11 01:51:18 +08:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
rpcrdma_recv_buffer_put(struct rpcrdma_rep *rep)
|
|
|
|
{
|
2015-05-26 23:51:37 +08:00
|
|
|
struct rpcrdma_buffer *buffers = &rep->rr_rxprt->rx_buf;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2015-10-25 05:27:27 +08:00
|
|
|
spin_lock(&buffers->rb_lock);
|
xprtrdma: Fix receive buffer accounting
An RPC can terminate before its reply arrives, if a credential
problem or a soft timeout occurs. After this happens, xprtrdma
reports it is out of Receive buffers.
A Receive buffer is posted before each RPC is sent, and returned to
the buffer pool when a reply is received. If no reply is received
for an RPC, that Receive buffer remains posted. But xprtrdma tries
to post another when the next RPC is sent.
If this happens a few dozen times, there are no receive buffers left
to be posted at send time. I don't see a way for a transport
connection to recover at that point, and it will spit warnings and
unnecessarily delay RPCs on occasion for its remaining lifetime.
Commit 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
removed a little bit of logic to detect this case and not provide
a Receive buffer so no more buffers are posted, and then transport
operation continues correctly. We didn't understand what that logic
did, and it wasn't commented, so it was removed as part of the
overhaul to support backchannel requests.
Restore it, but be wary of the need to keep extra Receives posted
to deal with backchannel requests.
Fixes: 1e465fd4ff47 ("xprtrdma: Replace send and receive arrays")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
2016-09-06 23:22:58 +08:00
|
|
|
buffers->rb_recv_count--;
|
2015-10-25 05:27:02 +08:00
|
|
|
list_add_tail(&rep->rr_list, &buffers->rb_recv_bufs);
|
2015-10-25 05:27:27 +08:00
|
|
|
spin_unlock(&buffers->rb_lock);
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
2015-01-22 00:04:00 +08:00
|
|
|
/**
|
2016-09-15 22:56:10 +08:00
|
|
|
* rpcrdma_alloc_regbuf - allocate and DMA-map memory for SEND/RECV buffers
|
2015-01-22 00:04:00 +08:00
|
|
|
* @size: size of buffer to be allocated, in bytes
|
2016-09-15 22:56:10 +08:00
|
|
|
* @direction: direction of data movement
|
2015-01-22 00:04:00 +08:00
|
|
|
* @flags: GFP flags
|
|
|
|
*
|
xprtrdma: Delay DMA mapping Send and Receive buffers
Currently, each regbuf is allocated and DMA mapped at the same time.
This is done during transport creation.
When a device driver is unloaded, every DMA-mapped buffer in use by
a transport has to be unmapped, and then remapped to the new
device if the driver is loaded again. Remapping will have to be done
_after_ the connect worker has set up the new device.
But there's an ordering problem:
call_allocate, which invokes xprt_rdma_allocate which calls
rpcrdma_alloc_regbuf to allocate Send buffers, happens _before_
the connect worker can run to set up the new device.
Instead, at transport creation, allocate each buffer, but leave it
unmapped. Once the RPC carries these buffers into ->send_request, by
which time a transport connection should have been established,
check to see that the RPC's buffers have been DMA mapped. If not,
map them there.
When device driver unplug support is added, it will simply unmap all
the transport's regbufs, but it doesn't have to deallocate the
underlying memory.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:56:18 +08:00
|
|
|
* Returns an ERR_PTR, or a pointer to a regbuf, a buffer that
|
|
|
|
* can be persistently DMA-mapped for I/O.
|
2015-01-22 00:04:00 +08:00
|
|
|
*
|
|
|
|
* xprtrdma uses a regbuf for posting an outgoing RDMA SEND, or for
|
2016-09-15 22:56:10 +08:00
|
|
|
* receiving the payload of RDMA RECV operations. During Long Calls
|
|
|
|
* or Replies they may be registered externally via ro_map.
|
2015-01-22 00:04:00 +08:00
|
|
|
*/
|
|
|
|
struct rpcrdma_regbuf *
|
2016-09-15 22:56:26 +08:00
|
|
|
rpcrdma_alloc_regbuf(size_t size, enum dma_data_direction direction,
|
|
|
|
gfp_t flags)
|
2015-01-22 00:04:00 +08:00
|
|
|
{
|
|
|
|
struct rpcrdma_regbuf *rb;
|
|
|
|
|
|
|
|
rb = kmalloc(sizeof(*rb) + size, flags);
|
|
|
|
if (rb == NULL)
|
xprtrdma: Delay DMA mapping Send and Receive buffers
Currently, each regbuf is allocated and DMA mapped at the same time.
This is done during transport creation.
When a device driver is unloaded, every DMA-mapped buffer in use by
a transport has to be unmapped, and then remapped to the new
device if the driver is loaded again. Remapping will have to be done
_after_ the connect worker has set up the new device.
But there's an ordering problem:
call_allocate, which invokes xprt_rdma_allocate which calls
rpcrdma_alloc_regbuf to allocate Send buffers, happens _before_
the connect worker can run to set up the new device.
Instead, at transport creation, allocate each buffer, but leave it
unmapped. Once the RPC carries these buffers into ->send_request, by
which time a transport connection should have been established,
check to see that the RPC's buffers have been DMA mapped. If not,
map them there.
When device driver unplug support is added, it will simply unmap all
the transport's regbufs, but it doesn't have to deallocate the
underlying memory.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:56:18 +08:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2015-01-22 00:04:00 +08:00
|
|
|
|
xprtrdma: Delay DMA mapping Send and Receive buffers
Currently, each regbuf is allocated and DMA mapped at the same time.
This is done during transport creation.
When a device driver is unloaded, every DMA-mapped buffer in use by
a transport has to be unmapped, and then remapped to the new
device if the driver is loaded again. Remapping will have to be done
_after_ the connect worker has set up the new device.
But there's an ordering problem:
call_allocate, which invokes xprt_rdma_allocate which calls
rpcrdma_alloc_regbuf to allocate Send buffers, happens _before_
the connect worker can run to set up the new device.
Instead, at transport creation, allocate each buffer, but leave it
unmapped. Once the RPC carries these buffers into ->send_request, by
which time a transport connection should have been established,
check to see that the RPC's buffers have been DMA mapped. If not,
map them there.
When device driver unplug support is added, it will simply unmap all
the transport's regbufs, but it doesn't have to deallocate the
underlying memory.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:56:18 +08:00
|
|
|
rb->rg_device = NULL;
|
2016-09-15 22:56:10 +08:00
|
|
|
rb->rg_direction = direction;
|
xprtrdma: Delay DMA mapping Send and Receive buffers
Currently, each regbuf is allocated and DMA mapped at the same time.
This is done during transport creation.
When a device driver is unloaded, every DMA-mapped buffer in use by
a transport has to be unmapped, and then remapped to the new
device if the driver is loaded again. Remapping will have to be done
_after_ the connect worker has set up the new device.
But there's an ordering problem:
call_allocate, which invokes xprt_rdma_allocate which calls
rpcrdma_alloc_regbuf to allocate Send buffers, happens _before_
the connect worker can run to set up the new device.
Instead, at transport creation, allocate each buffer, but leave it
unmapped. Once the RPC carries these buffers into ->send_request, by
which time a transport connection should have been established,
check to see that the RPC's buffers have been DMA mapped. If not,
map them there.
When device driver unplug support is added, it will simply unmap all
the transport's regbufs, but it doesn't have to deallocate the
underlying memory.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:56:18 +08:00
|
|
|
rb->rg_iov.length = size;
|
2015-01-22 00:04:00 +08:00
|
|
|
|
|
|
|
return rb;
|
xprtrdma: Delay DMA mapping Send and Receive buffers
Currently, each regbuf is allocated and DMA mapped at the same time.
This is done during transport creation.
When a device driver is unloaded, every DMA-mapped buffer in use by
a transport has to be unmapped, and then remapped to the new
device if the driver is loaded again. Remapping will have to be done
_after_ the connect worker has set up the new device.
But there's an ordering problem:
call_allocate, which invokes xprt_rdma_allocate which calls
rpcrdma_alloc_regbuf to allocate Send buffers, happens _before_
the connect worker can run to set up the new device.
Instead, at transport creation, allocate each buffer, but leave it
unmapped. Once the RPC carries these buffers into ->send_request, by
which time a transport connection should have been established,
check to see that the RPC's buffers have been DMA mapped. If not,
map them there.
When device driver unplug support is added, it will simply unmap all
the transport's regbufs, but it doesn't have to deallocate the
underlying memory.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:56:18 +08:00
|
|
|
}
|
2015-01-22 00:04:00 +08:00
|
|
|
|
xprtrdma: Delay DMA mapping Send and Receive buffers
Currently, each regbuf is allocated and DMA mapped at the same time.
This is done during transport creation.
When a device driver is unloaded, every DMA-mapped buffer in use by
a transport has to be unmapped, and then remapped to the new
device if the driver is loaded again. Remapping will have to be done
_after_ the connect worker has set up the new device.
But there's an ordering problem:
call_allocate, which invokes xprt_rdma_allocate which calls
rpcrdma_alloc_regbuf to allocate Send buffers, happens _before_
the connect worker can run to set up the new device.
Instead, at transport creation, allocate each buffer, but leave it
unmapped. Once the RPC carries these buffers into ->send_request, by
which time a transport connection should have been established,
check to see that the RPC's buffers have been DMA mapped. If not,
map them there.
When device driver unplug support is added, it will simply unmap all
the transport's regbufs, but it doesn't have to deallocate the
underlying memory.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:56:18 +08:00
|
|
|
/**
|
|
|
|
* __rpcrdma_map_regbuf - DMA-map a regbuf
|
|
|
|
* @ia: controlling rpcrdma_ia
|
|
|
|
* @rb: regbuf to be mapped
|
|
|
|
*/
|
|
|
|
bool
|
|
|
|
__rpcrdma_dma_map_regbuf(struct rpcrdma_ia *ia, struct rpcrdma_regbuf *rb)
|
|
|
|
{
|
|
|
|
if (rb->rg_direction == DMA_NONE)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
rb->rg_iov.addr = ib_dma_map_single(ia->ri_device,
|
|
|
|
(void *)rb->rg_base,
|
|
|
|
rdmab_length(rb),
|
|
|
|
rb->rg_direction);
|
|
|
|
if (ib_dma_mapping_error(ia->ri_device, rdmab_addr(rb)))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
rb->rg_device = ia->ri_device;
|
|
|
|
rb->rg_iov.lkey = ia->ri_pd->local_dma_lkey;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
rpcrdma_dma_unmap_regbuf(struct rpcrdma_regbuf *rb)
|
|
|
|
{
|
|
|
|
if (!rpcrdma_regbuf_is_mapped(rb))
|
|
|
|
return;
|
|
|
|
|
|
|
|
ib_dma_unmap_single(rb->rg_device, rdmab_addr(rb),
|
|
|
|
rdmab_length(rb), rb->rg_direction);
|
|
|
|
rb->rg_device = NULL;
|
2015-01-22 00:04:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* rpcrdma_free_regbuf - deregister and free registered buffer
|
|
|
|
* @rb: regbuf to be deregistered and freed
|
|
|
|
*/
|
|
|
|
void
|
2016-09-15 22:56:26 +08:00
|
|
|
rpcrdma_free_regbuf(struct rpcrdma_regbuf *rb)
|
2015-01-22 00:04:00 +08:00
|
|
|
{
|
2015-08-04 01:03:20 +08:00
|
|
|
if (!rb)
|
|
|
|
return;
|
|
|
|
|
xprtrdma: Delay DMA mapping Send and Receive buffers
Currently, each regbuf is allocated and DMA mapped at the same time.
This is done during transport creation.
When a device driver is unloaded, every DMA-mapped buffer in use by
a transport has to be unmapped, and then remapped to the new
device if the driver is loaded again. Remapping will have to be done
_after_ the connect worker has set up the new device.
But there's an ordering problem:
call_allocate, which invokes xprt_rdma_allocate which calls
rpcrdma_alloc_regbuf to allocate Send buffers, happens _before_
the connect worker can run to set up the new device.
Instead, at transport creation, allocate each buffer, but leave it
unmapped. Once the RPC carries these buffers into ->send_request, by
which time a transport connection should have been established,
check to see that the RPC's buffers have been DMA mapped. If not,
map them there.
When device driver unplug support is added, it will simply unmap all
the transport's regbufs, but it doesn't have to deallocate the
underlying memory.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:56:18 +08:00
|
|
|
rpcrdma_dma_unmap_regbuf(rb);
|
2015-08-04 01:03:20 +08:00
|
|
|
kfree(rb);
|
2015-01-22 00:04:00 +08:00
|
|
|
}
|
|
|
|
|
2007-09-11 01:51:18 +08:00
|
|
|
/*
|
|
|
|
* Prepost any receive buffer, then post send.
|
|
|
|
*
|
|
|
|
* Receive buffer is donated to hardware, reclaimed upon recv completion.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
rpcrdma_ep_post(struct rpcrdma_ia *ia,
|
|
|
|
struct rpcrdma_ep *ep,
|
|
|
|
struct rpcrdma_req *req)
|
|
|
|
{
|
2016-09-15 22:56:43 +08:00
|
|
|
struct ib_send_wr *send_wr = &req->rl_send_wr;
|
|
|
|
struct ib_send_wr *send_wr_fail;
|
xprtrdma: Use gathered Send for large inline messages
An RPC Call message that is sent inline but that has a data payload
(ie, one or more items in rq_snd_buf's page list) must be "pulled
up:"
- call_allocate has to reserve enough RPC Call buffer space to
accommodate the data payload
- call_transmit has to memcopy the rq_snd_buf's page list and tail
into its head iovec before it is sent
As the inline threshold is increased beyond its current 1KB default,
however, this means data payloads of more than a few KB are copied
by the host CPU. For example, if the inline threshold is increased
just to 4KB, then NFS WRITE requests up to 4KB would involve a
memcpy of the NFS WRITE's payload data into the RPC Call buffer.
This is an undesirable amount of participation by the host CPU.
The inline threshold may be much larger than 4KB in the future,
after negotiation with a peer server.
Instead of copying the components of rq_snd_buf into its head iovec,
construct a gather list of these components, and send them all in
place. The same approach is already used in the Linux server's
RPC-over-RDMA reply path.
This mechanism also eliminates the need for rpcrdma_tail_pullup,
which is used to manage the XDR pad and trailing inline content when
a Read list is present.
This requires that the pages in rq_snd_buf's page list be DMA-mapped
during marshaling, and unmapped when a data-bearing RPC is
completed. This is slightly less efficient for very small I/O
payloads, but significantly more efficient as data payload size and
inline threshold increase past a kilobyte.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:57:24 +08:00
|
|
|
int rc;
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2016-09-15 22:56:43 +08:00
|
|
|
if (req->rl_reply) {
|
|
|
|
rc = rpcrdma_ep_post_recv(ia, req->rl_reply);
|
2007-09-11 01:51:18 +08:00
|
|
|
if (rc)
|
2016-06-30 01:53:43 +08:00
|
|
|
return rc;
|
2007-09-11 01:51:18 +08:00
|
|
|
req->rl_reply = NULL;
|
|
|
|
}
|
|
|
|
|
2015-08-04 01:03:39 +08:00
|
|
|
dprintk("RPC: %s: posting %d s/g entries\n",
|
2016-09-15 22:56:43 +08:00
|
|
|
__func__, send_wr->num_sge);
|
2007-09-11 01:51:18 +08:00
|
|
|
|
2016-11-29 23:52:16 +08:00
|
|
|
rpcrdma_set_signaled(ep, send_wr);
|
2016-09-15 22:56:43 +08:00
|
|
|
rc = ib_post_send(ia->ri_id->qp, send_wr, &send_wr_fail);
|
2007-09-11 01:51:18 +08:00
|
|
|
if (rc)
|
2016-06-30 01:53:43 +08:00
|
|
|
goto out_postsend_err;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out_postsend_err:
|
|
|
|
pr_err("rpcrdma: RDMA Send ib_post_send returned %i\n", rc);
|
|
|
|
return -ENOTCONN;
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
rpcrdma_ep_post_recv(struct rpcrdma_ia *ia,
|
|
|
|
struct rpcrdma_rep *rep)
|
|
|
|
{
|
2016-09-15 22:56:51 +08:00
|
|
|
struct ib_recv_wr *recv_wr_fail;
|
2007-09-11 01:51:18 +08:00
|
|
|
int rc;
|
|
|
|
|
xprtrdma: Delay DMA mapping Send and Receive buffers
Currently, each regbuf is allocated and DMA mapped at the same time.
This is done during transport creation.
When a device driver is unloaded, every DMA-mapped buffer in use by
a transport has to be unmapped, and then remapped to the new
device if the driver is loaded again. Remapping will have to be done
_after_ the connect worker has set up the new device.
But there's an ordering problem:
call_allocate, which invokes xprt_rdma_allocate which calls
rpcrdma_alloc_regbuf to allocate Send buffers, happens _before_
the connect worker can run to set up the new device.
Instead, at transport creation, allocate each buffer, but leave it
unmapped. Once the RPC carries these buffers into ->send_request, by
which time a transport connection should have been established,
check to see that the RPC's buffers have been DMA mapped. If not,
map them there.
When device driver unplug support is added, it will simply unmap all
the transport's regbufs, but it doesn't have to deallocate the
underlying memory.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:56:18 +08:00
|
|
|
if (!rpcrdma_dma_map_regbuf(ia, rep->rr_rdmabuf))
|
|
|
|
goto out_map;
|
2016-09-15 22:56:51 +08:00
|
|
|
rc = ib_post_recv(ia->ri_id->qp, &rep->rr_recv_wr, &recv_wr_fail);
|
2007-09-11 01:51:18 +08:00
|
|
|
if (rc)
|
2016-06-30 01:53:43 +08:00
|
|
|
goto out_postrecv;
|
|
|
|
return 0;
|
|
|
|
|
xprtrdma: Delay DMA mapping Send and Receive buffers
Currently, each regbuf is allocated and DMA mapped at the same time.
This is done during transport creation.
When a device driver is unloaded, every DMA-mapped buffer in use by
a transport has to be unmapped, and then remapped to the new
device if the driver is loaded again. Remapping will have to be done
_after_ the connect worker has set up the new device.
But there's an ordering problem:
call_allocate, which invokes xprt_rdma_allocate which calls
rpcrdma_alloc_regbuf to allocate Send buffers, happens _before_
the connect worker can run to set up the new device.
Instead, at transport creation, allocate each buffer, but leave it
unmapped. Once the RPC carries these buffers into ->send_request, by
which time a transport connection should have been established,
check to see that the RPC's buffers have been DMA mapped. If not,
map them there.
When device driver unplug support is added, it will simply unmap all
the transport's regbufs, but it doesn't have to deallocate the
underlying memory.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-09-15 22:56:18 +08:00
|
|
|
out_map:
|
|
|
|
pr_err("rpcrdma: failed to DMA map the Receive buffer\n");
|
|
|
|
return -EIO;
|
|
|
|
|
2016-06-30 01:53:43 +08:00
|
|
|
out_postrecv:
|
|
|
|
pr_err("rpcrdma: ib_post_recv returned %i\n", rc);
|
|
|
|
return -ENOTCONN;
|
2007-09-11 01:51:18 +08:00
|
|
|
}
|
2014-07-30 05:23:34 +08:00
|
|
|
|
2015-10-25 05:27:43 +08:00
|
|
|
/**
|
|
|
|
* rpcrdma_ep_post_extra_recv - Post buffers for incoming backchannel requests
|
|
|
|
* @r_xprt: transport associated with these backchannel resources
|
|
|
|
* @min_reqs: minimum number of incoming requests expected
|
|
|
|
*
|
|
|
|
* Returns zero if all requested buffers were posted, or a negative errno.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
rpcrdma_ep_post_extra_recv(struct rpcrdma_xprt *r_xprt, unsigned int count)
|
|
|
|
{
|
|
|
|
struct rpcrdma_buffer *buffers = &r_xprt->rx_buf;
|
|
|
|
struct rpcrdma_ia *ia = &r_xprt->rx_ia;
|
|
|
|
struct rpcrdma_rep *rep;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
while (count--) {
|
2015-12-17 06:22:06 +08:00
|
|
|
spin_lock(&buffers->rb_lock);
|
2015-10-25 05:27:43 +08:00
|
|
|
if (list_empty(&buffers->rb_recv_bufs))
|
|
|
|
goto out_reqbuf;
|
|
|
|
rep = rpcrdma_buffer_get_rep_locked(buffers);
|
2015-12-17 06:22:06 +08:00
|
|
|
spin_unlock(&buffers->rb_lock);
|
2015-10-25 05:27:43 +08:00
|
|
|
|
2016-09-15 22:56:35 +08:00
|
|
|
rc = rpcrdma_ep_post_recv(ia, rep);
|
2015-10-25 05:27:43 +08:00
|
|
|
if (rc)
|
|
|
|
goto out_rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out_reqbuf:
|
2015-12-17 06:22:06 +08:00
|
|
|
spin_unlock(&buffers->rb_lock);
|
2015-10-25 05:27:43 +08:00
|
|
|
pr_warn("%s: no extra receive buffers\n", __func__);
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
out_rc:
|
|
|
|
rpcrdma_recv_buffer_put(rep);
|
|
|
|
return rc;
|
|
|
|
}
|