Commit 6deb209d authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan Committed by David S. Miller

net: Print hashed skb addresses for all net and qdisc events

The following commits added support for printing the real address-
65875073 ("net: use %px to print skb address in trace_netif_receive_skb")
70713ddd ("net_sched: introduce tracepoint trace_qdisc_enqueue()")
851f36e4 ("net_sched: use %px to print skb address in trace_qdisc_dequeue()")

However, tracing the packet traversal shows a mix of hashes and real
addresses. Pasting a sample trace for reference-

ping-14249   [002] .....  3424.046612: netif_rx_entry: dev=lo napi_id=0x3 queue_mapping=0
skbaddr=00000000dcbed83e vlan_tagged=0 vlan_proto=0x0000 vlan_tci=0x0000 protocol=0x0800
ip_summed=0 hash=0x00000000 l4_hash=0 len=84 data_len=0 truesize=768 mac_header_valid=1
mac_header=-14 nr_frags=0 gso_size=0 gso_type=0x0
ping-14249   [002] .....  3424.046615: netif_rx: dev=lo skbaddr=ffffff888e5d1000 len=84

Switch the trace print formats to %p for all the events to have a
consistent format of printing the hashed addresses in all cases.
Signed-off-by: default avatarSean Tranchetti <quic_stranche@quicinc.com>
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9dd094ee
...@@ -136,7 +136,7 @@ DECLARE_EVENT_CLASS(net_dev_template, ...@@ -136,7 +136,7 @@ DECLARE_EVENT_CLASS(net_dev_template,
__assign_str(name, skb->dev->name); __assign_str(name, skb->dev->name);
), ),
TP_printk("dev=%s skbaddr=%px len=%u", TP_printk("dev=%s skbaddr=%p len=%u",
__get_str(name), __entry->skbaddr, __entry->len) __get_str(name), __entry->skbaddr, __entry->len)
) )
......
...@@ -41,7 +41,7 @@ TRACE_EVENT(qdisc_dequeue, ...@@ -41,7 +41,7 @@ TRACE_EVENT(qdisc_dequeue,
__entry->txq_state = txq->state; __entry->txq_state = txq->state;
), ),
TP_printk("dequeue ifindex=%d qdisc handle=0x%X parent=0x%X txq_state=0x%lX packets=%d skbaddr=%px", TP_printk("dequeue ifindex=%d qdisc handle=0x%X parent=0x%X txq_state=0x%lX packets=%d skbaddr=%p",
__entry->ifindex, __entry->handle, __entry->parent, __entry->ifindex, __entry->handle, __entry->parent,
__entry->txq_state, __entry->packets, __entry->skbaddr ) __entry->txq_state, __entry->packets, __entry->skbaddr )
); );
...@@ -70,7 +70,7 @@ TRACE_EVENT(qdisc_enqueue, ...@@ -70,7 +70,7 @@ TRACE_EVENT(qdisc_enqueue,
__entry->parent = qdisc->parent; __entry->parent = qdisc->parent;
), ),
TP_printk("enqueue ifindex=%d qdisc handle=0x%X parent=0x%X skbaddr=%px", TP_printk("enqueue ifindex=%d qdisc handle=0x%X parent=0x%X skbaddr=%p",
__entry->ifindex, __entry->handle, __entry->parent, __entry->skbaddr) __entry->ifindex, __entry->handle, __entry->parent, __entry->skbaddr)
); );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment