evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vlan: use struct netdev_queue counters instead of dev->stats

Browse source 
We can update netdev_queue tx_bytes/tx_packets/tx_dropped counters instead
of dev->stats ones, to reduce number of cache lines dirtied in xmit path.

This fixes a performance problem on SMP when many different cpus take
vlan tx path.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2009-05-18 00:35:38 +00:00 • committed by David S. Miller
parent 7004bf252c
commit 450c4ea15e
2 changed files with 9 additions and 8 deletions

14
net/8021q/vlan_dev.c
View file

@ -290,7 +290,7 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct net_device_stats *stats = &dev->stats; struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);
/* Handle non-VLAN frames if they are sent to us, for example by DHCP. /* Handle non-VLAN frames if they are sent to us, for example by DHCP.
@ -309,7 +309,7 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb); vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb);
skb = __vlan_put_tag(skb, vlan_tci); skb = __vlan_put_tag(skb, vlan_tci);
if (!skb) { if (!skb) {
stats->tx_dropped++; txq->tx_dropped++;
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
@ -317,8 +317,8 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
vlan_dev_info(dev)->cnt_inc_headroom_on_tx++; vlan_dev_info(dev)->cnt_inc_headroom_on_tx++;
} }
stats->tx_packets++; txq->tx_packets++;
stats->tx_bytes += skb->len; txq->tx_bytes += skb->len;
skb->dev = vlan_dev_info(dev)->real_dev; skb->dev = vlan_dev_info(dev)->real_dev;
dev_queue_xmit(skb); dev_queue_xmit(skb);
@ -328,15 +328,15 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
static int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, static int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
struct net_device_stats *stats = &dev->stats; struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
u16 vlan_tci; u16 vlan_tci;
vlan_tci = vlan_dev_info(dev)->vlan_id; vlan_tci = vlan_dev_info(dev)->vlan_id;
vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb); vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb);
skb = __vlan_hwaccel_put_tag(skb, vlan_tci); skb = __vlan_hwaccel_put_tag(skb, vlan_tci);
stats->tx_packets++; txq->tx_packets++;
stats->tx_bytes += skb->len; txq->tx_bytes += skb->len;
skb->dev = vlan_dev_info(dev)->real_dev; skb->dev = vlan_dev_info(dev)->real_dev;
dev_queue_xmit(skb); dev_queue_xmit(skb);

3
net/8021q/vlanproc.c
View file

@ -279,13 +279,14 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
{ {
struct net_device *vlandev = (struct net_device *) seq->private; struct net_device *vlandev = (struct net_device *) seq->private;
const struct vlan_dev_info *dev_info = vlan_dev_info(vlandev); const struct vlan_dev_info *dev_info = vlan_dev_info(vlandev);
struct net_device_stats *stats = &vlandev->stats; const struct net_device_stats *stats;
static const char fmt[] = "%30s %12lu\n"; static const char fmt[] = "%30s %12lu\n";
int i; int i;
if (!is_vlan_dev(vlandev)) if (!is_vlan_dev(vlandev))
return 0; return 0;
stats = dev_get_stats(vlandev);
seq_printf(seq, seq_printf(seq,
"%s VID: %d REORDER_HDR: %i dev->priv_flags: %hx\n", "%s VID: %d REORDER_HDR: %i dev->priv_flags: %hx\n",
vlandev->name, dev_info->vlan_id, vlandev->name, dev_info->vlan_id,