Skip to contentSkip to conversation

IB/hfi1: Add 16B rcvhdr trace support

PATCH Applied Dennis Dalessandro 2 participants 2 messages Feb 1, 2018 1 message not in the archive

Subsystems (2)
InfiniBand HFI1 driver
lore
Share & tools
lore

Dennis Dalessandro

author
#0 lore raw

PATCH 1/1 IB/hfi1: Add 16B rcvhdr trace support

From: Don Hiatt <[email protected]>

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 <[email protected]>
Signed-off-by Don Hiatt <[email protected]>
Signed-off-by Dennis Dalessandro <[email protected]>
---
 drivers/infiniband/hw/hfi1/driver.c   |    4 +++-
 drivers/infiniband/hw/hfi1/trace_rx.h |    6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/infiniband/hw/hfi1/driver.c +3 -1
index c7e6b67..addc68e 100644
@@ -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);

@@ -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;
drivers/infiniband/hw/hfi1/trace_rx.h +3 -3
index f768415..7eceb57 100644
@@ -63,8 +63,8 @@
 #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)

@@ -77,7 +77,7 @@
 	     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;

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20180201203845.14095.14729.stgit-9QXIwq+3FY+1XWohqUldA0EOCMrvLtNR@public.gmane.org

Applied
#2 lore raw
Quoted 9 lines · Dennis Dalessandro

From: Don Hiatt <[email protected]>

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 <[email protected]>
Signed-off-by Don Hiatt <[email protected]>
Signed-off-by Dennis Dalessandro <[email protected]>

Applied to for-next

Thanks,
Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html