[net-next PATCH v3] ip_tunnel: Report Rx dropped in ip_tunnel_get_stats64

[net-next PATCH v3] ip_tunnel: Report Rx dropped in ip_tunnel_get_stats64

[Alexander Duyck]

The rx_dropped stat wasn't being reported when ip_tunnel_get_stats64 was
called.  This was leading to some confusing results in my debug as I was
seeing rx_errors increment but no other value which pointed me toward the
type of error being seen.

This change corrects that by using netdev_stats_to_stats64 to copy all
available dev stats instead of just the few that were hand picked.

Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
---

v2: Replaced manual copy with netdev_stats_to_stats64
v3: Moved netdev_stats_to_stats64 to start of function to avoid overwriting
    stats updated in for_each_possible_cpu loop.

 net/ipv4/ip_tunnel_core.c |   18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 3998b1822d85..6a51a71a6c67 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -165,6 +165,8 @@ struct rtnl_link_stats64 *ip_tunnel_get_stats64(struct net_device *dev,
 {
 	int i;
 
+	netdev_stats_to_stats64(tot, &dev->stats);
+
 	for_each_possible_cpu(i) {
 		const struct pcpu_sw_netstats *tstats =
 						   per_cpu_ptr(dev->tstats, i);
@@ -185,22 +187,6 @@ struct rtnl_link_stats64 *ip_tunnel_get_stats64(struct net_device *dev,
 		tot->tx_bytes   += tx_bytes;
 	}
 
-	tot->multicast = dev->stats.multicast;
-
-	tot->rx_crc_errors = dev->stats.rx_crc_errors;
-	tot->rx_fifo_errors = dev->stats.rx_fifo_errors;
-	tot->rx_length_errors = dev->stats.rx_length_errors;
-	tot->rx_frame_errors = dev->stats.rx_frame_errors;
-	tot->rx_errors = dev->stats.rx_errors;
-
-	tot->tx_fifo_errors = dev->stats.tx_fifo_errors;
-	tot->tx_carrier_errors = dev->stats.tx_carrier_errors;
-	tot->tx_dropped = dev->stats.tx_dropped;
-	tot->tx_aborted_errors = dev->stats.tx_aborted_errors;
-	tot->tx_errors = dev->stats.tx_errors;
-
-	tot->collisions  = dev->stats.collisions;
-
 	return tot;
 }
 EXPORT_SYMBOL_GPL(ip_tunnel_get_stats64);

Re: [net-next PATCH v3] ip_tunnel: Report Rx dropped in ip_tunnel_get_stats64

[Eric Dumazet]

On Thu, 2015-05-14 at 14:31 -0700, Alexander Duyck wrote:
> The rx_dropped stat wasn't being reported when ip_tunnel_get_stats64 was
> called.  This was leading to some confusing results in my debug as I was
> seeing rx_errors increment but no other value which pointed me toward the
> type of error being seen.
> 
> This change corrects that by using netdev_stats_to_stats64 to copy all
> available dev stats instead of just the few that were hand picked.
> 
> Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
> ---

Signed-off-by: Eric Dumazet <edumazet@google.com>

Re: [net-next PATCH v3] ip_tunnel: Report Rx dropped in ip_tunnel_get_stats64

[David Miller]

From: Alexander Duyck <alexander.h.duyck@redhat.com>
Date: Thu, 14 May 2015 14:31:28 -0700

> The rx_dropped stat wasn't being reported when ip_tunnel_get_stats64 was
> called.  This was leading to some confusing results in my debug as I was
> seeing rx_errors increment but no other value which pointed me toward the
> type of error being seen.
> 
> This change corrects that by using netdev_stats_to_stats64 to copy all
> available dev stats instead of just the few that were hand picked.
> 
> Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>

Applied, thanks Alexander.