[PATCH net 3/4] team: track sum of rx_unhandled for all slaves
From: Jarod Wilson <hidden>
Date: 2016-01-27 20:22:22
Also in:
lkml
Subsystem:
networking drivers, team driver, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jiri Pirko, Linus Torvalds
CC: Jiri Pirko <jiri@resnulli.us> CC: netdev@vger.kernel.org Signed-off-by: Jarod Wilson <redacted> --- drivers/net/team/team.c | 10 +++++++--- include/linux/if_team.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 718ceea..4460a8c 100644
--- 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_unhandled); } 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_unhandled = 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_unhandled are u32, + * updated without syncp protection. */ rx_dropped += p->rx_dropped; tx_dropped += p->tx_dropped; + rx_unhandled += p->rx_unhandled; } stats->rx_dropped = rx_dropped; stats->tx_dropped = tx_dropped; + stats->rx_unhandled = rx_unhandled; return stats; }
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index b84e49c..787dbd2 100644
--- 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_unhandled; }; struct team;
--
1.8.3.1