xprtrdma: Remove unused LOCAL_INV recovery logic
Clean up: Remove functions no longer used to recover broken FRMRs. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-by: Steve Wise <swise@opengridcomputing.com> Reviewed-by: Sagi Grimberg <sagig@mellanox.com> Reviewed-by: Devesh Sharma <devesh.sharma@avagotech.com> Tested-By: Devesh Sharma <devesh.sharma@avagotech.com> Reviewed-by: Doug Ledford <dledford@redhat.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>steinar/wifi_calib_4_9_kernel
parent
c14d86e591
commit
06b00880b0
|
@ -1204,33 +1204,6 @@ rpcrdma_put_mw(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mw *mw)
|
||||||
spin_unlock_irqrestore(&buf->rb_lock, flags);
|
spin_unlock_irqrestore(&buf->rb_lock, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* "*mw" can be NULL when rpcrdma_buffer_get_mrs() fails, leaving
|
|
||||||
* some req segments uninitialized.
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
rpcrdma_buffer_put_mr(struct rpcrdma_mw **mw, struct rpcrdma_buffer *buf)
|
|
||||||
{
|
|
||||||
if (*mw) {
|
|
||||||
list_add_tail(&(*mw)->mw_list, &buf->rb_mws);
|
|
||||||
*mw = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Cycle mw's back in reverse order, and "spin" them.
|
|
||||||
* This delays and scrambles reuse as much as possible.
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
rpcrdma_buffer_put_mrs(struct rpcrdma_req *req, struct rpcrdma_buffer *buf)
|
|
||||||
{
|
|
||||||
struct rpcrdma_mr_seg *seg = req->rl_segments;
|
|
||||||
struct rpcrdma_mr_seg *seg1 = seg;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 1, seg++; i < RPCRDMA_MAX_SEGS; seg++, i++)
|
|
||||||
rpcrdma_buffer_put_mr(&seg->rl_mw, buf);
|
|
||||||
rpcrdma_buffer_put_mr(&seg1->rl_mw, buf);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
rpcrdma_buffer_put_sendbuf(struct rpcrdma_req *req, struct rpcrdma_buffer *buf)
|
rpcrdma_buffer_put_sendbuf(struct rpcrdma_req *req, struct rpcrdma_buffer *buf)
|
||||||
{
|
{
|
||||||
|
@ -1242,88 +1215,6 @@ rpcrdma_buffer_put_sendbuf(struct rpcrdma_req *req, struct rpcrdma_buffer *buf)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rpcrdma_unmap_one() was already done during deregistration.
|
|
||||||
* Redo only the ib_post_send().
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
rpcrdma_retry_local_inv(struct rpcrdma_mw *r, struct rpcrdma_ia *ia)
|
|
||||||
{
|
|
||||||
struct rpcrdma_xprt *r_xprt =
|
|
||||||
container_of(ia, struct rpcrdma_xprt, rx_ia);
|
|
||||||
struct ib_send_wr invalidate_wr, *bad_wr;
|
|
||||||
int rc;
|
|
||||||
|
|
||||||
dprintk("RPC: %s: FRMR %p is stale\n", __func__, r);
|
|
||||||
|
|
||||||
/* When this FRMR is re-inserted into rb_mws, it is no longer stale */
|
|
||||||
r->r.frmr.fr_state = FRMR_IS_INVALID;
|
|
||||||
|
|
||||||
memset(&invalidate_wr, 0, sizeof(invalidate_wr));
|
|
||||||
invalidate_wr.wr_id = (unsigned long)(void *)r;
|
|
||||||
invalidate_wr.opcode = IB_WR_LOCAL_INV;
|
|
||||||
invalidate_wr.ex.invalidate_rkey = r->r.frmr.fr_mr->rkey;
|
|
||||||
DECR_CQCOUNT(&r_xprt->rx_ep);
|
|
||||||
|
|
||||||
dprintk("RPC: %s: frmr %p invalidating rkey %08x\n",
|
|
||||||
__func__, r, r->r.frmr.fr_mr->rkey);
|
|
||||||
|
|
||||||
read_lock(&ia->ri_qplock);
|
|
||||||
rc = ib_post_send(ia->ri_id->qp, &invalidate_wr, &bad_wr);
|
|
||||||
read_unlock(&ia->ri_qplock);
|
|
||||||
if (rc) {
|
|
||||||
/* Force rpcrdma_buffer_get() to retry */
|
|
||||||
r->r.frmr.fr_state = FRMR_IS_STALE;
|
|
||||||
dprintk("RPC: %s: ib_post_send failed, %i\n",
|
|
||||||
__func__, rc);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
rpcrdma_retry_flushed_linv(struct list_head *stale,
|
|
||||||
struct rpcrdma_buffer *buf)
|
|
||||||
{
|
|
||||||
struct rpcrdma_ia *ia = rdmab_to_ia(buf);
|
|
||||||
struct list_head *pos;
|
|
||||||
struct rpcrdma_mw *r;
|
|
||||||
unsigned long flags;
|
|
||||||
|
|
||||||
list_for_each(pos, stale) {
|
|
||||||
r = list_entry(pos, struct rpcrdma_mw, mw_list);
|
|
||||||
rpcrdma_retry_local_inv(r, ia);
|
|
||||||
}
|
|
||||||
|
|
||||||
spin_lock_irqsave(&buf->rb_lock, flags);
|
|
||||||
list_splice_tail(stale, &buf->rb_mws);
|
|
||||||
spin_unlock_irqrestore(&buf->rb_lock, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct rpcrdma_req *
|
|
||||||
rpcrdma_buffer_get_frmrs(struct rpcrdma_req *req, struct rpcrdma_buffer *buf,
|
|
||||||
struct list_head *stale)
|
|
||||||
{
|
|
||||||
struct rpcrdma_mw *r;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
i = RPCRDMA_MAX_SEGS - 1;
|
|
||||||
while (!list_empty(&buf->rb_mws)) {
|
|
||||||
r = list_entry(buf->rb_mws.next,
|
|
||||||
struct rpcrdma_mw, mw_list);
|
|
||||||
list_del(&r->mw_list);
|
|
||||||
if (r->r.frmr.fr_state == FRMR_IS_STALE) {
|
|
||||||
list_add(&r->mw_list, stale);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
req->rl_segments[i].rl_mw = r;
|
|
||||||
if (unlikely(i-- == 0))
|
|
||||||
return req; /* Success */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Not enough entries on rb_mws for this req */
|
|
||||||
rpcrdma_buffer_put_sendbuf(req, buf);
|
|
||||||
rpcrdma_buffer_put_mrs(req, buf);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get a set of request/reply buffers.
|
* Get a set of request/reply buffers.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue