Skip to content

Commit

Permalink
IB/hfi1: Add 16B rcvhdr trace support
Browse files Browse the repository at this point in the history
Add trace_hfi1_rcvhdr support for bypass packets.
While here, remove the etype argument as it is available
in struct hfi1_packet.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Don Hiatt <don.hiatt@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
  • Loading branch information
Don Hiatt authored and Jason Gunthorpe committed Feb 1, 2018
1 parent 953a9ce commit 6197a81
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion drivers/infiniband/hw/hfi1/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1559,7 +1559,7 @@ int process_receive_ib(struct hfi1_packet *packet)
if (hfi1_setup_9B_packet(packet))
return RHF_RCV_CONTINUE;

trace_hfi1_rcvhdr(packet, RHF_RCV_TYPE_IB);
trace_hfi1_rcvhdr(packet);

if (unlikely(rhf_err_flags(packet->rhf))) {
handle_eflags(packet);
Expand Down Expand Up @@ -1595,6 +1595,8 @@ int process_receive_bypass(struct hfi1_packet *packet)
if (hfi1_setup_bypass_packet(packet))
return RHF_RCV_CONTINUE;

trace_hfi1_rcvhdr(packet);

if (unlikely(rhf_err_flags(packet->rhf))) {
handle_eflags(packet);
return RHF_RCV_CONTINUE;
Expand Down
6 changes: 3 additions & 3 deletions drivers/infiniband/hw/hfi1/trace_rx.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ __print_symbolic(type, \
#define TRACE_SYSTEM hfi1_rx

TRACE_EVENT(hfi1_rcvhdr,
TP_PROTO(struct hfi1_packet *packet, u32 etype),
TP_ARGS(packet, etype),
TP_PROTO(struct hfi1_packet *packet),
TP_ARGS(packet),
TP_STRUCT__entry(DD_DEV_ENTRY(packet->rcd->dd)
__field(u64, eflags)
__field(u32, ctxt)
Expand All @@ -77,7 +77,7 @@ TRACE_EVENT(hfi1_rcvhdr,
TP_fast_assign(DD_DEV_ASSIGN(packet->rcd->dd);
__entry->eflags = rhf_err_flags(packet->rhf);
__entry->ctxt = packet->rcd->ctxt;
__entry->etype = etype;
__entry->etype = packet->etype;
__entry->hlen = packet->hlen;
__entry->tlen = packet->tlen;
__entry->updegr = packet->updegr;
Expand Down

0 comments on commit 6197a81

Please sign in to comment.