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

Commit 1db78eee authored Mar 07, 2016 by Mike Marciniszyn Committed by Doug Ledford Mar 17, 2016

IB/hfi1: Add unique trace point for pio and sdma send



This allows for separately enabling pio and sdma
tracepoints to cut the volume of trace information.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

parent ef6d8c4e

drivers/staging/rdma/hfi1/rc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -881,7 +881,7 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata rcd, struct rvt_qp qp,
	goto queue_ack;		goto queue_ack;
	}		}

	trace_output_ibhdr(dd_from_ibdev(qp->ibqp.device), &hdr);		trace_ack_output_ibhdr(dd_from_ibdev(qp->ibqp.device), &hdr);

	/* write the pbc and data */		/* write the pbc and data */
	ppd->dd->pio_inline_send(ppd->dd, pbuf, pbc, &hdr, hwords);		ppd->dd->pio_inline_send(ppd->dd, pbuf, pbc, &hdr, hwords);

drivers/staging/rdma/hfi1/trace.h

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -530,7 +530,15 @@ DEFINE_EVENT(hfi1_ibhdr_template, input_ibhdr,
	TP_PROTO(struct hfi1_devdata dd, struct hfi1_ib_header hdr),		TP_PROTO(struct hfi1_devdata dd, struct hfi1_ib_header hdr),
	TP_ARGS(dd, hdr));		TP_ARGS(dd, hdr));

	DEFINE_EVENT(hfi1_ibhdr_template, output_ibhdr,		DEFINE_EVENT(hfi1_ibhdr_template, pio_output_ibhdr,
			TP_PROTO(struct hfi1_devdata dd, struct hfi1_ib_header hdr),
			TP_ARGS(dd, hdr));

			DEFINE_EVENT(hfi1_ibhdr_template, ack_output_ibhdr,
			TP_PROTO(struct hfi1_devdata dd, struct hfi1_ib_header hdr),
			TP_ARGS(dd, hdr));

			DEFINE_EVENT(hfi1_ibhdr_template, sdma_output_ibhdr,
	TP_PROTO(struct hfi1_devdata dd, struct hfi1_ib_header hdr),		TP_PROTO(struct hfi1_devdata dd, struct hfi1_ib_header hdr),
	TP_ARGS(dd, hdr));		TP_ARGS(dd, hdr));

drivers/staging/rdma/hfi1/verbs.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -891,7 +891,7 @@ int hfi1_verbs_send_dma(struct rvt_qp qp, struct hfi1_pkt_state ps,
	if (unlikely(ret))		if (unlikely(ret))
	goto bail_build;		goto bail_build;
	}		}
	trace_output_ibhdr(dd_from_ibdev(qp->ibqp.device),		trace_sdma_output_ibhdr(dd_from_ibdev(qp->ibqp.device),
	&ps->s_txreq->phdr.hdr);		&ps->s_txreq->phdr.hdr);
	ret = sdma_send_txreq(tx->sde, &priv->s_iowait, &tx->txreq);		ret = sdma_send_txreq(tx->sde, &priv->s_iowait, &tx->txreq);
	if (unlikely(ret == -ECOMM))		if (unlikely(ret == -ECOMM))
	@@ -1067,7 +1067,7 @@ int hfi1_verbs_send_pio(struct rvt_qp qp, struct hfi1_pkt_state ps,
	}		}
	}		}

	trace_output_ibhdr(dd_from_ibdev(qp->ibqp.device),		trace_pio_output_ibhdr(dd_from_ibdev(qp->ibqp.device),
	&ps->s_txreq->phdr.hdr);		&ps->s_txreq->phdr.hdr);

	pio_bail:		pio_bail: