bridge: per-cpu packet statistics
Subsystems (3)
PATCH 1/1 bridge: per-cpu packet statistics
The shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array, but only keep those statistics which change per-packet.
---
net/bridge/br_device.c | 43 ++++++++++++++++++++++++++++++++++++++----- net/bridge/br_if.c | 6 ++++++ net/bridge/br_input.c | 5 +++-- net/bridge/br_private.h | 8 ++++++++ 4 files changed, 55 insertions(+), 7 deletions(-)
net/bridge/br_device.c +35 -4
@@ -26,11 +26,12 @@ netdev_tx_t br_dev_xmit(struct sk_buff *const unsigned char *dest = skb->data;struct net_bridge_fdb_entry *dst;struct net_bridge_mdb_entry *mdst; +struct br_cpu_netstats *brstats =this_cpu_ptr (br->stats); -BR_INPUT_SKB_CB (skb)->brdev = dev; + brstats->tx_packets++; + brstats->tx_bytes += skb->len; - dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; +BR_INPUT_SKB_CB (skb)->brdev = dev;skb_reset_mac_header (skb);skb_pull (skb,ETH_HLEN );
@@ -81,6 +82,28 @@ static int br_dev_stop(struct net_devicereturn 0 ; } +static struct net_device_stats *br_get_stats (struct net_device *dev) +{ +struct net_bridge *br =netdev_priv (dev); +struct net_device_stats *stats = &dev->stats; +unsigned int cpu; + + stats->tx_bytes = stats->tx_packets =0 ; + stats->rx_bytes = stats->rx_packets =0 ; + +for_each_online_cpu (cpu) { +const struct br_cpu_netstats *bstats + =per_cpu_ptr (br->stats, cpu); + + stats->tx_bytes += bstats->tx_bytes; + stats->tx_packets += bstats->tx_packets; + stats->rx_bytes += bstats->rx_bytes; + stats->rx_packets += bstats->rx_packets; + } + +return stats; +} +static int br_change_mtu (struct net_device *dev,int new_mtu) {struct net_bridge *br =netdev_priv (dev);
@@ -180,19 +203,27 @@ static const struct net_device_ops br_ne .ndo_open = br_dev_open, .ndo_stop = br_dev_stop, .ndo_start_xmit = br_dev_xmit, + .ndo_get_stats = br_get_stats, .ndo_set_mac_address = br_set_mac_address, .ndo_set_multicast_list = br_dev_set_multicast_list, .ndo_change_mtu = br_change_mtu, .ndo_do_ioctl = br_dev_ioctl, }; +static void br_dev_free (struct net_device *dev) +{ +struct net_bridge *br =netdev_priv (dev); + +free_percpu (br->stats); +} +void br_dev_setup (struct net_device *dev) {random_ether_addr (dev->dev_addr);ether_setup (dev); dev->netdev_ops = &br_netdev_ops; - dev->destructor = free_netdev; + dev->destructor = br_dev_free;SET_ETHTOOL_OPS (dev, &br_ethtool_ops); dev->tx_queue_len =0 ; dev->priv_flags =IFF_EBRIDGE ;
net/bridge/br_if.c +6 -0
@@ -185,6 +185,12 @@ static struct net_device *new_bridge_dev br =netdev_priv (dev); br->dev = dev; + br->stats =alloc_percpu (sizeof (struct br_cpu_netstats )); +if (!br->stats) { +free_netdev (dev); +return NULL ; + } +spin_lock_init (&br->lock);INIT_LIST_HEAD (&br->port_list);spin_lock_init (&br->hash_lock);
net/bridge/br_input.c +4 -2
@@ -23,9 +23,11 @@ const u8 br_group_address[ETH_ALEN] = {static int br_pass_frame_up (struct sk_buff *skb) {struct net_device *indev, *brdev =BR_INPUT_SKB_CB (skb)->brdev; +struct net_bridge *br =netdev_priv (brdev); +struct br_cpu_netstats *brstats =this_cpu_ptr (br->stats); - brdev->stats.rx_packets++; - brdev->stats.rx_bytes += skb->len; + brstats->rx_packets++; + brstats->rx_bytes += skb->len; indev = skb->dev; skb->dev = brdev;
net/bridge/br_private.h +8 -0
@@ -135,6 +135,14 @@ struct net_bridgespinlock_t lock;struct list_head port_list;struct net_device *dev; + +struct br_cpu_netstats __percpu { +unsigned long rx_packets; +unsigned long tx_packets; +unsigned long rx_bytes; +unsigned long tx_bytes; + } *stats; +spinlock_t hash_lock;struct hlist_head hash[BR_HASH_SIZE ];unsigned long feature_mask;
Quoted 17 lines · Stephen Hemminger
The shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array, but only keep those statistics which change per-packet.
Signed-off-by Stephen Hemminger <[email protected]>---
net/bridge/br_device.c | 43 ++++++++++++++++++++++++++++++++++++++----- net/bridge/br_if.c | 6 ++++++ net/bridge/br_input.c | 5 +++-- net/bridge/br_private.h | 8 ++++++++ 4 files changed, 55 insertions(+), 7 deletions(-)
net/bridge/br_device.c netdev_tx_t br_dev_xmit(struct sk_buff * · line 32
Quoted 8 lines
net/bridge/br_device.c +3
-1@@ -26,11 +26,12 @@ netdev_tx_t br_dev_xmit(struct sk_buff *const unsigned char *dest = skb->data;struct net_bridge_fdb_entry *dst;struct net_bridge_mdb_entry *mdst; +struct br_cpu_netstats *brstats =this_cpu_ptr (br->stats); -BR_INPUT_SKB_CB (skb)->brdev = dev; + brstats->tx_packets++; + brstats->tx_bytes += skb->len;
On TX path, this is not really necessary, since we already dirtied txq->lock before calling br_dev_xmit(), we can use txq->tx_packets and txq->tx_bytes for free ?
Quoted 11 lines
net/bridge/br_device.c +1
-2- dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; +BR_INPUT_SKB_CB (skb)->brdev = dev;skb_reset_mac_header (skb);skb_pull (skb,ETH_HLEN );@@ -81,6 +82,28 @@ static int br_dev_stop(struct net_devicereturn 0 ; }
Quoted 23 lines · On Tue, 02 Mar 2010 07:01:30 +0100 Eric Dumazet <[email protected]> wrote:
Quoted 22 lines · Stephen Hemminger
The shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array, but only keep those statistics which change per-packet.
Signed-off-by Stephen Hemminger <[email protected]>---
net/bridge/br_device.c | 43 ++++++++++++++++++++++++++++++++++++++----- net/bridge/br_if.c | 6 ++++++ net/bridge/br_input.c | 5 +++-- net/bridge/br_private.h | 8 ++++++++ 4 files changed, 55 insertions(+), 7 deletions(-)net/bridge/br_device.c +1
-0@@ -26,11 +26,12 @@ netdev_tx_t br_dev_xmit(struct sk_buff *const unsigned char *dest = skb->data;struct net_bridge_fdb_entry *dst;struct net_bridge_mdb_entry *mdst; +struct br_cpu_netstats *brstats =this_cpu_ptr (br->stats);
Quoted 8 lines
net/bridge/br_device.c netdev_tx_t br_dev_xmit(struct sk_buff * · line 32
Quoted 3 lines
net/bridge/br_device.c +2
-1-BR_INPUT_SKB_CB (skb)->brdev = dev; + brstats->tx_packets++; + brstats->tx_bytes += skb->len;On TX path, this is not really necessary, since we already dirtied
txq->lockbefore callingbr_dev_xmit(), we can usetxq->tx_packetsandtxq->tx_bytesfor free ?
Bridge is already using lockless transmit LLTX, so tx_lock is not touched.
Quoted 2 lines · Stephen Hemminger
Bridge is already using lockless transmit LLTX, so
tx_lockis not touched.
LLTX doesn't actually buy you anything since you're still going through a single qdisc. To get the full benefits of the per-cpu counters you need to implement multiqueue support in the bridge.
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtQuoted 6 lines · Stephen Hemminger
net/bridge/br_device.c +6
-0+static void br_dev_free (struct net_device *dev) +{ +struct net_bridge *br =netdev_priv (dev); + +free_percpu (br->stats); +}
net/bridge/br_device.c static const struct net_device_ops br_ne · line 227
Quoted 10 lines
net/bridge/br_device.c +2
-1+void br_dev_setup (struct net_device *dev) {random_ether_addr (dev->dev_addr);ether_setup (dev); dev->netdev_ops = &br_netdev_ops; - dev->destructor = free_netdev; + dev->destructor = br_dev_free;SET_ETHTOOL_OPS (dev, &br_ethtool_ops);
Isnt free_netdev() missing after this change ?
net/bridge/br_if.c static struct net_device *new_bridge_dev · line 193
Quoted 12 lines · Stephen Hemminger
net/bridge/br_if.c +6
-0@@ -185,6 +185,12 @@ static struct net_device *new_bridge_dev br =netdev_priv (dev); br->dev = dev; + br->stats =alloc_percpu (sizeof (struct br_cpu_netstats )); +if (!br->stats) { +free_netdev (dev); +return NULL ; + } +
Strange... this should be :
nr->stats = alloc_percpu(struct br_cpu_netstats);
Or even better, ask percpu allocator an aligned chunk (2 or 4 longs) instead of (1 long)
nr->stats = __alloc_percpu(sizeof(struct br_cpu_netstats), 4 * sizeof(long));
From: Stephen Hemminger <[email protected]>
Review
Quoted 7 lines · Stephen Hemminger
(quoted diff) +7
-0+ for_each_online_cpu(cpu) { + const struct br_cpu_netstats *bstats + = per_cpu_ptr(br->stats, cpu); + + stats->rx_bytes += bstats->rx_bytes; + stats->rx_packets += bstats->rx_packets; + }
And last point, we should use for_each_possible_cpu() here
Here is your patch with all my comments integrated :
1) Use txq->{tx_bytes|tx_packets} counter
2) alloc_percpu(struct ...) instead of alloc_percpu(sizeof(struct ...))
3) free_netdev() in destructor
4) for_each_possible_cpu() instead of for_each_online_cpu()
5) br_get_stats() use local variables for the sake of concurrent users
Next step would be to use multiqueue :)
Thanks
[PATCH] bridge: per-cpu packet statistics
The shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array for rx_packets/rx_bytes RX accounting, and use txq tx_packets/tx_bytes for TX accounting
--- net/bridge/br_device.c | 39 +++++++++++++++++++++++++++++++++++--- net/bridge/br_if.c | 6 +++++ net/bridge/br_input.c | 6 +++-- net/bridge/br_private.h | 6 +++++ 4 files changed, 52 insertions(+), 5 deletions(-)
net/bridge/br_device.c +36 -3
@@ -22,6 +22,8 @@/* net device transmit always called with no BH (preempt_disabled) */ netdev_tx_t br_dev_xmit (struct sk_buff *skb,struct net_device *dev) { +int qidx =skb_get_queue_mapping (skb); +struct netdev_queue *txq =netdev_get_tx_queue (dev, qidx);struct net_bridge *br =netdev_priv (dev);const unsigned char *dest = skb->data;struct net_bridge_fdb_entry *dst;
@@ -29,8 +31,8 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)BR_INPUT_SKB_CB (skb)->brdev = dev; - dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; + txq->tx_packets++; + txq->tx_bytes += skb->len;skb_reset_mac_header (skb);skb_pull (skb,ETH_HLEN );
@@ -81,6 +83,28 @@ static int br_dev_stop(struct net_device *dev)return 0 ; } +static struct net_device_stats *br_get_stats (struct net_device *dev) +{ +struct net_bridge *br =netdev_priv (dev); +struct net_device_stats *stats = &dev->stats; +unsigned long rx_bytes =0 , rx_packets =0 ; +unsigned int cpu; + +dev_txq_stats_fold (dev, stats); + +for_each_possible_cpu (cpu) { +const struct br_cpu_netstats *bstats + =per_cpu_ptr (br->stats, cpu); + + rx_bytes += bstats->rx_bytes; + rx_packets += bstats->rx_packets; + } + stats->rx_bytes = rx_bytes; + stats->rx_packets = rx_packets; + +return stats; +} +static int br_change_mtu (struct net_device *dev,int new_mtu) {struct net_bridge *br =netdev_priv (dev);
@@ -180,19 +204,28 @@ static const struct net_device_ops br_netdev_ops = { .ndo_open = br_dev_open, .ndo_stop = br_dev_stop, .ndo_start_xmit = br_dev_xmit, + .ndo_get_stats = br_get_stats, .ndo_set_mac_address = br_set_mac_address, .ndo_set_multicast_list = br_dev_set_multicast_list, .ndo_change_mtu = br_change_mtu, .ndo_do_ioctl = br_dev_ioctl, }; +static void br_dev_free (struct net_device *dev) +{ +struct net_bridge *br =netdev_priv (dev); + +free_percpu (br->stats); +free_netdev (dev); +} +void br_dev_setup (struct net_device *dev) {random_ether_addr (dev->dev_addr);ether_setup (dev); dev->netdev_ops = &br_netdev_ops; - dev->destructor = free_netdev; + dev->destructor = br_dev_free;SET_ETHTOOL_OPS (dev, &br_ethtool_ops); dev->tx_queue_len =0 ; dev->priv_flags =IFF_EBRIDGE ;
net/bridge/br_if.c +6 -0
@@ -185,6 +185,12 @@ static struct net_device *new_bridge_dev(struct net *net, const char *name) br =netdev_priv (dev); br->dev = dev; + br->stats = alloc_percpu(struct br_cpu_netstats); +if (!br->stats) { +free_netdev (dev); +return NULL ; + } +spin_lock_init (&br->lock);INIT_LIST_HEAD (&br->port_list);spin_lock_init (&br->hash_lock);
net/bridge/br_input.c +4 -2
@@ -23,9 +23,11 @@ const u8 br_group_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };static int br_pass_frame_up (struct sk_buff *skb) {struct net_device *indev, *brdev =BR_INPUT_SKB_CB (skb)->brdev; +struct net_bridge *br =netdev_priv (brdev); +struct br_cpu_netstats *brstats =this_cpu_ptr (br->stats); - brdev->stats.rx_packets++; - brdev->stats.rx_bytes += skb->len; + brstats->rx_packets++; + brstats->rx_bytes += skb->len; indev = skb->dev; skb->dev = brdev;
net/bridge/br_private.h +6 -0
@@ -135,6 +135,12 @@ struct net_bridgespinlock_t lock;struct list_head port_list;struct net_device *dev; + +struct br_cpu_netstats __percpu { +unsigned long rx_bytes; +unsigned long rx_packets; + } *stats; +spinlock_t hash_lock;struct hlist_head hash[BR_HASH_SIZE ];unsigned long feature_mask;
Quoted 18 lines · On Tue, 02 Mar 2010 10:02:59 +0100 Eric Dumazet <[email protected]> wrote:
From: Stephen Hemminger <[email protected]>
net/bridge/br_device.c static int br_dev_stop(struct net_device *dev) · line 101
Quoted 7 lines · Stephen Hemminger
net/bridge/br_device.c +7
-0+for_each_online_cpu (cpu) { +const struct br_cpu_netstats *bstats + =per_cpu_ptr (br->stats, cpu); + + stats->rx_bytes += bstats->rx_bytes; + stats->rx_packets += bstats->rx_packets; + }And last point, we should use
for_each_possible_cpu()hereHere is your patch with all my comments integrated :
1) Use txq->{tx_bytes|tx_packets} counter
Quoted 7 lines
2)
alloc_percpu(struct ...)instead ofalloc_percpu(sizeof(struct ...))3)
free_netdev()in destructor4)
for_each_possible_cpu()instead offor_each_online_cpu()5)
br_get_stats()use local variables for the sake of concurrent users
No need, bridge has no queue!
Quoted 2 lines · Stephen Hemminger
No need, bridge has no queue!
OK, ignore my previous comment :)
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtPATCH 1/1 bridge: per-cpu packet statistics (v2)
In reply to Eric DumazetThe shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array, but only keep those statistics which change per-packet.
---
Take Eric's bug fix changes. But keep the per cpu transmit per cpu statistics. There is no point in going multiqueue for a pseudo-interface which is lockless and queue less.
net/bridge/br_device.c | 43 ++++++++++++++++++++++++++++++++++++++----- net/bridge/br_if.c | 6 ++++++ net/bridge/br_input.c | 5 +++-- net/bridge/br_private.h | 8 ++++++++ 4 files changed, 55 insertions(+), 7 deletions(-)
net/bridge/br_device.c +39 -4
@@ -26,11 +26,12 @@ netdev_tx_t br_dev_xmit(struct sk_buff *const unsigned char *dest = skb->data;struct net_bridge_fdb_entry *dst;struct net_bridge_mdb_entry *mdst; +struct br_cpu_netstats *brstats =this_cpu_ptr (br->stats); -BR_INPUT_SKB_CB (skb)->brdev = dev; + brstats->tx_packets++; + brstats->tx_bytes += skb->len; - dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; +BR_INPUT_SKB_CB (skb)->brdev = dev;skb_reset_mac_header (skb);skb_pull (skb,ETH_HLEN );
@@ -81,6 +82,31 @@ static int br_dev_stop(struct net_devicereturn 0 ; } +static struct net_device_stats *br_get_stats (struct net_device *dev) +{ +struct net_bridge *br =netdev_priv (dev); +struct net_device_stats *stats = &dev->stats; +struct br_cpu_netstats sum = {0 }; +unsigned int cpu; + +for_each_possible_cpu (cpu) { +const struct br_cpu_netstats *bstats + =per_cpu_ptr (br->stats, cpu); + + sum.tx_bytes += bstats->tx_bytes; + sum.tx_packets += bstats->tx_packets; + sum.rx_bytes += bstats->rx_bytes; + sum.rx_packets += bstats->rx_packets; + } + + stats->tx_bytes = sum.tx_bytes; + stats->tx_packets = sum.tx_packets; + stats->rx_bytes = sum.rx_bytes; + stats->rx_packets = sum.rx_packets; + +return stats; +} +static int br_change_mtu (struct net_device *dev,int new_mtu) {struct net_bridge *br =netdev_priv (dev);
@@ -180,19 +206,28 @@ static const struct net_device_ops br_ne .ndo_open = br_dev_open, .ndo_stop = br_dev_stop, .ndo_start_xmit = br_dev_xmit, + .ndo_get_stats = br_get_stats, .ndo_set_mac_address = br_set_mac_address, .ndo_set_multicast_list = br_dev_set_multicast_list, .ndo_change_mtu = br_change_mtu, .ndo_do_ioctl = br_dev_ioctl, }; +static void br_dev_free (struct net_device *dev) +{ +struct net_bridge *br =netdev_priv (dev); + +free_percpu (br->stats); +free_netdev (dev); +} +void br_dev_setup (struct net_device *dev) {random_ether_addr (dev->dev_addr);ether_setup (dev); dev->netdev_ops = &br_netdev_ops; - dev->destructor = free_netdev; + dev->destructor = br_dev_free;SET_ETHTOOL_OPS (dev, &br_ethtool_ops); dev->tx_queue_len =0 ; dev->priv_flags =IFF_EBRIDGE ;
net/bridge/br_if.c +6 -0
@@ -185,6 +185,12 @@ static struct net_device *new_bridge_dev br =netdev_priv (dev); br->dev = dev; + br->stats = alloc_percpu(struct br_cpu_netstats); +if (!br->stats) { +free_netdev (dev); +return NULL ; + } +spin_lock_init (&br->lock);INIT_LIST_HEAD (&br->port_list);spin_lock_init (&br->hash_lock);
net/bridge/br_input.c +4 -2
@@ -23,9 +23,11 @@ const u8 br_group_address[ETH_ALEN] = {static int br_pass_frame_up (struct sk_buff *skb) {struct net_device *indev, *brdev =BR_INPUT_SKB_CB (skb)->brdev; +struct net_bridge *br =netdev_priv (brdev); +struct br_cpu_netstats *brstats =this_cpu_ptr (br->stats); - brdev->stats.rx_packets++; - brdev->stats.rx_bytes += skb->len; + brstats->rx_packets++; + brstats->rx_bytes += skb->len; indev = skb->dev; skb->dev = brdev;
net/bridge/br_private.h +8 -0
@@ -135,6 +135,14 @@ struct net_bridgespinlock_t lock;struct list_head port_list;struct net_device *dev; + +struct br_cpu_netstats __percpu { +unsigned long rx_packets; +unsigned long tx_packets; +unsigned long rx_bytes; +unsigned long tx_bytes; + } *stats; +spinlock_t hash_lock;struct hlist_head hash[BR_HASH_SIZE ];unsigned long feature_mask;
Re: [PATCH] bridge: per-cpu packet statistics (v2)
net/bridge/br_private.h struct net_bridge · line 145
Quoted 7 lines · Stephen Hemminger
net/bridge/br_private.h +7
-0+struct br_cpu_netstats __percpu { +unsigned long rx_packets; +unsigned long tx_packets; +unsigned long rx_bytes; +unsigned long tx_bytes; + } *stats; +
Ok, please group rx stats together instead of interleave, this to reduce possibility of touching two cache lines in tx path (or rx path)
struct br_cpu_netstats __percpu {Quoted 7 lines
unsigned long rx_packets;net/bridge/br_private.h +5
-0+unsigned long rx_bytes; +unsigned long tx_packets; +unsigned long tx_bytes; + } *stats; +
PATCH 1/1 bridge: per-cpu packet statistics (v3)
The shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array, but only keep those statistics which change per-packet.
---
Move tx and rx to be next to each other per Eric's suggestion
net/bridge/br_device.c | 43 ++++++++++++++++++++++++++++++++++++++----- net/bridge/br_if.c | 6 ++++++ net/bridge/br_input.c | 5 +++-- net/bridge/br_private.h | 8 ++++++++ 4 files changed, 55 insertions(+), 7 deletions(-)
net/bridge/br_device.c +39 -4
@@ -26,11 +26,12 @@ netdev_tx_t br_dev_xmit(struct sk_buff *const unsigned char *dest = skb->data;struct net_bridge_fdb_entry *dst;struct net_bridge_mdb_entry *mdst; +struct br_cpu_netstats *brstats =this_cpu_ptr (br->stats); -BR_INPUT_SKB_CB (skb)->brdev = dev; + brstats->tx_packets++; + brstats->tx_bytes += skb->len; - dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; +BR_INPUT_SKB_CB (skb)->brdev = dev;skb_reset_mac_header (skb);skb_pull (skb,ETH_HLEN );
@@ -81,6 +82,31 @@ static int br_dev_stop(struct net_devicereturn 0 ; } +static struct net_device_stats *br_get_stats (struct net_device *dev) +{ +struct net_bridge *br =netdev_priv (dev); +struct net_device_stats *stats = &dev->stats; +struct br_cpu_netstats sum = {0 }; +unsigned int cpu; + +for_each_possible_cpu (cpu) { +const struct br_cpu_netstats *bstats + =per_cpu_ptr (br->stats, cpu); + + sum.tx_bytes += bstats->tx_bytes; + sum.tx_packets += bstats->tx_packets; + sum.rx_bytes += bstats->rx_bytes; + sum.rx_packets += bstats->rx_packets; + } + + stats->tx_bytes = sum.tx_bytes; + stats->tx_packets = sum.tx_packets; + stats->rx_bytes = sum.rx_bytes; + stats->rx_packets = sum.rx_packets; + +return stats; +} +static int br_change_mtu (struct net_device *dev,int new_mtu) {struct net_bridge *br =netdev_priv (dev);
@@ -180,19 +206,28 @@ static const struct net_device_ops br_ne .ndo_open = br_dev_open, .ndo_stop = br_dev_stop, .ndo_start_xmit = br_dev_xmit, + .ndo_get_stats = br_get_stats, .ndo_set_mac_address = br_set_mac_address, .ndo_set_multicast_list = br_dev_set_multicast_list, .ndo_change_mtu = br_change_mtu, .ndo_do_ioctl = br_dev_ioctl, }; +static void br_dev_free (struct net_device *dev) +{ +struct net_bridge *br =netdev_priv (dev); + +free_percpu (br->stats); +free_netdev (dev); +} +void br_dev_setup (struct net_device *dev) {random_ether_addr (dev->dev_addr);ether_setup (dev); dev->netdev_ops = &br_netdev_ops; - dev->destructor = free_netdev; + dev->destructor = br_dev_free;SET_ETHTOOL_OPS (dev, &br_ethtool_ops); dev->tx_queue_len =0 ; dev->priv_flags =IFF_EBRIDGE ;
net/bridge/br_if.c +6 -0
@@ -185,6 +185,12 @@ static struct net_device *new_bridge_dev br =netdev_priv (dev); br->dev = dev; + br->stats = alloc_percpu(struct br_cpu_netstats); +if (!br->stats) { +free_netdev (dev); +return NULL ; + } +spin_lock_init (&br->lock);INIT_LIST_HEAD (&br->port_list);spin_lock_init (&br->hash_lock);
net/bridge/br_input.c +4 -2
@@ -23,9 +23,11 @@ const u8 br_group_address[ETH_ALEN] = {static int br_pass_frame_up (struct sk_buff *skb) {struct net_device *indev, *brdev =BR_INPUT_SKB_CB (skb)->brdev; +struct net_bridge *br =netdev_priv (brdev); +struct br_cpu_netstats *brstats =this_cpu_ptr (br->stats); - brdev->stats.rx_packets++; - brdev->stats.rx_bytes += skb->len; + brstats->rx_packets++; + brstats->rx_bytes += skb->len; indev = skb->dev; skb->dev = brdev;
net/bridge/br_private.h +8 -0
@@ -135,6 +135,14 @@ struct net_bridgespinlock_t lock;struct list_head port_list;struct net_device *dev; + +struct br_cpu_netstats __percpu { +unsigned long rx_packets; +unsigned long rx_bytes; +unsigned long tx_packets; +unsigned long tx_bytes; + } *stats; +spinlock_t hash_lock;struct hlist_head hash[BR_HASH_SIZE ];unsigned long feature_mask;
Re: [Bridge] [PATCH] bridge: per-cpu packet statistics (v3)
Quoted 6 lines · Stephen Hemminger
The shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array, but only keep those statistics which change per-packet.
Signed-off-by Stephen Hemminger <[email protected]>
Thanks Stephen !
David Miller
maintainerRe: [Bridge] [PATCH] bridge: per-cpu packet statistics (v3)
From: Eric Dumazet <[email protected]>
Date: Wed, 03 Mar 2010 07:09:04 +0100
Quoted 11 lines · Stephen Hemminger
Quoted 6 lines
The shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array, but only keep those statistics which change per-packet.
Signed-off-by Stephen Hemminger <[email protected]>Thanks Stephen !
Signed-off-by Eric Dumazet <[email protected]>
This is fine but needs to go into the next merge window, not this one.
Bug fixes only now.
Re: [Bridge] [PATCH] bridge: per-cpu packet statistics (v3)
In reply to Stephen HemmingerFrom: Stephen Hemminger <[email protected]>
Date: Tue, 2 Mar 2010 15:32:09 -0800
Quoted 5 lines
The shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array, but only keep those statistics which change per-packet.
Signed-off-by Stephen Hemminger <[email protected]>
Applied.