net/hns3: add TSO pseudo header calculation compatibility

In kunpeng 920, when process pkts which need TSO, the network driver
need to erase the L4 len value of the TCP TSO pseudo header and
recalculate the pseudo header checksum. kunpeng930 support not need
to erase the L4 len value of the TCP TSO pseudo header.

Signed-off-by: Hongbo Zheng <zhenghongbo3@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 3922df5e6283de292ccf860bdbebbf4e1823a4ea..10cfc5d47db17eba62a67353de76aa4165ddc71e 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2916,6 +2916,7 @@ hns3_get_capability(struct hns3_hw *hw)
                hw->intr.mapping_mode = HNS3_INTR_MAPPING_VEC_RSV_ONE;
                hw->intr.coalesce_mode = HNS3_INTR_COALESCE_NON_QL;
                hw->intr.gl_unit = HNS3_INTR_COALESCE_GL_UINT_2US;
+               hw->tso_mode = HNS3_TSO_SW_CAL_PSEUDO_H_CSUM;
                hw->vlan_mode = HNS3_SW_SHIFT_AND_DISCARD_MODE;
                hw->min_tx_pkt_len = HNS3_HIP08_MIN_TX_PKT_LEN;
                return 0;
@@ -2932,6 +2933,7 @@ hns3_get_capability(struct hns3_hw *hw)
        hw->intr.mapping_mode = HNS3_INTR_MAPPING_VEC_ALL;
        hw->intr.coalesce_mode = HNS3_INTR_COALESCE_QL;
        hw->intr.gl_unit = HNS3_INTR_COALESCE_GL_UINT_1US;
+       hw->tso_mode = HNS3_TSO_HW_CAL_PSEUDO_H_CSUM;
        hw->vlan_mode = HNS3_HW_SHIFT_AND_DISCARD_MODE;
        hw->min_tx_pkt_len = HNS3_HIP09_MIN_TX_PKT_LEN;
 

diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index a70223f514f0a1ca9cf6da753c1cc3b1425f0918..f170df91764f03c03b80c3a89e307e47f731bd4f 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -416,6 +416,9 @@ struct hns3_queue_intr {
        uint8_t gl_unit;
 };
 
