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

IB/hfi1: Add static trace for OPFN 



This patch adds the static trace to the OPFN code and moves tid related
static trace code into a new header file.

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 48a615dc

drivers/infiniband/hw/hfi1/opfn.c

+14 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static void opfn_conn_request(struct rvt_qp *qp) 
	unsigned long flags;

	int ret = 0;



	trace_hfi1_opfn_state_conn_request(qp);

	spin_lock_irqsave(&priv->opfn.lock, flags);

	/*

	 * Exit if the extended bit is not set, or if nothing is requested, or
@@ -76,6 +77,7 @@ static void opfn_conn_request(struct rvt_qp *qp) 
		goto done;

	}



	trace_hfi1_opfn_data_conn_request(qp, capcode, data);

	data = (data & ~0xf) | capcode;



	memset(&wr, 0, sizeof(wr));
@@ -90,8 +92,11 @@ static void opfn_conn_request(struct rvt_qp *qp) 
	ret = ib_post_send(&qp->ibqp, &wr.wr, NULL);

	if (ret)

		goto err;

	trace_hfi1_opfn_state_conn_request(qp);

	return;

err:

	trace_hfi1_msg_opfn_conn_request(qp, "ib_ost_send failed: ret = ",

					 (u64)ret);

	spin_lock_irqsave(&priv->opfn.lock, flags);

	/*

	 * In case of an unexpected error return from ib_post_send
@@ -123,6 +128,7 @@ static void opfn_schedule_conn_request(struct rvt_qp *qp) 
{

	struct hfi1_qp_priv *priv = qp->priv;



	trace_hfi1_opfn_state_sched_conn_request(qp);

	queue_work(opfn_wq, &priv->opfn.opfn_work);

}
@@ -135,7 +141,9 @@ void opfn_conn_response(struct rvt_qp *qp, struct rvt_ack_entry *e, 
	u8 capcode;

	unsigned long flags;



	trace_hfi1_opfn_state_conn_response(qp);

	capcode = data & 0xf;

	trace_hfi1_opfn_data_conn_response(qp, capcode, data);

	if (!capcode || capcode >= STL_VERBS_EXTD_MAX)

		return;
@@ -160,6 +168,7 @@ void opfn_conn_response(struct rvt_qp *qp, struct rvt_ack_entry *e, 
	if (extd->response(qp, &data))

		priv->opfn.completed |= OPFN_CODE(capcode);

	e->atomic_data = (data & ~0xf) | capcode;

	trace_hfi1_opfn_state_conn_response(qp);

	spin_unlock_irqrestore(&priv->opfn.lock, flags);

}
@@ -170,7 +179,9 @@ void opfn_conn_reply(struct rvt_qp *qp, u64 data) 
	u8 capcode;

	unsigned long flags;



	trace_hfi1_opfn_state_conn_reply(qp);

	capcode = data & 0xf;

	trace_hfi1_opfn_data_conn_reply(qp, capcode, data);

	if (!capcode || capcode >= STL_VERBS_EXTD_MAX)

		return;
@@ -195,6 +206,7 @@ clear: 
	 * progress

	 */

	priv->opfn.curr = STL_VERBS_EXTD_NONE;

	trace_hfi1_opfn_state_conn_reply(qp);

