net/hns3: support Tx push quick doorbell for performance

[dpdk.git] / drivers / net / hns3 / hns3_stats.c

diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c
index e802c0b..e09dc0d 100644 (file)
--- a/drivers/net/hns3/hns3_stats.c
+++ b/drivers/net/hns3/hns3_stats.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2021 HiSilicon Limited.
  */
 
 #include <rte_ethdev.h>
@@ -519,6 +519,31 @@ hns3_update_port_rx_ssu_drop_stats(struct hns3_hw *hw)
        return 0;
 }
 
+static int
+hns3_update_port_tx_ssu_drop_stats(struct hns3_hw *hw)
+{
+       struct hns3_cmd_desc desc[HNS3_OPC_SSU_DROP_REG_NUM];
+       struct hns3_query_ssu_cmd *req;
+       uint64_t cnt;
+       int ret;
+
+       ret = hns3_get_ssu_drop_stats(hw, desc, HNS3_OPC_SSU_DROP_REG_NUM,
+                                     false);
+       if (ret) {
+               hns3_err(hw, "failed to get Tx SSU drop stats, ret = %d", ret);
+               return ret;
+       }
+
+       req = (struct hns3_query_ssu_cmd *)desc[0].data;
+       cnt = rte_le_to_cpu_32(req->oq_drop_cnt) +
+               rte_le_to_cpu_32(req->full_drop_cnt) +
+               rte_le_to_cpu_32(req->part_drop_cnt);
+
+       hw->oerror_stats += cnt;
+
+       return 0;
+}
+
 int
 hns3_update_imissed_stats(struct hns3_hw *hw, bool is_clear)
 {
@@ -544,6 +569,25 @@ hns3_update_imissed_stats(struct hns3_hw *hw, bool is_clear)
        return 0;
 }
 
+static int
+hns3_update_oerror_stats(struct hns3_hw *hw, bool is_clear)
+{
+       struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
+       int ret;
+
+       if (hw->drop_stats_mode == HNS3_PKTS_DROP_STATS_MODE1 || hns->is_vf)
+               return 0;
+
+       ret = hns3_update_port_tx_ssu_drop_stats(hw);
+       if (ret)
+               return ret;
+
+       if (is_clear)
+               hw->oerror_stats = 0;
+
+       return 0;
+}
+
 /*
  * Query tqp tx queue statistics ,opcode id: 0x0B03.
  * Query tqp rx queue statistics ,opcode id: 0x0B13.
@@ -608,7 +652,14 @@ hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats)
                rte_stats->obytes += txq->basic_stats.bytes;
        }
 
-       rte_stats->oerrors = 0;
+       ret = hns3_update_oerror_stats(hw, false);
+       if (ret) {
+               hns3_err(hw, "update oerror stats failed, ret = %d",
+                        ret);
+               return ret;
+       }
+       rte_stats->oerrors = hw->oerror_stats;
+
        /*
         * If HW statistics are reset by stats_reset, but a lot of residual
         * packets exist in the hardware queue and these packets are error
@@ -644,6 +695,17 @@ hns3_stats_reset(struct rte_eth_dev *eth_dev)
                return ret;
        }
 
+       /*
+        * Note: Reading hardware statistics of oerror registers will
+        * clear them.
+        */
+       ret = hns3_update_oerror_stats(hw, true);
+       if (ret) {
+               hns3_err(hw, "clear oerror stats failed, ret = %d",
+                        ret);
+               return ret;
+       }
+
        for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
                rxq = eth_dev->data->rx_queues[i];
                if (rxq == NULL)
@@ -1263,7 +1325,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
        len = cnt_stats * sizeof(struct rte_eth_xstat);
        values_copy = rte_zmalloc("hns3_xstats_values", len, 0);
        if (values_copy == NULL) {
-               hns3_err(hw, "Failed to allocate %" PRIx64 " bytes needed "
+               hns3_err(hw, "Failed to allocate 0x%" PRIx64 " bytes needed "
                             "to store statistics values", len);
                return -ENOMEM;
        }
@@ -1285,7 +1347,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
 
        for (i = 0; i < size; i++) {
                if (ids[i] >= cnt_stats) {
-                       hns3_err(hw, "ids[%u] (%" PRIx64 ") is invalid, "
+                       hns3_err(hw, "ids[%u] (%" PRIu64 ") is invalid, "
                                     "should < %u", i, ids[i], cnt_stats);
                        rte_free(values_copy);
                        return -EINVAL;
@@ -1344,7 +1406,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
        len = cnt_stats * sizeof(struct rte_eth_xstat_name);
        names_copy = rte_zmalloc("hns3_xstats_names", len, 0);
        if (names_copy == NULL) {
-               hns3_err(hw, "Failed to allocate %" PRIx64 " bytes needed "
+               hns3_err(hw, "Failed to allocate 0x%" PRIx64 " bytes needed "
                             "to store statistics names", len);
                return -ENOMEM;
        }
@@ -1353,7 +1415,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
 
        for (i = 0; i < size; i++) {
                if (ids[i] >= cnt_stats) {
-                       hns3_err(hw, "ids[%u] (%" PRIx64 ") is invalid, "
+                       hns3_err(hw, "ids[%u] (%" PRIu64 ") is invalid, "
                                     "should < %u", i, ids[i], cnt_stats);
                        rte_free(names_copy);
                        return -EINVAL;