net: hns3: Add packet statistics of netdev

Add packet statistics of netdev for ethtool -S, in
order to show the statistics data for current net
device.

Remove update_stats() calling because it has been
completed in hns3_get_netdev_stats().

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index d3cb3ec2c62ba8e9ef4d47df64e1805d881aecf5..1e8fac3ae750a7eb9b72e0f9a99bfed4d9a1e453 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -59,6 +59,41 @@ static const struct hns3_stats hns3_rxq_stats[] = {
 
 #define HNS3_TQP_STATS_COUNT (HNS3_TXQ_STATS_COUNT + HNS3_RXQ_STATS_COUNT)
 
+/* netdev stats */
+#define HNS3_NETDEV_STAT(_string, _member)     {                       \
+       .stats_string = _string,                                        \
+       .stats_offset = offsetof(struct rtnl_link_stats64, _member)     \
+}
+
+static const struct hns3_stats hns3_netdev_stats[] = {
+       /* Rx per-queue statistics */
+       HNS3_NETDEV_STAT("rx_packets", rx_packets),
+       HNS3_NETDEV_STAT("tx_packets", tx_packets),
+       HNS3_NETDEV_STAT("rx_bytes", rx_bytes),
+       HNS3_NETDEV_STAT("tx_bytes", tx_bytes),
+       HNS3_NETDEV_STAT("rx_errors", rx_errors),
+       HNS3_NETDEV_STAT("tx_errors", tx_errors),
+       HNS3_NETDEV_STAT("rx_dropped", rx_dropped),
+       HNS3_NETDEV_STAT("tx_dropped", tx_dropped),
+       HNS3_NETDEV_STAT("multicast", multicast),
+       HNS3_NETDEV_STAT("collisions", collisions),
+       HNS3_NETDEV_STAT("rx_length_errors", rx_length_errors),
+       HNS3_NETDEV_STAT("rx_over_errors", rx_over_errors),
+       HNS3_NETDEV_STAT("rx_crc_errors", rx_crc_errors),
+       HNS3_NETDEV_STAT("rx_frame_errors", rx_frame_errors),
+       HNS3_NETDEV_STAT("rx_fifo_errors", rx_fifo_errors),
+       HNS3_NETDEV_STAT("rx_missed_errors", rx_missed_errors),
+       HNS3_NETDEV_STAT("tx_aborted_errors", tx_aborted_errors),
+       HNS3_NETDEV_STAT("tx_carrier_errors", tx_carrier_errors),
+       HNS3_NETDEV_STAT("tx_fifo_errors", tx_fifo_errors),
+       HNS3_NETDEV_STAT("tx_heartbeat_errors", tx_heartbeat_errors),
+       HNS3_NETDEV_STAT("tx_window_errors", tx_window_errors),
+       HNS3_NETDEV_STAT("rx_compressed", rx_compressed),
+       HNS3_NETDEV_STAT("tx_compressed", tx_compressed),
+};
+
+#define HNS3_NETDEV_STATS_COUNT ARRAY_SIZE(hns3_netdev_stats)
+
 #define HNS3_SELF_TEST_TPYE_NUM                1
 #define HNS3_NIC_LB_TEST_PKT_NUM       1
 #define HNS3_NIC_LB_TEST_RING_ID       0
@@ -431,6 +466,27 @@ static u8 *hns3_get_strings_tqps(struct hnae3_handle *handle, u8 *data)
        return data;
 }
 
+static u8 *hns3_netdev_stats_get_strings(u8 *data)
+{
+       int i;
+
+       /* get strings for netdev */
+       for (i = 0; i < HNS3_NETDEV_STATS_COUNT; i++) {
+               snprintf(data, ETH_GSTRING_LEN,
+                        hns3_netdev_stats[i].stats_string);
+               data += ETH_GSTRING_LEN;
+       }
+
+       snprintf(data, ETH_GSTRING_LEN, "netdev_rx_dropped");
+       data += ETH_GSTRING_LEN;
+       snprintf(data, ETH_GSTRING_LEN, "netdev_tx_dropped");
+       data += ETH_GSTRING_LEN;
+       snprintf(data, ETH_GSTRING_LEN, "netdev_tx_timeout");
+       data += ETH_GSTRING_LEN;
+
+       return data;
+}
+
 static void hns3_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 {
        struct hnae3_handle *h = hns3_get_handle(netdev);
@@ -442,6 +498,7 @@ static void hns3_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 
        switch (stringset) {
        case ETH_SS_STATS:
+               buff = hns3_netdev_stats_get_strings(buff);
                buff = hns3_get_strings_tqps(h, buff);
                h->ae_algo->ops->get_strings(h, stringset, (u8 *)buff);
                break;
@@ -480,6 +537,27 @@ static u64 *hns3_get_stats_tqps(struct hnae3_handle *handle, u64 *data)
        return data;
 }
 
+static u64 *hns3_get_netdev_stats(struct net_device *netdev, u64 *data)
+{
+       struct hns3_nic_priv *priv = netdev_priv(netdev);
+       const struct rtnl_link_stats64 *net_stats;
+       struct rtnl_link_stats64 temp;
+       u8 *stat;
+       int i;
+
+       net_stats = dev_get_stats(netdev, &temp);
+       for (i = 0; i < HNS3_NETDEV_STATS_COUNT; i++) {
+               stat = (u8 *)net_stats + hns3_netdev_stats[i].stats_offset;
+               *data++ = *(u64 *)stat;
+       }
+
+       *data++ = netdev->rx_dropped.counter;
+       *data++ = netdev->tx_dropped.counter;
+       *data++ = priv->tx_timeout_count;
+
+       return data;
+}
+
 /* hns3_get_stats - get detail statistics.
  * @netdev: net device
  * @stats: statistics info.
@@ -496,7 +574,7 @@ static void hns3_get_stats(struct net_device *netdev,
                return;
        }
 
-       h->ae_algo->ops->update_stats(h, &netdev->stats);
+       p = hns3_get_netdev_stats(netdev, p);
 
        /* get per-queue stats */
        p = hns3_get_stats_tqps(h, p);