AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-22 15:58:15 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: hns3: refactor the statistics updating for netdev

Browse Source 
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>
This commit is contained in:
Jian Shen 2019-01-23 07:39:29 +08:00 committed by David S. Miller
parent c376fa1aae
commit d3ec4ef669
2 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View File

@ -1399,7 +1399,12 @@ static void hns3_nic_get_stats64(struct net_device *netdev,
int queue_num = priv->ae_handle->kinfo.num_tqps; int queue_num = priv->ae_handle->kinfo.num_tqps;
struct hnae3_handle *handle = priv->ae_handle; struct hnae3_handle *handle = priv->ae_handle;
struct hns3_enet_ring *ring; struct hns3_enet_ring *ring;
u64 rx_length_errors = 0;
u64 rx_crc_errors = 0;
u64 rx_multicast = 0;
unsigned int start; unsigned int start;
u64 tx_errors = 0;
u64 rx_errors = 0;
unsigned int idx; unsigned int idx;
u64 tx_bytes = 0; u64 tx_bytes = 0;
u64 rx_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_pkts += ring->stats.tx_pkts;
tx_drop += ring->stats.tx_busy; tx_drop += ring->stats.tx_busy;
tx_drop += ring->stats.sw_err_cnt; 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)); } while (u64_stats_fetch_retry_irq(&ring->syncp, start));
/* fetch the rx stats */ /* 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.non_vld_descs;
rx_drop += ring->stats.err_pkt_len; rx_drop += ring->stats.err_pkt_len;
rx_drop += ring->stats.l2_err; 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)); } 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_bytes = rx_bytes;
stats->rx_packets = rx_pkts; stats->rx_packets = rx_pkts;
stats->rx_errors = netdev->stats.rx_errors; stats->rx_errors = rx_errors;
stats->multicast = netdev->stats.multicast; stats->multicast = rx_multicast;
stats->rx_length_errors = netdev->stats.rx_length_errors; stats->rx_length_errors = rx_length_errors;
stats->rx_crc_errors = netdev->stats.rx_crc_errors; stats->rx_crc_errors = rx_crc_errors;
stats->rx_missed_errors = netdev->stats.rx_missed_errors; stats->rx_missed_errors = netdev->stats.rx_missed_errors;
stats->tx_errors = netdev->stats.tx_errors; stats->tx_errors = tx_errors;
stats->rx_dropped = rx_drop + netdev->stats.rx_dropped; stats->rx_dropped = rx_drop;
stats->tx_dropped = tx_drop + netdev->stats.tx_dropped; stats->tx_dropped = tx_drop;
stats->collisions = netdev->stats.collisions; stats->collisions = netdev->stats.collisions;
stats->rx_over_errors = netdev->stats.rx_over_errors; stats->rx_over_errors = netdev->stats.rx_over_errors;
stats->rx_frame_errors = netdev->stats.rx_frame_errors; stats->rx_frame_errors = netdev->stats.rx_frame_errors;

25
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
View File

@ -461,26 +461,6 @@ static u8 *hclge_comm_get_strings(u32 stringset,
return (u8 *)buff; 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) static void hclge_update_stats_for_all(struct hclge_dev *hdev)
{ {
struct hnae3_handle *handle; struct hnae3_handle *handle;
@ -500,8 +480,6 @@ static void hclge_update_stats_for_all(struct hclge_dev *hdev)
if (status) if (status)
dev_err(&hdev->pdev->dev, dev_err(&hdev->pdev->dev,
"Update MAC stats fail, status = %d.\n", status); "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, 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_vport *vport = hclge_get_vport(handle);
struct hclge_dev *hdev = vport->back; struct hclge_dev *hdev = vport->back;
struct hclge_hw_stats *hw_stats = &hdev->hw_stats;
int status; int status;
if (test_and_set_bit(HCLGE_STATE_STATISTICS_UPDATING, &hdev->state)) 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", "Update TQPS stats fail, status = %d.\n",
status); status);
hclge_update_netstat(hw_stats, net_stats);
clear_bit(HCLGE_STATE_STATISTICS_UPDATING, &hdev->state); clear_bit(HCLGE_STATE_STATISTICS_UPDATING, &hdev->state);
} }