+#define HNS3_TSO_SW_CAL_PSEUDO_H_CSUM          0
+#define HNS3_TSO_HW_CAL_PSEUDO_H_CSUM          1
+
 struct hns3_hw {
        struct rte_eth_dev_data *data;
        void *io_base;
@@ -476,7 +479,23 @@ struct hns3_hw {
        uint32_t min_tx_pkt_len;
 
        struct hns3_queue_intr intr;
-
+       /*
+        * tso mode.
+        * value range:
+        *      HNS3_TSO_SW_CAL_PSEUDO_H_CSUM/HNS3_TSO_HW_CAL_PSEUDO_H_CSUM
+        *
+        *  - HNS3_TSO_SW_CAL_PSEUDO_H_CSUM
+        *     In this mode, because of the hardware constraint, network driver
+        *     software need erase the L4 len value of the TCP pseudo header
+        *     and recalculate the TCP pseudo header checksum of packets that
+        *     need TSO.
+        *
+        *  - HNS3_TSO_HW_CAL_PSEUDO_H_CSUM
+        *     In this mode, hardware support recalculate the TCP pseudo header
+        *     checksum of packets that need TSO, so network driver software
+        *     not need to recalculate it.
+        */
+       uint8_t tso_mode;
        /*
         * vlan mode.
         * value range:

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index c39edf509e021403772c15ae7a92432e36e00941..565cf60e76bb8aadf4be9bb950fb94b6ba4eaf4d 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1165,6 +1165,7 @@ hns3vf_get_capability(struct hns3_hw *hw)
                hw->intr.mapping_mode = HNS3_INTR_MAPPING_VEC_RSV_ONE;
                hw->intr.coalesce_mode = HNS3_INTR_COALESCE_NON_QL;
                hw->intr.gl_unit = HNS3_INTR_COALESCE_GL_UINT_2US;
+               hw->tso_mode = HNS3_TSO_SW_CAL_PSEUDO_H_CSUM;
                hw->min_tx_pkt_len = HNS3_HIP08_MIN_TX_PKT_LEN;
                return 0;
        }
@@ -1180,6 +1181,7 @@ hns3vf_get_capability(struct hns3_hw *hw)
        hw->intr.mapping_mode = HNS3_INTR_MAPPING_VEC_ALL;
        hw->intr.coalesce_mode = HNS3_INTR_COALESCE_QL;
        hw->intr.gl_unit = HNS3_INTR_COALESCE_GL_UINT_1US;
+       hw->tso_mode = HNS3_TSO_HW_CAL_PSEUDO_H_CSUM;
        hw->min_tx_pkt_len = HNS3_HIP09_MIN_TX_PKT_LEN;
 
        return 0;

diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 7c7b9de02b090b7d616227570c8bf867a51ff4eb..930aa28943b1257de437b3fd0b5edb513a606257 100644 (file)
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -2188,6 +2188,7 @@ hns3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,
        txq->io_tail_reg = (volatile void *)((char *)txq->io_base +
                                             HNS3_RING_TX_TAIL_REG);
        txq->min_tx_pkt_len = hw->min_tx_pkt_len;
+       txq->tso_mode = hw->tso_mode;
        txq->over_length_pkt_cnt = 0;
        txq->exceed_limit_bd_pkt_cnt = 0;
        txq->exceed_limit_bd_reassem_fail = 0;
@@ -2858,47 +2859,66 @@ hns3_vld_vlan_chk(struct hns3_tx_queue *txq, struct rte_mbuf *m)
 }
 #endif
 
-uint16_t
-hns3_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
-              uint16_t nb_pkts)
+static int
+hns3_prep_pkt_proc(struct hns3_tx_queue *tx_queue, struct rte_mbuf *m)
 {
-       struct hns3_tx_queue *txq;
-       struct rte_mbuf *m;
-       uint16_t i;
        int ret;
 
-       txq = (struct hns3_tx_queue *)tx_queue;
-
-       for (i = 0; i < nb_pkts; i++) {
-               m = tx_pkts[i];
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+       ret = rte_validate_tx_offload(m);
+       if (ret != 0) {
+               rte_errno = -ret;
+               return ret;
+       }
 
-               if (hns3_pkt_is_tso(m) &&
-                   (hns3_pkt_need_linearized(m, m->nb_segs,
-                                             txq->max_non_tso_bd_num) ||
-                    hns3_check_tso_pkt_valid(m))) {
+       ret = hns3_vld_vlan_chk(tx_queue, m);
+       if (ret != 0) {
+               rte_errno = EINVAL;
+               return ret;
+       }
+#endif
+       if (hns3_pkt_is_tso(m)) {
+               if (hns3_pkt_need_linearized(m, m->nb_segs,
+                                            tx_queue->max_non_tso_bd_num) ||
+                   hns3_check_tso_pkt_valid(m)) {
                        rte_errno = EINVAL;
-                       return i;
+                       return -EINVAL;
                }
 
-#ifdef RTE_LIBRTE_ETHDEV_DEBUG
-               ret = rte_validate_tx_offload(m);
-               if (ret != 0) {
-                       rte_errno = -ret;
-                       return i;
+               if (tx_queue->tso_mode != HNS3_TSO_SW_CAL_PSEUDO_H_CSUM) {
+                       /*
+                        * (tso mode != HNS3_TSO_SW_CAL_PSEUDO_H_CSUM) means
+                        * hardware support recalculate the TCP pseudo header
+                        * checksum of packets that need TSO, so network driver
+                        * software not need to recalculate it.
+                        */
+                       hns3_outer_header_cksum_prepare(m);
+                       return 0;
                }
+       }
 
-               if (hns3_vld_vlan_chk(txq, m)) {
-                       rte_errno = EINVAL;
-                       return i;
-               }
-#endif
-               ret = rte_net_intel_cksum_prepare(m);
-               if (ret != 0) {
-                       rte_errno = -ret;
-                       return i;
-               }
+       ret = rte_net_intel_cksum_prepare(m);
+       if (ret != 0) {
+               rte_errno = -ret;
+               return ret;
+       }
+
+       hns3_outer_header_cksum_prepare(m);
+
+       return 0;
+}
 
-               hns3_outer_header_cksum_prepare(m);
+uint16_t
+hns3_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+              uint16_t nb_pkts)
+{
+       struct rte_mbuf *m;
+       uint16_t i;
+
+       for (i = 0; i < nb_pkts; i++) {
+               m = tx_pkts[i];
+               if (hns3_prep_pkt_proc(tx_queue, m))
+                       return i;
        }
 
        return i;

diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index 5ffe30e661c072fcb25574fb0191f44d42431507..d7d70f6a1bf8b176d08f0506066c04d0dbcceae3 100644 (file)
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -366,6 +366,23 @@ struct hns3_tx_queue {
        uint16_t tx_rs_thresh;
        struct rte_mbuf **free;
 
+       /*
+        * tso mode.
+        * value range:
+        *      HNS3_TSO_SW_CAL_PSEUDO_H_CSUM/HNS3_TSO_HW_CAL_PSEUDO_H_CSUM
+        *
+        *  - HNS3_TSO_SW_CAL_PSEUDO_H_CSUM
+        *     In this mode, because of the hardware constraint, network driver
+        *     software need erase the L4 len value of the TCP pseudo header
+        *     and recalculate the TCP pseudo header checksum of packets that
+        *     need TSO.
+        *
+        *  - HNS3_TSO_HW_CAL_PSEUDO_H_CSUM
+        *     In this mode, hardware support recalculate the TCP pseudo header
+        *     checksum of packets that need TSO, so network driver software
+        *     not need to recalculate it.
+        */
+       uint8_t tso_mode;
        /*
         * The minimum length of the packet supported by hardware in the Tx
         * direction.