net: hns3: refactor the statistics updating for netdev

In origin codes, there are some statistics item are got from mac, which
also include the packets statistics of VF. It is unreasonable. This
patch fixes it by counting them in the rx/tx processing flow.

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

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 2ec3759961f1136b1acaadb6d2f895605f943f78..1f15864fb8db73816e47f3e88e4eef0f565b5873 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1399,7 +1399,12 @@ static void hns3_nic_get_stats64(struct net_device *netdev,
        int queue_num = priv->ae_handle->kinfo.num_tqps;
        struct hnae3_handle *handle = priv->ae_handle;
        struct hns3_enet_ring *ring;
+       u64 rx_length_errors = 0;
+       u64 rx_crc_errors = 0;
+       u64 rx_multicast = 0;
        unsigned int start;
+       u64 tx_errors = 0;
+       u64 rx_errors = 0;
        unsigned int idx;
        u64 tx_bytes = 0;
        u64 rx_bytes = 0;
@@ -1422,6 +1427,8 @@ static void hns3_nic_get_stats64(struct net_device *netdev,
                        tx_pkts += ring->stats.tx_pkts;
                        tx_drop += ring->stats.tx_busy;
                        tx_drop += ring->stats.sw_err_cnt;
+                       tx_errors += ring->stats.tx_busy;
+                       tx_errors += ring->stats.sw_err_cnt;
                } while (u64_stats_fetch_retry_irq(&ring->syncp, start));
 
                /* fetch the rx stats */
@@ -1433,6 +1440,12 @@ static void hns3_nic_get_stats64(struct net_device *netdev,
                        rx_drop += ring->stats.non_vld_descs;
                        rx_drop += ring->stats.err_pkt_len;
                        rx_drop += ring->stats.l2_err;
+                       rx_errors += ring->stats.non_vld_descs;
+                       rx_errors += ring->stats.l2_err;
+                       rx_crc_errors += ring->stats.l2_err;
+                       rx_crc_errors += ring->stats.l3l4_csum_err;
+                       rx_multicast += ring->stats.rx_multicast;
+                       rx_length_errors += ring->stats.err_pkt_len;
                } while (u64_stats_fetch_retry_irq(&ring->syncp, start));
        }
 
@@ -1441,15 +1454,15 @@ static void hns3_nic_get_stats64(struct net_device *netdev,
        stats->rx_bytes = rx_bytes;
        stats->rx_packets = rx_pkts;
 
-       stats->rx_errors = netdev->stats.rx_errors;
-       stats->multicast = netdev->stats.multicast;
-       stats->rx_length_errors = netdev->stats.rx_length_errors;
-       stats->rx_crc_errors = netdev->stats.rx_crc_errors;
+       stats->rx_errors = rx_errors;
+       stats->multicast = rx_multicast;
+       stats->rx_length_errors = rx_length_errors;
+       stats->rx_crc_errors = rx_crc_errors;
        stats->rx_missed_errors = netdev->stats.rx_missed_errors;
 
-       stats->tx_errors = netdev->stats.tx_errors;
-       stats->rx_dropped = rx_drop + netdev->stats.rx_dropped;
-       stats->tx_dropped = tx_drop + netdev->stats.tx_dropped;
+       stats->tx_errors = tx_errors;
+       stats->rx_dropped = rx_drop;
+       stats->tx_dropped = tx_drop;
        stats->collisions = netdev->stats.collisions;
        stats->rx_over_errors = netdev->stats.rx_over_errors;
        stats->rx_frame_errors = netdev->stats.rx_frame_errors;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 35fb0c54b9867d391cbfd7ff8e768ea355c5f6ff..bf0931c6764f8e5a8c23098a065c9854eab56c9c 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -461,26 +461,6 @@ static u8 *hclge_comm_get_strings(u32 stringset,
        return (u8 *)buff;
 }
 
-static void hclge_update_netstat(struct hclge_hw_stats *hw_stats,
-                                struct net_device_stats *net_stats)
-{
-       net_stats->tx_dropped = 0;
-       net_stats->rx_errors = hw_stats->mac_stats.mac_rx_oversize_pkt_num;
-       net_stats->rx_errors += hw_stats->mac_stats.mac_rx_undersize_pkt_num;
-       net_stats->rx_errors += hw_stats->mac_stats.mac_rx_fcs_err_pkt_num;
-
-       net_stats->multicast = hw_stats->mac_stats.mac_tx_multi_pkt_num;
-       net_stats->multicast += hw_stats->mac_stats.mac_rx_multi_pkt_num;
-
-       net_stats->rx_crc_errors = hw_stats->mac_stats.mac_rx_fcs_err_pkt_num;
-       net_stats->rx_length_errors =
-               hw_stats->mac_stats.mac_rx_undersize_pkt_num;
-       net_stats->rx_length_errors +=
-               hw_stats->mac_stats.mac_rx_oversize_pkt_num;
-       net_stats->rx_over_errors =
-               hw_stats->mac_stats.mac_rx_oversize_pkt_num;
-}
-
 static void hclge_update_stats_for_all(struct hclge_dev *hdev)
 {
        struct hnae3_handle *handle;
@@ -500,8 +480,6 @@ static void hclge_update_stats_for_all(struct hclge_dev *hdev)
        if (status)
                dev_err(&hdev->pdev->dev,
                        "Update MAC stats fail, status = %d.\n", status);
-
-       hclge_update_netstat(&hdev->hw_stats, &handle->kinfo.netdev->stats);
 }
 
 static void hclge_update_stats(struct hnae3_handle *handle,
@@ -509,7 +487,6 @@ static void hclge_update_stats(struct hnae3_handle *handle,
 {
        struct hclge_vport *vport = hclge_get_vport(handle);
        struct hclge_dev *hdev = vport->back;
-       struct hclge_hw_stats *hw_stats = &hdev->hw_stats;
        int status;
 
        if (test_and_set_bit(HCLGE_STATE_STATISTICS_UPDATING, &hdev->state))
@@ -527,8 +504,6 @@ static void hclge_update_stats(struct hnae3_handle *handle,
                        "Update TQPS stats fail, status = %d.\n",
                        status);
 
-       hclge_update_netstat(hw_stats, net_stats);
-
        clear_bit(HCLGE_STATE_STATISTICS_UPDATING, &hdev->state);
 }