mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 00:52:01 +00:00
be0c567797
If we modify br_fdb_update() to take flags directly we can get rid of one test and one atomic bitop in the learning path. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
130 lines
3.4 KiB
C
130 lines
3.4 KiB
C
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM bridge
|
|
|
|
#if !defined(_TRACE_BRIDGE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_BRIDGE_H
|
|
|
|
#include <linux/netdevice.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
#include "../../../net/bridge/br_private.h"
|
|
|
|
TRACE_EVENT(br_fdb_add,
|
|
|
|
TP_PROTO(struct ndmsg *ndm, struct net_device *dev,
|
|
const unsigned char *addr, u16 vid, u16 nlh_flags),
|
|
|
|
TP_ARGS(ndm, dev, addr, vid, nlh_flags),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u8, ndm_flags)
|
|
__string(dev, dev->name)
|
|
__array(unsigned char, addr, ETH_ALEN)
|
|
__field(u16, vid)
|
|
__field(u16, nlh_flags)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(dev, dev->name);
|
|
memcpy(__entry->addr, addr, ETH_ALEN);
|
|
__entry->vid = vid;
|
|
__entry->nlh_flags = nlh_flags;
|
|
__entry->ndm_flags = ndm->ndm_flags;
|
|
),
|
|
|
|
TP_printk("dev %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u nlh_flags %04x ndm_flags %02x",
|
|
__get_str(dev), __entry->addr[0], __entry->addr[1],
|
|
__entry->addr[2], __entry->addr[3], __entry->addr[4],
|
|
__entry->addr[5], __entry->vid,
|
|
__entry->nlh_flags, __entry->ndm_flags)
|
|
);
|
|
|
|
TRACE_EVENT(br_fdb_external_learn_add,
|
|
|
|
TP_PROTO(struct net_bridge *br, struct net_bridge_port *p,
|
|
const unsigned char *addr, u16 vid),
|
|
|
|
TP_ARGS(br, p, addr, vid),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(br_dev, br->dev->name)
|
|
__string(dev, p ? p->dev->name : "null")
|
|
__array(unsigned char, addr, ETH_ALEN)
|
|
__field(u16, vid)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(br_dev, br->dev->name);
|
|
__assign_str(dev, p ? p->dev->name : "null");
|
|
memcpy(__entry->addr, addr, ETH_ALEN);
|
|
__entry->vid = vid;
|
|
),
|
|
|
|
TP_printk("br_dev %s port %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u",
|
|
__get_str(br_dev), __get_str(dev), __entry->addr[0],
|
|
__entry->addr[1], __entry->addr[2], __entry->addr[3],
|
|
__entry->addr[4], __entry->addr[5], __entry->vid)
|
|
);
|
|
|
|
TRACE_EVENT(fdb_delete,
|
|
|
|
TP_PROTO(struct net_bridge *br, struct net_bridge_fdb_entry *f),
|
|
|
|
TP_ARGS(br, f),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(br_dev, br->dev->name)
|
|
__string(dev, f->dst ? f->dst->dev->name : "null")
|
|
__array(unsigned char, addr, ETH_ALEN)
|
|
__field(u16, vid)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(br_dev, br->dev->name);
|
|
__assign_str(dev, f->dst ? f->dst->dev->name : "null");
|
|
memcpy(__entry->addr, f->key.addr.addr, ETH_ALEN);
|
|
__entry->vid = f->key.vlan_id;
|
|
),
|
|
|
|
TP_printk("br_dev %s dev %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u",
|
|
__get_str(br_dev), __get_str(dev), __entry->addr[0],
|
|
__entry->addr[1], __entry->addr[2], __entry->addr[3],
|
|
__entry->addr[4], __entry->addr[5], __entry->vid)
|
|
);
|
|
|
|
TRACE_EVENT(br_fdb_update,
|
|
|
|
TP_PROTO(struct net_bridge *br, struct net_bridge_port *source,
|
|
const unsigned char *addr, u16 vid, unsigned long flags),
|
|
|
|
TP_ARGS(br, source, addr, vid, flags),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(br_dev, br->dev->name)
|
|
__string(dev, source->dev->name)
|
|
__array(unsigned char, addr, ETH_ALEN)
|
|
__field(u16, vid)
|
|
__field(unsigned long, flags)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(br_dev, br->dev->name);
|
|
__assign_str(dev, source->dev->name);
|
|
memcpy(__entry->addr, addr, ETH_ALEN);
|
|
__entry->vid = vid;
|
|
__entry->flags = flags;
|
|
),
|
|
|
|
TP_printk("br_dev %s source %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u flags 0x%lx",
|
|
__get_str(br_dev), __get_str(dev), __entry->addr[0],
|
|
__entry->addr[1], __entry->addr[2], __entry->addr[3],
|
|
__entry->addr[4], __entry->addr[5], __entry->vid,
|
|
__entry->flags)
|
|
);
|
|
|
|
|
|
#endif /* _TRACE_BRIDGE_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|