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

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

xprtrdma: Add trace points to instrument memory invalidation 



Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent e11b7c96

include/trace/events/rpcrdma.h

+41 −0
Original line number Diff line number Diff line
@@ -201,6 +201,41 @@ DECLARE_EVENT_CLASS(xprtrdma_frwr_done, 
				),					\

				TP_ARGS(wc, frwr))



DECLARE_EVENT_CLASS(xprtrdma_mr,

	TP_PROTO(

		const struct rpcrdma_mr *mr

	),



	TP_ARGS(mr),



	TP_STRUCT__entry(

		__field(const void *, mr)

		__field(u32, handle)

		__field(u32, length)

		__field(u64, offset)

	),



	TP_fast_assign(

		__entry->mr = mr;

		__entry->handle = mr->mr_handle;

		__entry->length = mr->mr_length;

		__entry->offset = mr->mr_offset;

	),



	TP_printk("mr=%p %u@0x%016llx:0x%08x",

		__entry->mr, __entry->length,

		(unsigned long long)__entry->offset,

		__entry->handle

	)

);



#define DEFINE_MR_EVENT(name) \

		DEFINE_EVENT(xprtrdma_mr, name, \

				TP_PROTO( \

					const struct rpcrdma_mr *mr \

				), \

				TP_ARGS(mr))



/**

 ** Call events

 **/
@@ -382,6 +417,12 @@ TRACE_EVENT(xprtrdma_wc_receive, 
);



DEFINE_FRWR_DONE_EVENT(xprtrdma_wc_fastreg);

DEFINE_FRWR_DONE_EVENT(xprtrdma_wc_li);

DEFINE_FRWR_DONE_EVENT(xprtrdma_wc_li_wake);



DEFINE_MR_EVENT(xprtrdma_localinv);

DEFINE_MR_EVENT(xprtrdma_dma_unmap);

DEFINE_MR_EVENT(xprtrdma_remoteinv);



/**

 ** Reply events

net/sunrpc/xprtrdma/fmr_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ fmr_op_recover_mr(struct rpcrdma_mr *mr) 
	pr_err("rpcrdma: FMR reset failed (%d), %p released\n", rc, mr);

	r_xprt->rx_stats.mrs_orphaned++;



	trace_xprtrdma_dma_unmap(mr);

	ib_dma_unmap_sg(r_xprt->rx_ia.ri_device,

			mr->mr_sg, mr->mr_nents, mr->mr_dir);
@@ -273,6 +274,7 @@ fmr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs) 
	list_for_each_entry(mr, mrs, mr_list) {

		dprintk("RPC:       %s: unmapping fmr %p\n",

			__func__, &mr->fmr);

		trace_xprtrdma_localinv(mr);

		list_add_tail(&mr->fmr.fm_mr->list, &unmap_list);

	}

	r_xprt->rx_stats.local_inv_needed++;
@@ -285,8 +287,6 @@ fmr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs) 
	 */

	while (!list_empty(mrs)) {

		mr = rpcrdma_mr_pop(mrs);

		dprintk("RPC:       %s: DMA unmapping fmr %p\n",

			__func__, &mr->fmr);

		list_del(&mr->fmr.fm_mr->list);

		rpcrdma_mr_unmap_and_put(mr);

	}

net/sunrpc/xprtrdma/frwr_ops.c

+13 −14
Original line number Diff line number Diff line
@@ -182,9 +182,11 @@ frwr_op_recover_mr(struct rpcrdma_mr *mr) 
	int rc;



	rc = __frwr_mr_reset(ia, mr);

	if (state != FRWR_FLUSHED_LI)

	if (state != FRWR_FLUSHED_LI) {

		trace_xprtrdma_dma_unmap(mr);

		ib_dma_unmap_sg(ia->ri_device,

				mr->mr_sg, mr->mr_nents, mr->mr_dir);

	}

	if (rc)

		goto out_release;
