forked from Minki/linux
6deb209dc6
The following commits added support for printing the real address-65875073ed("net: use %px to print skb address in trace_netif_receive_skb")70713dddf3("net_sched: introduce tracepoint trace_qdisc_enqueue()")851f36e409("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: Sean Tranchetti <quic_stranche@quicinc.com> Signed-off-by: Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com> Signed-off-by: David S. Miller <davem@davemloft.net>
154 lines
3.8 KiB
C
154 lines
3.8 KiB
C
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM qdisc
|
|
|
|
#if !defined(_TRACE_QDISC_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_QDISC_H
|
|
|
|
#include <linux/skbuff.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/ftrace.h>
|
|
#include <linux/pkt_sched.h>
|
|
#include <net/sch_generic.h>
|
|
|
|
TRACE_EVENT(qdisc_dequeue,
|
|
|
|
TP_PROTO(struct Qdisc *qdisc, const struct netdev_queue *txq,
|
|
int packets, struct sk_buff *skb),
|
|
|
|
TP_ARGS(qdisc, txq, packets, skb),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( struct Qdisc *, qdisc )
|
|
__field(const struct netdev_queue *, txq )
|
|
__field( int, packets )
|
|
__field( void *, skbaddr )
|
|
__field( int, ifindex )
|
|
__field( u32, handle )
|
|
__field( u32, parent )
|
|
__field( unsigned long, txq_state)
|
|
),
|
|
|
|
/* skb==NULL indicate packets dequeued was 0, even when packets==1 */
|
|
TP_fast_assign(
|
|
__entry->qdisc = qdisc;
|
|
__entry->txq = txq;
|
|
__entry->packets = skb ? packets : 0;
|
|
__entry->skbaddr = skb;
|
|
__entry->ifindex = txq->dev ? txq->dev->ifindex : 0;
|
|
__entry->handle = qdisc->handle;
|
|
__entry->parent = qdisc->parent;
|
|
__entry->txq_state = txq->state;
|
|
),
|
|
|
|
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->txq_state, __entry->packets, __entry->skbaddr )
|
|
);
|
|
|
|
TRACE_EVENT(qdisc_enqueue,
|
|
|
|
TP_PROTO(struct Qdisc *qdisc, const struct netdev_queue *txq, struct sk_buff *skb),
|
|
|
|
TP_ARGS(qdisc, txq, skb),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(struct Qdisc *, qdisc)
|
|
__field(const struct netdev_queue *, txq)
|
|
__field(void *, skbaddr)
|
|
__field(int, ifindex)
|
|
__field(u32, handle)
|
|
__field(u32, parent)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->qdisc = qdisc;
|
|
__entry->txq = txq;
|
|
__entry->skbaddr = skb;
|
|
__entry->ifindex = txq->dev ? txq->dev->ifindex : 0;
|
|
__entry->handle = qdisc->handle;
|
|
__entry->parent = qdisc->parent;
|
|
),
|
|
|
|
TP_printk("enqueue ifindex=%d qdisc handle=0x%X parent=0x%X skbaddr=%p",
|
|
__entry->ifindex, __entry->handle, __entry->parent, __entry->skbaddr)
|
|
);
|
|
|
|
TRACE_EVENT(qdisc_reset,
|
|
|
|
TP_PROTO(struct Qdisc *q),
|
|
|
|
TP_ARGS(q),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( dev, qdisc_dev(q) )
|
|
__string( kind, q->ops->id )
|
|
__field( u32, parent )
|
|
__field( u32, handle )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(dev, qdisc_dev(q));
|
|
__assign_str(kind, q->ops->id);
|
|
__entry->parent = q->parent;
|
|
__entry->handle = q->handle;
|
|
),
|
|
|
|
TP_printk("dev=%s kind=%s parent=%x:%x handle=%x:%x", __get_str(dev),
|
|
__get_str(kind), TC_H_MAJ(__entry->parent) >> 16, TC_H_MIN(__entry->parent),
|
|
TC_H_MAJ(__entry->handle) >> 16, TC_H_MIN(__entry->handle))
|
|
);
|
|
|
|
TRACE_EVENT(qdisc_destroy,
|
|
|
|
TP_PROTO(struct Qdisc *q),
|
|
|
|
TP_ARGS(q),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( dev, qdisc_dev(q) )
|
|
__string( kind, q->ops->id )
|
|
__field( u32, parent )
|
|
__field( u32, handle )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(dev, qdisc_dev(q));
|
|
__assign_str(kind, q->ops->id);
|
|
__entry->parent = q->parent;
|
|
__entry->handle = q->handle;
|
|
),
|
|
|
|
TP_printk("dev=%s kind=%s parent=%x:%x handle=%x:%x", __get_str(dev),
|
|
__get_str(kind), TC_H_MAJ(__entry->parent) >> 16, TC_H_MIN(__entry->parent),
|
|
TC_H_MAJ(__entry->handle) >> 16, TC_H_MIN(__entry->handle))
|
|
);
|
|
|
|
TRACE_EVENT(qdisc_create,
|
|
|
|
TP_PROTO(const struct Qdisc_ops *ops, struct net_device *dev, u32 parent),
|
|
|
|
TP_ARGS(ops, dev, parent),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( dev, dev->name )
|
|
__string( kind, ops->id )
|
|
__field( u32, parent )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(dev, dev->name);
|
|
__assign_str(kind, ops->id);
|
|
__entry->parent = parent;
|
|
),
|
|
|
|
TP_printk("dev=%s kind=%s parent=%x:%x",
|
|
__get_str(dev), __get_str(kind),
|
|
TC_H_MAJ(__entry->parent) >> 16, TC_H_MIN(__entry->parent))
|
|
);
|
|
|
|
#endif /* _TRACE_QDISC_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|