done:

	spin_unlock_irqrestore(&priv->opfn.lock, flags);

}
@@ -206,6 +218,8 @@ void opfn_conn_error(struct rvt_qp *qp) 
	unsigned long flags;

	u16 capcode;



	trace_hfi1_opfn_state_conn_error(qp);

	trace_hfi1_msg_opfn_conn_error(qp, "error. qp state ", (u64)qp->state);

	/*

	 * The QP has gone into the Error state. We have to invalidate all

	 * negotiated feature, including the one in progress (if any). The RC

drivers/infiniband/hw/hfi1/tid_rdma.c

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "hfi.h"

#include "verbs.h"

#include "tid_rdma.h"

#include "trace.h"



/*

 * J_KEY for kernel contexts when TID RDMA is used.
@@ -148,6 +149,8 @@ bool tid_rdma_conn_reply(struct rvt_qp *qp, u64 data) 
	priv->tid_timer_timeout_jiffies =

		usecs_to_jiffies((((4096UL * (1UL << remote->timeout)) /

				   1000UL) << 3) * 7);

	trace_hfi1_opfn_param(qp, 0, &priv->tid_rdma.local);

	trace_hfi1_opfn_param(qp, 1, remote);

	rcu_assign_pointer(priv->tid_rdma.remote, remote);

	/*

	 * A TID RDMA READ request's segment size is not equal to

drivers/infiniband/hw/hfi1/trace.h

+1 −0
Original line number Diff line number Diff line
@@ -63,3 +63,4 @@ __print_symbolic(etype, \ 
#include "trace_tx.h"

#include "trace_mmu.h"

#include "trace_iowait.h"

#include "trace_tid.h"

drivers/infiniband/hw/hfi1/trace_rx.h

+1 −106
Original line number Diff line number Diff line 
/*

 * Copyright(c) 2015 - 2017 Intel Corporation.

 * Copyright(c) 2015 - 2018 Intel Corporation.

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.
@@ -128,111 +128,6 @@ TRACE_EVENT(hfi1_receive_interrupt, 
		      )

);



DECLARE_EVENT_CLASS(

	    hfi1_exp_tid_reg_unreg,

	    TP_PROTO(unsigned int ctxt, u16 subctxt, u32 rarr,

		     u32 npages, unsigned long va, unsigned long pa,

		     dma_addr_t dma),

	    TP_ARGS(ctxt, subctxt, rarr, npages, va, pa, dma),

	    TP_STRUCT__entry(

			     __field(unsigned int, ctxt)

			     __field(u16, subctxt)

			     __field(u32, rarr)

			     __field(u32, npages)

			     __field(unsigned long, va)

			     __field(unsigned long, pa)

			     __field(dma_addr_t, dma)

			     ),

	    TP_fast_assign(

			   __entry->ctxt = ctxt;

			   __entry->subctxt = subctxt;

			   __entry->rarr = rarr;

			   __entry->npages = npages;

			   __entry->va = va;

			   __entry->pa = pa;

			   __entry->dma = dma;

			   ),

	    TP_printk("[%u:%u] entry:%u, %u pages @ 0x%lx, va:0x%lx dma:0x%llx",

		      __entry->ctxt,

		      __entry->subctxt,

		      __entry->rarr,

		      __entry->npages,

		      __entry->pa,

		      __entry->va,

		      __entry->dma

		      )

	);



DEFINE_EVENT(

	hfi1_exp_tid_reg_unreg, hfi1_exp_tid_unreg,

	TP_PROTO(unsigned int ctxt, u16 subctxt, u32 rarr, u32 npages,

		 unsigned long va, unsigned long pa, dma_addr_t dma),

	TP_ARGS(ctxt, subctxt, rarr, npages, va, pa, dma));



DEFINE_EVENT(

	hfi1_exp_tid_reg_unreg, hfi1_exp_tid_reg,

	TP_PROTO(unsigned int ctxt, u16 subctxt, u32 rarr, u32 npages,

		 unsigned long va, unsigned long pa, dma_addr_t dma),

	TP_ARGS(ctxt, subctxt, rarr, npages, va, pa, dma));



TRACE_EVENT(

	hfi1_put_tid,

	TP_PROTO(struct hfi1_devdata *dd,

		 u32 index, u32 type, unsigned long pa, u16 order),

	TP_ARGS(dd, index, type, pa, order),

	TP_STRUCT__entry(

		DD_DEV_ENTRY(dd)

		__field(unsigned long, pa);

		__field(u32, index);

		__field(u32, type);

		__field(u16, order);

	),

	TP_fast_assign(

		DD_DEV_ASSIGN(dd);

		__entry->pa = pa;

		__entry->index = index;

		__entry->type = type;

		__entry->order = order;

	),

	TP_printk("[%s] type %s pa %lx index %u order %u",

		  __get_str(dev),

		  show_tidtype(__entry->type),

		  __entry->pa,

		  __entry->index,

		  __entry->order

	)

);



TRACE_EVENT(hfi1_exp_tid_inval,

	    TP_PROTO(unsigned int ctxt, u16 subctxt, unsigned long va, u32 rarr,

		     u32 npages, dma_addr_t dma),

	    TP_ARGS(ctxt, subctxt, va, rarr, npages, dma),

	    TP_STRUCT__entry(

			     __field(unsigned int, ctxt)

			     __field(u16, subctxt)

			     __field(unsigned long, va)

			     __field(u32, rarr)

			     __field(u32, npages)

			     __field(dma_addr_t, dma)

			     ),

	    TP_fast_assign(

			   __entry->ctxt = ctxt;

			   __entry->subctxt = subctxt;

			   __entry->va = va;

			   __entry->rarr = rarr;

			   __entry->npages = npages;

			   __entry->dma = dma;

			  ),

	    TP_printk("[%u:%u] entry:%u, %u pages @ 0x%lx dma: 0x%llx",

		      __entry->ctxt,

		      __entry->subctxt,

		      __entry->rarr,

		      __entry->npages,

		      __entry->va,

		      __entry->dma

		      )

	    );



TRACE_EVENT(hfi1_mmu_invalidate,

	    TP_PROTO(unsigned int ctxt, u16 subctxt, const char *type,

		     unsigned long start, unsigned long end),

drivers/infiniband/hw/hfi1/trace_tid.h

0 → 100644
+332 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */

