Commit 84f4a40d authored by Kaike Wan's avatar Kaike Wan Committed by Doug Ledford
Browse files

IB/hfi1: Add static trace for flow and TID management functions 



This patch adds the static trace for the flow and TID management
functions to help debugging in the filed.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarKaike Wan <kaike.wan@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 2f16a696

drivers/infiniband/hw/hfi1/tid_rdma.c

+19 −0
Original line number Diff line number Diff line
@@ -817,8 +817,11 @@ static u32 tid_rdma_find_phys_blocks_4k(struct tid_rdma_flow *flow, 
	 * using the bigger supported sizes.

	 */

	vaddr = page_address(pages[0]);

	trace_hfi1_tid_flow_page(flow->req->qp, flow, 0, 0, 0, vaddr);

	for (pageidx = 0, pagecount = 1, i = 1; i <= npages; i++) {

		this_vaddr = i < npages ? page_address(pages[i]) : NULL;

		trace_hfi1_tid_flow_page(flow->req->qp, flow, i, 0, 0,

					 this_vaddr);

		/*

		 * If the vaddr's are not sequential, pages are not physically

		 * contiguous.
@@ -851,6 +854,9 @@ static u32 tid_rdma_find_phys_blocks_4k(struct tid_rdma_flow *flow, 


				list[setcount].idx = pageidx;

				list[setcount].count = maxpages;

				trace_hfi1_tid_pageset(flow->req->qp, setcount,

						       list[setcount].idx,

						       list[setcount].count);

				pagecount -= maxpages;

				pageidx += maxpages;

				setcount++;
@@ -946,8 +952,10 @@ static u32 tid_rdma_find_phys_blocks_8k(struct tid_rdma_flow *flow, 
	for (idx = 0, i = 0, vm1 = NULL; i < npages; i += 2) {

		/* get a new v0 */

		v0 = page_address(pages[i]);

		trace_hfi1_tid_flow_page(flow->req->qp, flow, i, 1, 0, v0);

		v1 = i + 1 < npages ?

				page_address(pages[i + 1]) : NULL;

		trace_hfi1_tid_flow_page(flow->req->qp, flow, i, 1, 1, v1);

		/* compare i, i + 1 vaddr */

		if (v1 != (v0 + PAGE_SIZE)) {

			/* flush out pages */
@@ -1093,6 +1101,8 @@ static int kern_get_phys_blocks(struct tid_rdma_flow *flow, 


	/* Reuse previously computed pagesets, if any */

	if (flow->npagesets) {

		trace_hfi1_tid_flow_alloc(flow->req->qp, flow->req->setup_head,

					  flow);

		if (!dma_mapped(flow))

			return dma_map_flow(flow, pages);

		return 0;
@@ -1128,6 +1138,8 @@ static inline void kern_add_tid_node(struct tid_rdma_flow *flow, 
	node->grp = grp;

	node->map = grp->map;

	node->cnt = cnt;

	trace_hfi1_tid_node_add(flow->req->qp, s, flow->tnode_cnt - 1,

				grp->base, grp->map, grp->used, cnt);

}



/*
@@ -1199,6 +1211,8 @@ used_list: 
	if (pageidx >= flow->npagesets)

		goto ok;

bail_eagain:

	trace_hfi1_msg_alloc_tids(flow->req->qp, " insufficient tids: needed ",

				  (u64)flow->npagesets);

	return -EAGAIN;

ok:

	return 0;
@@ -1250,6 +1264,10 @@ static void kern_program_rcv_group(struct tid_rdma_flow *flow, int grp_num, 
				EXP_TID_SET(IDX, rcventry >> 1) |

				EXP_TID_SET(CTRL, tidctrl) |

				EXP_TID_SET(LEN, npages);

			trace_hfi1_tid_entry_alloc(/* entry */

			   flow->req->qp, flow->tidcnt - 1,

			   flow->tid_entry[flow->tidcnt - 1]);



			/* Efficient DIV_ROUND_UP(npages, pmtu_pg) */

			flow->npkts += (npages + pmtu_pg - 1) >> ilog2(pmtu_pg);

			npages = 0;
@@ -1316,6 +1334,7 @@ static void kern_program_rcvarray(struct tid_rdma_flow *flow) 
	flow->tidcnt = 0;

	for (i = 0; i < flow->tnode_cnt; i++)

		kern_program_rcv_group(flow, i, &pset_idx);

	trace_hfi1_tid_flow_alloc(flow->req->qp, flow->req->setup_head, flow);

}



/**

drivers/infiniband/hw/hfi1/trace.c

+16 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
 */

#define CREATE_TRACE_POINTS

#include "trace.h"

#include "exp_rcv.h"



static u8 __get_ib_hdr_len(struct ib_header *hdr)

{
@@ -394,6 +395,21 @@ const char *print_u32_array( 
	return ret;

}



u8 hfi1_trace_get_tid_ctrl(u32 ent)

{

	return EXP_TID_GET(ent, CTRL);

}



u16 hfi1_trace_get_tid_len(u32 ent)

{

	return EXP_TID_GET(ent, LEN);

}



u16 hfi1_trace_get_tid_idx(u32 ent)

{

	return EXP_TID_GET(ent, IDX);

}



__hfi1_trace_fn(AFFINITY);

__hfi1_trace_fn(PKT);

__hfi1_trace_fn(PROC);

drivers/infiniband/hw/hfi1/trace_tid.h

+234 −0
Original line number Diff line number Diff line
@@ -21,10 +21,21 @@ __print_symbolic(type, \ 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM hfi1_tid



u8 hfi1_trace_get_tid_ctrl(u32 ent);

u16 hfi1_trace_get_tid_len(u32 ent);

u16 hfi1_trace_get_tid_idx(u32 ent);



#define OPFN_PARAM_PRN "[%s] qpn 0x%x %s OPFN: qp 0x%x, max read %u, " \

		       "max write %u, max length %u, jkey 0x%x timeout %u " \

		       "urg %u"



#define TID_FLOW_PRN "[%s] qpn 0x%x flow %d: idx %d resp_ib_psn 0x%x " \

		     "generation 0x%x fpsn 0x%x-%x r_next_psn 0x%x " \

		     "npagesets %u tnode_cnt %u tidcnt %u length %u"



#define TID_NODE_PRN "[%s] qpn 0x%x  %s idx %u grp base 0x%x map 0x%x " \

		     "used %u cnt %u"



DECLARE_EVENT_CLASS(/* class */

	hfi1_exp_tid_reg_unreg,

	TP_PROTO(unsigned int ctxt, u16 subctxt, u32 rarr, u32 npages,
@@ -323,6 +334,229 @@ DEFINE_EVENT(/* event */ 
	TP_ARGS(qp, msg, more)

);



DEFINE_EVENT(/* event */

	hfi1_msg_template, hfi1_msg_alloc_tids,

	TP_PROTO(struct rvt_qp *qp, const char *msg, u64 more),

	TP_ARGS(qp, msg, more)

);



DECLARE_EVENT_CLASS(/* tid_flow_page */

	hfi1_tid_flow_page_template,

	TP_PROTO(struct rvt_qp *qp, struct tid_rdma_flow *flow, u32 index,

		 char mtu8k, char v1, void *vaddr),

	TP_ARGS(qp, flow, index, mtu8k, v1, vaddr),

	TP_STRUCT__entry(/* entry */

		DD_DEV_ENTRY(dd_from_ibdev(qp->ibqp.device))

		__field(u32, qpn)

		__field(char, mtu8k)

		__field(char, v1)

		__field(u32, index)

		__field(u64, page)

		__field(u64, vaddr)

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

		__entry->qpn = qp->ibqp.qp_num;

		__entry->mtu8k = mtu8k;

		__entry->v1 = v1;

		__entry->index = index;

		__entry->page = vaddr ? (u64)virt_to_page(vaddr) : 0ULL;

		__entry->vaddr = (u64)vaddr;

	),

	TP_printk(/* print */

		"[%s] qpn 0x%x page[%u]: page 0x%llx %s 0x%llx",

		__get_str(dev),

		__entry->qpn,

		__entry->index,

		__entry->page,

		__entry->mtu8k ? (__entry->v1 ? "v1" : "v0") : "vaddr",

		__entry->vaddr

	)

);



DEFINE_EVENT(/* event */

	hfi1_tid_flow_page_template, hfi1_tid_flow_page,

	TP_PROTO(struct rvt_qp *qp, struct tid_rdma_flow *flow, u32 index,

		 char mtu8k, char v1, void *vaddr),

	TP_ARGS(qp, flow, index, mtu8k, v1, vaddr)

);



DECLARE_EVENT_CLASS(/* tid_pageset */

	hfi1_tid_pageset_template,

	TP_PROTO(struct rvt_qp *qp, u32 index, u16 idx, u16 count),

	TP_ARGS(qp, index, idx, count),

	TP_STRUCT__entry(/* entry */

		DD_DEV_ENTRY(dd_from_ibdev(qp->ibqp.device))

		__field(u32, qpn)

		__field(u32, index)

		__field(u16, idx)

		__field(u16, count)

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

		__entry->qpn = qp->ibqp.qp_num;

		__entry->index = index;

		__entry->idx = idx;

		__entry->count = count;

	),

	TP_printk(/* print */

		"[%s] qpn 0x%x list[%u]: idx %u count %u",

		__get_str(dev),

		__entry->qpn,

		__entry->index,

		__entry->idx,

		__entry->count

	)

);



DEFINE_EVENT(/* event */

	hfi1_tid_pageset_template, hfi1_tid_pageset,

	TP_PROTO(struct rvt_qp *qp, u32 index, u16 idx, u16 count),

	TP_ARGS(qp, index, idx, count)

);



DECLARE_EVENT_CLASS(/* tid_fow */

	hfi1_tid_flow_template,

	TP_PROTO(struct rvt_qp *qp, int index, struct tid_rdma_flow *flow),

	TP_ARGS(qp, index, flow),

	TP_STRUCT__entry(/* entry */

		DD_DEV_ENTRY(dd_from_ibdev(qp->ibqp.device))

		__field(u32, qpn)

		__field(int, index)

		__field(int, idx)

		__field(u32, resp_ib_psn)

		__field(u32, generation)

		__field(u32, fspsn)

		__field(u32, flpsn)

		__field(u32, r_next_psn)

		__field(u32, npagesets)

		__field(u32, tnode_cnt)

		__field(u32, tidcnt)

		__field(u32, length)

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

		__entry->qpn = qp->ibqp.qp_num;

		__entry->index = index;

		__entry->idx = flow->idx;

		__entry->resp_ib_psn = flow->flow_state.resp_ib_psn;

		__entry->generation = flow->flow_state.generation;

		__entry->fspsn = full_flow_psn(flow,

					       flow->flow_state.spsn);

		__entry->flpsn = full_flow_psn(flow,

					       flow->flow_state.lpsn);

		__entry->r_next_psn = flow->flow_state.r_next_psn;

		__entry->npagesets = flow->npagesets;

		__entry->tnode_cnt = flow->tnode_cnt;

		__entry->tidcnt = flow->tidcnt;

		__entry->length = flow->length;

	),

	TP_printk(/* print */

		TID_FLOW_PRN,

		__get_str(dev),

		__entry->qpn,

		__entry->index,

		__entry->idx,

		__entry->resp_ib_psn,

		__entry->generation,

		__entry->fspsn,

		__entry->flpsn,

		__entry->r_next_psn,

		__entry->npagesets,

		__entry->tnode_cnt,

		__entry->tidcnt,

		__entry->length

	)

);



DEFINE_EVENT(/* event */

	hfi1_tid_flow_template, hfi1_tid_flow_alloc,

	TP_PROTO(struct rvt_qp *qp, int index, struct tid_rdma_flow *flow),

	TP_ARGS(qp, index, flow)

);



DECLARE_EVENT_CLASS(/* tid_node */

	hfi1_tid_node_template,

	TP_PROTO(struct rvt_qp *qp, const char *msg, u32 index, u32 base,

		 u8 map, u8 used, u8 cnt),

	TP_ARGS(qp, msg, index, base, map, used, cnt),

	TP_STRUCT__entry(/* entry */

		DD_DEV_ENTRY(dd_from_ibdev(qp->ibqp.device))

		__field(u32, qpn)

		__string(msg, msg)

		__field(u32, index)

		__field(u32, base)

		__field(u8, map)

		__field(u8, used)

		__field(u8, cnt)

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

		__entry->qpn = qp->ibqp.qp_num;

		__assign_str(msg, msg);

		__entry->index = index;

		__entry->base = base;

		__entry->map = map;

		__entry->used = used;

		__entry->cnt = cnt;

	),

	TP_printk(/* print */

		TID_NODE_PRN,

		__get_str(dev),

		__entry->qpn,

		__get_str(msg),

		__entry->index,

		__entry->base,

		__entry->map,

		__entry->used,

		__entry->cnt

	)

);



DEFINE_EVENT(/* event */

	hfi1_tid_node_template, hfi1_tid_node_add,

	TP_PROTO(struct rvt_qp *qp, const char *msg, u32 index, u32 base,

		 u8 map, u8 used, u8 cnt),

	TP_ARGS(qp, msg, index, base, map, used, cnt)

);



DECLARE_EVENT_CLASS(/* tid_entry */

	hfi1_tid_entry_template,

	TP_PROTO(struct rvt_qp *qp, int index, u32 ent),

	TP_ARGS(qp, index, ent),

	TP_STRUCT__entry(/* entry */

		DD_DEV_ENTRY(dd_from_ibdev(qp->ibqp.device))

		__field(u32, qpn)

		__field(int, index)

		__field(u8, ctrl)

		__field(u16, idx)

		__field(u16, len)

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd_from_ibdev(qp->ibqp.device));

		__entry->qpn = qp->ibqp.qp_num;

		__entry->index = index;

		__entry->ctrl = hfi1_trace_get_tid_ctrl(ent);

		__entry->idx = hfi1_trace_get_tid_idx(ent);

		__entry->len = hfi1_trace_get_tid_len(ent);

	),

	TP_printk(/* print */

		"[%s] qpn 0x%x TID entry %d: idx %u len %u ctrl 0x%x",

		__get_str(dev),

		__entry->qpn,

		__entry->index,

		__entry->idx,

		__entry->len,

		__entry->ctrl

	)

);



DEFINE_EVENT(/* event */

	hfi1_tid_entry_template, hfi1_tid_entry_alloc,

	TP_PROTO(struct rvt_qp *qp, int index, u32 entry),

	TP_ARGS(qp, index, entry)

);



#endif /* __HFI1_TRACE_TID_H */



#undef TRACE_INCLUDE_PATH

CRA Git | Maintained and supported by SUSTech CRA and CCSE