@@ -307,16 +309,16 @@ frwr_wc_fastreg(struct ib_cq *cq, struct ib_wc *wc) 
static void

frwr_wc_localinv(struct ib_cq *cq, struct ib_wc *wc)

{

	struct rpcrdma_frwr *frwr;

	struct ib_cqe *cqe;

	struct ib_cqe *cqe = wc->wr_cqe;

	struct rpcrdma_frwr *frwr = container_of(cqe, struct rpcrdma_frwr,

						 fr_cqe);



	/* WARNING: Only wr_cqe and status are reliable at this point */

	if (wc->status != IB_WC_SUCCESS) {

		cqe = wc->wr_cqe;

		frwr = container_of(cqe, struct rpcrdma_frwr, fr_cqe);

		frwr->fr_state = FRWR_FLUSHED_LI;

		__frwr_sendcompletion_flush(wc, "localinv");

	}

	trace_xprtrdma_wc_li(wc, frwr);

}



/**
@@ -329,17 +331,17 @@ frwr_wc_localinv(struct ib_cq *cq, struct ib_wc *wc) 
static void

frwr_wc_localinv_wake(struct ib_cq *cq, struct ib_wc *wc)

{

	struct rpcrdma_frwr *frwr;

	struct ib_cqe *cqe;

	struct ib_cqe *cqe = wc->wr_cqe;

	struct rpcrdma_frwr *frwr = container_of(cqe, struct rpcrdma_frwr,

						 fr_cqe);



	/* WARNING: Only wr_cqe and status are reliable at this point */

	cqe = wc->wr_cqe;

	frwr = container_of(cqe, struct rpcrdma_frwr, fr_cqe);

	if (wc->status != IB_WC_SUCCESS) {

		frwr->fr_state = FRWR_FLUSHED_LI;

		__frwr_sendcompletion_flush(wc, "localinv");

	}

	complete(&frwr->fr_linv_done);

	trace_xprtrdma_wc_li_wake(wc, frwr);

}



/* Post a REG_MR Work Request to register a memory region
@@ -457,6 +459,7 @@ frwr_op_reminv(struct rpcrdma_rep *rep, struct list_head *mrs) 
	list_for_each_entry(mr, mrs, mr_list)

		if (mr->mr_handle == rep->rr_inv_rkey) {

			list_del(&mr->mr_list);

			trace_xprtrdma_remoteinv(mr);

			mr->frwr.fr_state = FRWR_IS_INVALID;

			rpcrdma_mr_unmap_and_put(mr);

			break;	/* only one invalidated MR per RPC */
@@ -492,9 +495,7 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs) 
		mr->frwr.fr_state = FRWR_IS_INVALID;



		frwr = &mr->frwr;



		dprintk("RPC:       %s: invalidating frwr %p\n",

			__func__, frwr);

		trace_xprtrdma_localinv(mr);



		frwr->fr_cqe.done = frwr_wc_localinv;

		last = &frwr->fr_invwr;
@@ -536,8 +537,6 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs) 
unmap:

	while (!list_empty(mrs)) {

		mr = rpcrdma_mr_pop(mrs);

		dprintk("RPC:       %s: DMA unmapping frwr %p\n",

			__func__, &mr->frwr);

		rpcrdma_mr_unmap_and_put(mr);

	}

	return;

net/sunrpc/xprtrdma/verbs.c

+1 −0
Original line number Diff line number Diff line
@@ -1349,6 +1349,7 @@ rpcrdma_mr_unmap_and_put(struct rpcrdma_mr *mr) 
{

	struct rpcrdma_xprt *r_xprt = mr->mr_xprt;



	trace_xprtrdma_dma_unmap(mr);

	ib_dma_unmap_sg(r_xprt->rx_ia.ri_device,

			mr->mr_sg, mr->mr_nents, mr->mr_dir);

	__rpcrdma_mr_put(&r_xprt->rx_buf, mr);