/*

 * Copyright(c) 2018 Intel Corporation.

 *

 */

#if !defined(__HFI1_TRACE_TID_H) || defined(TRACE_HEADER_MULTI_READ)

#define __HFI1_TRACE_TID_H



#include <linux/tracepoint.h>

#include <linux/trace_seq.h>



#include "hfi.h"



#define tidtype_name(type) { PT_##type, #type }

#define show_tidtype(type)                   \

__print_symbolic(type,                       \

	tidtype_name(EXPECTED),              \

	tidtype_name(EAGER),                 \

	tidtype_name(INVALID))               \



#undef TRACE_SYSTEM

#define TRACE_SYSTEM hfi1_tid



#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"



DECLARE_EVENT_CLASS(/* class */

	hfi1_exp_tid_reg_unreg,

	TP_PROTO(unsigned int ctxt, u16 subctxt, u32 rarr, u32 npages,

		 unsigned long va, unsigned long pa, dma_addr_t dma),

	TP_ARGS(ctxt, subctxt, rarr, npages, va, pa, dma),

	TP_STRUCT__entry(/* entry */

		__field(unsigned int, ctxt)

		__field(u16, subctxt)

		__field(u32, rarr)

		__field(u32, npages)

		__field(unsigned long, va)

		__field(unsigned long, pa)

		__field(dma_addr_t, dma)

	),

	TP_fast_assign(/* assign */

		__entry->ctxt = ctxt;

		__entry->subctxt = subctxt;

		__entry->rarr = rarr;

		__entry->npages = npages;

		__entry->va = va;

		__entry->pa = pa;

		__entry->dma = dma;

	),

	TP_printk("[%u:%u] entry:%u, %u pages @ 0x%lx, va:0x%lx dma:0x%llx",

		  __entry->ctxt,

		  __entry->subctxt,

		  __entry->rarr,

		  __entry->npages,

		  __entry->pa,

		  __entry->va,

		  __entry->dma

	)

);



DEFINE_EVENT(/* exp_tid_unreg */

	hfi1_exp_tid_reg_unreg, hfi1_exp_tid_unreg,

	TP_PROTO(unsigned int ctxt, u16 subctxt, u32 rarr, u32 npages,

		 unsigned long va, unsigned long pa, dma_addr_t dma),

	TP_ARGS(ctxt, subctxt, rarr, npages, va, pa, dma)

);



DEFINE_EVENT(/* exp_tid_reg */

	hfi1_exp_tid_reg_unreg, hfi1_exp_tid_reg,

	TP_PROTO(unsigned int ctxt, u16 subctxt, u32 rarr, u32 npages,

		 unsigned long va, unsigned long pa, dma_addr_t dma),

	TP_ARGS(ctxt, subctxt, rarr, npages, va, pa, dma)

);



