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

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

xprtrdma: Save I/O direction in struct rpcrdma_frwr 



Move the the I/O direction field from rpcrdma_mr_seg into the
rpcrdma_frmr.

This makes it possible to DMA-unmap the frwr long after an RPC has
exited and its rpcrdma_mr_seg array has been released and re-used.
This might occur if an RPC times out while waiting for a new
connection to be established.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 55fdfce1

net/sunrpc/xprtrdma/frwr_ops.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -416,6 +416,7 @@ frwr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, 
			break;

			break;

	}

	}

	frmr->fr_nents = i;

	frmr->fr_nents = i;

	frmr->fr_dir = direction;





	dma_nents = ib_dma_map_sg(device, frmr->fr_sg, frmr->fr_nents, direction);

	dma_nents = ib_dma_map_sg(device, frmr->fr_sg, frmr->fr_nents, direction);

	if (!dma_nents) {

	if (!dma_nents) {
@@ -455,7 +456,6 @@ frwr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, 
	if (rc)

	if (rc)

		goto out_senderr;

		goto out_senderr;





	seg1->mr_dir = direction;

	seg1->rl_mw = mw;

	seg1->rl_mw = mw;

	seg1->mr_rkey = mr->rkey;

	seg1->mr_rkey = mr->rkey;

	seg1->mr_base = mr->iova;

	seg1->mr_base = mr->iova;
@@ -500,7 +500,7 @@ __frwr_dma_unmap(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, 




	seg->rl_mw = NULL;

	seg->rl_mw = NULL;





	ib_dma_unmap_sg(device, f->fr_sg, f->fr_nents, seg->mr_dir);

	ib_dma_unmap_sg(device, f->fr_sg, f->fr_nents, f->fr_dir);





	if (!rc)

	if (!rc)

		rpcrdma_put_mw(r_xprt, mw);

		rpcrdma_put_mw(r_xprt, mw);
@@ -611,7 +611,7 @@ frwr_op_unmap(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg) 
	invalidate_wr->ex.invalidate_rkey = frmr->fr_mr->rkey;

	invalidate_wr->ex.invalidate_rkey = frmr->fr_mr->rkey;

	DECR_CQCOUNT(&r_xprt->rx_ep);

	DECR_CQCOUNT(&r_xprt->rx_ep);





	ib_dma_unmap_sg(ia->ri_device, frmr->fr_sg, frmr->fr_nents, seg1->mr_dir);

	ib_dma_unmap_sg(ia->ri_device, frmr->fr_sg, frmr->fr_nents, frmr->fr_dir);

	read_lock(&ia->ri_qplock);

	read_lock(&ia->ri_qplock);

	rc = ib_post_send(ia->ri_id->qp, invalidate_wr, &bad_wr);

	rc = ib_post_send(ia->ri_id->qp, invalidate_wr, &bad_wr);

	read_unlock(&ia->ri_qplock);

	read_unlock(&ia->ri_qplock);

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -224,6 +224,7 @@ enum rpcrdma_frmr_state { 
struct rpcrdma_frmr {

struct rpcrdma_frmr {

	struct scatterlist		*fr_sg;

	struct scatterlist		*fr_sg;

	int				fr_nents;

	int				fr_nents;

	enum dma_data_direction		fr_dir;

	struct ib_mr			*fr_mr;

	struct ib_mr			*fr_mr;

	struct ib_cqe			fr_cqe;

	struct ib_cqe			fr_cqe;

	enum rpcrdma_frmr_state		fr_state;

	enum rpcrdma_frmr_state		fr_state;