mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-19 09:04:51 +08:00
eb7935830d
Before this patch the bridge used a fixed 256 element hash table which was fine for small use cases (in my tests it starts to degrade above 1000 entries), but it wasn't enough for medium or large scale deployments. Modern setups have thousands of participants in a single bridge, even only enabling vlans and adding a few thousand vlan entries will cause a few thousand fdbs to be automatically inserted per participating port. So we need to scale the fdb table considerably to cope with modern workloads, and this patch converts it to use a rhashtable for its operations thus improving the bridge scalability. Tests show the following results (10 runs each), at up to 1000 entries rhashtable is ~3% slower, at 2000 rhashtable is 30% faster, at 3000 it is 2 times faster and at 30000 it is 50 times faster. Obviously this happens because of the properties of the two constructs and is expected, rhashtable keeps pretty much a constant time even with 10000000 entries (tested), while the fixed hash table struggles considerably even above 10000. As a side effect this also reduces the net_bridge struct size from 3248 bytes to 1344 bytes. Also note that the key struct is 8 bytes. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
130 lines
3.5 KiB
C
130 lines
3.5 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, bool added_by_user),
|
|
|
|
TP_ARGS(br, source, addr, vid, added_by_user),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(br_dev, br->dev->name)
|
|
__string(dev, source->dev->name)
|
|
__array(unsigned char, addr, ETH_ALEN)
|
|
__field(u16, vid)
|
|
__field(bool, added_by_user)
|
|
),
|
|
|
|
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->added_by_user = added_by_user;
|
|
),
|
|
|
|
TP_printk("br_dev %s source %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u added_by_user %d",
|
|
__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->added_by_user)
|
|
);
|
|
|
|
|
|
#endif /* _TRACE_BRIDGE_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|