TRACE_EVENT(/* put_tid */

	hfi1_put_tid,

	TP_PROTO(struct hfi1_devdata *dd,

		 u32 index, u32 type, unsigned long pa, u16 order),

	TP_ARGS(dd, index, type, pa, order),

	TP_STRUCT__entry(/* entry */

		DD_DEV_ENTRY(dd)

		__field(unsigned long, pa);

		__field(u32, index);

		__field(u32, type);

		__field(u16, order);

	),

	TP_fast_assign(/* assign */

		DD_DEV_ASSIGN(dd);

		__entry->pa = pa;

		__entry->index = index;

		__entry->type = type;

		__entry->order = order;

	),

	TP_printk("[%s] type %s pa %lx index %u order %u",

		  __get_str(dev),

		  show_tidtype(__entry->type),

		  __entry->pa,

		  __entry->index,

		  __entry->order

	)

);



TRACE_EVENT(/* exp_tid_inval */

	hfi1_exp_tid_inval,

	TP_PROTO(unsigned int ctxt, u16 subctxt, unsigned long va, u32 rarr,

		 u32 npages, dma_addr_t dma),

	TP_ARGS(ctxt, subctxt, va, rarr, npages, dma),

	TP_STRUCT__entry(/* entry */

		__field(unsigned int, ctxt)

		__field(u16, subctxt)

		__field(unsigned long, va)

		__field(u32, rarr)

		__field(u32, npages)

		__field(dma_addr_t, dma)

	),

	TP_fast_assign(/* assign */

		__entry->ctxt = ctxt;

		__entry->subctxt = subctxt;

		__entry->va = va;

		__entry->rarr = rarr;

		__entry->npages = npages;

		__entry->dma = dma;

	),

	TP_printk("[%u:%u] entry:%u, %u pages @ 0x%lx dma: 0x%llx",

		  __entry->ctxt,

		  __entry->subctxt,

		  __entry->rarr,

		  __entry->npages,

		  __entry->va,

		  __entry->dma

	)

);



DECLARE_EVENT_CLASS(/* opfn_state */

	hfi1_opfn_state_template,

	TP_PROTO(struct rvt_qp *qp),

	TP_ARGS(qp),

	TP_STRUCT__entry(/* entry */

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

		__field(u32, qpn)

		__field(u16, requested)

		__field(u16, completed)

		__field(u8, curr)

	),

	TP_fast_assign(/* assign */

		struct hfi1_qp_priv *priv = qp->priv;



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

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

		__entry->requested = priv->opfn.requested;

		__entry->completed = priv->opfn.completed;

		__entry->curr = priv->opfn.curr;

	),

	TP_printk(/* print */

		"[%s] qpn 0x%x requested 0x%x completed 0x%x curr 0x%x",

		__get_str(dev),

		__entry->qpn,

		__entry->requested,

		__entry->completed,

		__entry->curr

	)

);



DEFINE_EVENT(/* event */

	hfi1_opfn_state_template, hfi1_opfn_state_conn_request,

	TP_PROTO(struct rvt_qp *qp),

	TP_ARGS(qp)

);



DEFINE_EVENT(/* event */

	hfi1_opfn_state_template, hfi1_opfn_state_sched_conn_request,

	TP_PROTO(struct rvt_qp *qp),

	TP_ARGS(qp)

);



DEFINE_EVENT(/* event */

	hfi1_opfn_state_template, hfi1_opfn_state_conn_response,

	TP_PROTO(struct rvt_qp *qp),

	TP_ARGS(qp)

);



DEFINE_EVENT(/* event */

	hfi1_opfn_state_template, hfi1_opfn_state_conn_reply,

	TP_PROTO(struct rvt_qp *qp),

	TP_ARGS(qp)

);



DEFINE_EVENT(/* event */

	hfi1_opfn_state_template, hfi1_opfn_state_conn_error,

	TP_PROTO(struct rvt_qp *qp),

	TP_ARGS(qp)

);



