Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05055722 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Disable completions for FAST_REG_MR Work Requests 



Instead of relying on a completion to change the state of an FRMR
to FRMR_IS_VALID, set it in advance. If an error occurs, a completion
will fire anyway and mark the FRMR FRMR_IS_STALE.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarSteve Wise <swise@opengridcomputing.com>
Tested-by: default avatarShirley Ma <shirley.ma@oracle.com>
Tested-by: default avatarDevesh Sharma <devesh.sharma@emulex.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 440ddad5

net/sunrpc/xprtrdma/verbs.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -159,9 +159,6 @@ rpcrdma_sendcq_process_wc(struct ib_wc *wc) 
		return;

		return;

	}

	}





	if (wc->opcode == IB_WC_FAST_REG_MR)

		frmr->r.frmr.fr_state = FRMR_IS_VALID;

	else if (wc->opcode == IB_WC_LOCAL_INV)

	frmr->r.frmr.fr_state = FRMR_IS_INVALID;

	frmr->r.frmr.fr_state = FRMR_IS_INVALID;

}

}
@@ -1727,10 +1724,11 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, 
	dprintk("RPC:       %s: Using frmr %p to map %d segments\n",

	dprintk("RPC:       %s: Using frmr %p to map %d segments\n",

		__func__, mw, i);

		__func__, mw, i);





	frmr->fr_state = FRMR_IS_VALID;



	memset(&frmr_wr, 0, sizeof frmr_wr);

	memset(&frmr_wr, 0, sizeof frmr_wr);

	frmr_wr.wr_id = (unsigned long)(void *)mw;

	frmr_wr.wr_id = (unsigned long)(void *)mw;

	frmr_wr.opcode = IB_WR_FAST_REG_MR;

	frmr_wr.opcode = IB_WR_FAST_REG_MR;

	frmr_wr.send_flags = IB_SEND_SIGNALED;

	frmr_wr.wr.fast_reg.iova_start = seg1->mr_dma;

	frmr_wr.wr.fast_reg.iova_start = seg1->mr_dma;

	frmr_wr.wr.fast_reg.page_list = frmr->fr_pgl;

	frmr_wr.wr.fast_reg.page_list = frmr->fr_pgl;

	frmr_wr.wr.fast_reg.page_list_len = page_no;

	frmr_wr.wr.fast_reg.page_list_len = page_no;
@@ -1766,6 +1764,7 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, 
	*nsegs = i;

	*nsegs = i;

	return 0;

	return 0;

out_err:

out_err:

	frmr->fr_state = FRMR_IS_INVALID;

	while (i--)

	while (i--)

		rpcrdma_unmap_one(ia, --seg);

		rpcrdma_unmap_one(ia, --seg);

	return rc;

	return rc;