gve: Fix u64_stats_sync to initialize start
Subsystems (3)
PATCH 1/1 gve: Fix u64_stats_sync to initialize start
u64_stats_fetch_begin needs to initialize start.
Signed-off-by Catherine Sullivan <[email protected]>
Reported-by kbuild test robot <[email protected]>
--- drivers/net/ethernet/google/gve/gve_ethtool.c | 6 ++++-- drivers/net/ethernet/google/gve/gve_main.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/google/gve/gve_ethtool.c +4 -2
@@ -102,7 +102,8 @@ gve_get_ethtool_stats(struct net_device *netdev, ring < priv->rx_cfg.num_queues; ring++) {if (priv->rx) { do { - u64_stats_fetch_begin(&priv->rx[ring].statss); + start = + u64_stats_fetch_begin(&priv->rx[ring].statss); rx_pkts += priv->rx[ring].rpackets; rx_bytes += priv->rx[ring].rbytes; } while (u64_stats_fetch_retry(&priv->rx[ring].statss,
@@ -113,7 +114,8 @@ gve_get_ethtool_stats(struct net_device *netdev, ring < priv->tx_cfg.num_queues; ring++) {if (priv->tx) { do { - u64_stats_fetch_begin(&priv->tx[ring].statss); + start = + u64_stats_fetch_begin(&priv->tx[ring].statss); tx_pkts += priv->tx[ring].pkt_done; tx_bytes += priv->tx[ring].bytes_done; } while (u64_stats_fetch_retry(&priv->tx[ring].statss,
drivers/net/ethernet/google/gve/gve_main.c +4 -2
@@ -35,7 +35,8 @@ static void gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s)if (priv->rx) {for (ring =0 ; ring < priv->rx_cfg.num_queues; ring++) { do { - u64_stats_fetch_begin(&priv->rx[ring].statss); + start = + u64_stats_fetch_begin(&priv->rx[ring].statss); s->rx_packets += priv->rx[ring].rpackets; s->rx_bytes += priv->rx[ring].rbytes; } while (u64_stats_fetch_retry(&priv->rx[ring].statss,
@@ -45,7 +46,8 @@ static void gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s)if (priv->tx) {for (ring =0 ; ring < priv->tx_cfg.num_queues; ring++) { do { - u64_stats_fetch_begin(&priv->tx[ring].statss); + start = + u64_stats_fetch_begin(&priv->tx[ring].statss); s->tx_packets += priv->tx[ring].pkt_done; s->tx_bytes += priv->tx[ring].bytes_done; } while (u64_stats_fetch_retry(&priv->rx[ring].statss,
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
From: Catherine Sullivan <[email protected]>
Date: Tue, 2 Jul 2019 15:46:57 -0700
Quoted 4 lines
u64_stats_fetch_beginneeds to initialize start.Signed-off-by Catherine Sullivan <[email protected]>Reported-by kbuild test robot <[email protected]>
Applied, but in the future please indicate the target GIT tree in your Subject line, in this case it would be "[PATCH net-next] ..."