DECLARE_EVENT_CLASS(/* opfn_data */

	hfi1_opfn_data_template,

	TP_PROTO(struct rvt_qp *qp, u8 capcode, u64 data),

	TP_ARGS(qp, capcode, data),

	TP_STRUCT__entry(/* entry */

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

		__field(u32, qpn)

		__field(u32, state)

		__field(u8, capcode)

		__field(u64, data)

	),

	TP_fast_assign(/* assign */

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

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

		__entry->state = qp->state;

		__entry->capcode = capcode;

		__entry->data = data;

	),

	TP_printk(/* printk */

		"[%s] qpn 0x%x (state 0x%x) Capcode %u data 0x%llx",

		__get_str(dev),

		__entry->qpn,

		__entry->state,

		__entry->capcode,

		__entry->data

	)

);



DEFINE_EVENT(/* event */

	hfi1_opfn_data_template, hfi1_opfn_data_conn_request,

	TP_PROTO(struct rvt_qp *qp, u8 capcode, u64 data),

	TP_ARGS(qp, capcode, data)

);



DEFINE_EVENT(/* event */

	hfi1_opfn_data_template, hfi1_opfn_data_conn_response,

	TP_PROTO(struct rvt_qp *qp, u8 capcode, u64 data),

	TP_ARGS(qp, capcode, data)

);



DEFINE_EVENT(/* event */

	hfi1_opfn_data_template, hfi1_opfn_data_conn_reply,

	TP_PROTO(struct rvt_qp *qp, u8 capcode, u64 data),

	TP_ARGS(qp, capcode, data)

);



DECLARE_EVENT_CLASS(/* opfn_param */

	hfi1_opfn_param_template,

	TP_PROTO(struct rvt_qp *qp, char remote,

		 struct tid_rdma_params *param),

	TP_ARGS(qp, remote, param),

	TP_STRUCT__entry(/* entry */

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

		__field(u32, qpn)

		__field(char, remote)

		__field(u32, param_qp)

		__field(u32, max_len)

		__field(u16, jkey)

		__field(u8, max_read)

		__field(u8, max_write)

		__field(u8, timeout)

		__field(u8, urg)

	),

	TP_fast_assign(/* assign */

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

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

		__entry->remote = remote;

		__entry->param_qp = param->qp;

		__entry->max_len = param->max_len;

		__entry->jkey = param->jkey;

		__entry->max_read = param->max_read;

		__entry->max_write = param->max_write;

		__entry->timeout = param->timeout;

		__entry->urg = param->urg;

	),

	TP_printk(/* print */

		OPFN_PARAM_PRN,

		__get_str(dev),

		__entry->qpn,

		__entry->remote ? "remote" : "local",

		__entry->param_qp,

		__entry->max_read,

		__entry->max_write,

		__entry->max_len,

		__entry->jkey,

		__entry->timeout,

		__entry->urg

	)

);



DEFINE_EVENT(/* event */

	hfi1_opfn_param_template, hfi1_opfn_param,

	TP_PROTO(struct rvt_qp *qp, char remote,

		 struct tid_rdma_params *param),

	TP_ARGS(qp, remote, param)

);



DECLARE_EVENT_CLASS(/* msg */

	hfi1_msg_template,

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

	TP_ARGS(qp, msg, more),

	TP_STRUCT__entry(/* entry */

		__field(u32, qpn)

		__string(msg, msg)

		__field(u64, more)

	),

	TP_fast_assign(/* assign */

		__entry->qpn = qp ? qp->ibqp.qp_num : 0;

		__assign_str(msg, msg);

		__entry->more = more;

	),

	TP_printk(/* print */

		"qpn 0x%x %s 0x%llx",

		__entry->qpn,

		__get_str(msg),

		__entry->more

	)

);



DEFINE_EVENT(/* event */

	hfi1_msg_template, hfi1_msg_opfn_conn_request,

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

	TP_ARGS(qp, msg, more)

);



DEFINE_EVENT(/* event */

	hfi1_msg_template, hfi1_msg_opfn_conn_error,

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

	TP_ARGS(qp, msg, more)

);



#endif /* __HFI1_TRACE_TID_H */



#undef TRACE_INCLUDE_PATH

#undef TRACE_INCLUDE_FILE

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace_tid

#include <trace/define_trace.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE