net: fix softnet_stat
Subsystems (2)
PATCH v2 1/1 net: fix softnet_stat
fix softnet_stat
Per cpu variable softnet_data.total was shared between IRQ and SoftIRQ context without any protection. And enqueue_to_backlog should update the netdev_rx_stat of the target CPU.
This patch splits softnet_data.total into softnet_data.received and softnet_data.dropped internally, in order to avoid it sharing between IRQ and SoftIRQ. The old ABI softnet_data.total is kept by summing softnet_data.received and softnet_data.dropped when exporting it to userland. And softnet_data.dropped is protected in the corresponding input_pkt_queue.lock, if RPS is enabled.
This patch also fixed a bug: packets received by enqueue_to_backlog() were counted twice: one in enqueue_to_backlog(), and the other in __netif_receive_skb(), although they maybe not on the same CPUs, if RPS is involved.
----
include/linux/netdevice.h | 2 +- net/core/dev.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-)
include/linux/netdevice.h +1 -1
@@ -219,7 +219,7 @@ struct neigh_parms;struct sk_buff ;struct netif_rx_stats { -unsigned total; +unsigned received;unsigned dropped;unsigned time_squeeze;unsigned cpu_collision;
net/core/dev.c +3 -4
@@ -2336,7 +2336,6 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu) queue = &per_cpu (softnet_data, cpu);local_irq_save (flags); -__get_cpu_var (netdev_rx_stat).total++;rps_lock (queue);if (queue->input_pkt_queue.qlen <= netdev_max_backlog) {
@@ -2366,9 +2365,9 @@ enqueue: goto enqueue; } +per_cpu (netdev_rx_stat, cpu).dropped++;rps_unlock (queue); -__get_cpu_var (netdev_rx_stat).dropped++;local_irq_restore (flags);kfree_skb (skb);
@@ -2679,7 +2678,7 @@ static int __netif_receive_skb(struct sk_buff *skb) skb->dev = master; } -__get_cpu_var (netdev_rx_stat).total++; +__get_cpu_var (netdev_rx_stat).received++;skb_reset_network_header (skb);skb_reset_transport_header (skb);
@@ -3565,7 +3564,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)struct netif_rx_stats *s = v;seq_printf (seq,"%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n" , - s->total, s->dropped, s->time_squeeze,0 , + s->received + s->dropped, s->dropped, s->time_squeeze,0 ,0 ,0 ,0 ,0 ,/* was fastroute */ s->cpu_collision, s->received_rps);return 0 ;