team: track sum of rx_nohandler for all slaves

CC: Jiri Pirko <jiri@resnulli.us>
CC: netdev@vger.kernel.org
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 718ceeab4dbcf397adb5bc3a6d8aa8dcf029602c..00558e1395847d51bccd4a35050c9ae1bb79f52a 100644 (file)
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -758,6 +758,8 @@ static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)
                u64_stats_update_end(&pcpu_stats->syncp);
 
                skb->dev = team->dev;
+       } else if (res == RX_HANDLER_EXACT) {
+               this_cpu_inc(team->pcpu_stats->rx_nohandler);
        } else {
                this_cpu_inc(team->pcpu_stats->rx_dropped);
        }
@@ -1807,7 +1809,7 @@ team_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
        struct team *team = netdev_priv(dev);
        struct team_pcpu_stats *p;
        u64 rx_packets, rx_bytes, rx_multicast, tx_packets, tx_bytes;
-       u32 rx_dropped = 0, tx_dropped = 0;
+       u32 rx_dropped = 0, tx_dropped = 0, rx_nohandler = 0;
        unsigned int start;
        int i;
 
@@ -1828,14 +1830,16 @@ team_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
                stats->tx_packets       += tx_packets;
                stats->tx_bytes         += tx_bytes;
                /*
-                * rx_dropped & tx_dropped are u32, updated
-                * without syncp protection.
+                * rx_dropped, tx_dropped & rx_nohandler are u32,
+                * updated without syncp protection.
                 */
                rx_dropped      += p->rx_dropped;
                tx_dropped      += p->tx_dropped;
+               rx_nohandler    += p->rx_nohandler;
        }
        stats->rx_dropped       = rx_dropped;
        stats->tx_dropped       = tx_dropped;
+       stats->rx_nohandler     = rx_nohandler;
        return stats;
 }
 

diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index b84e49c3a738fc4c2e726c31d78b85296e68a5b5..174f43f43affc1dcfd7a4a67a0efcf06547607fb 100644 (file)
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -24,6 +24,7 @@ struct team_pcpu_stats {
        struct u64_stats_sync   syncp;
        u32                     rx_dropped;
        u32                     tx_dropped;
+       u32                     rx_nohandler;
 };
 
 struct team;