fm10k: enable TSO support

This patch enables fm10k TSO feature for both non-tunneling packet
and tunneling packet.

Signed-off-by: Wang Xiao W <xiao.w.wang@intel.com>
Acked-by: Michael Qiu <michael.qiu@intel.com>

diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst
index 4208676..034bcff 100644 (file)
--- a/doc/guides/rel_notes/release_2_2.rst
+++ b/doc/guides/rel_notes/release_2_2.rst
@@ -18,6 +18,8 @@ New Features
   * Add 2 new flow director modes on x550.
   * One is MAC VLAN mode, the other is tunnel mode.
 
+* **Added fm10k TSO support for both PF and VF.**
+
 * **Enhanced support for the Chelsio CXGBE driver.**
 
   *  Added support for Jumbo Frames.

diff --git a/drivers/net/fm10k/base/fm10k_osdep.h b/drivers/net/fm10k/base/fm10k_osdep.h
index 64f09dc..d8f3da4 100644 (file)
--- a/drivers/net/fm10k/base/fm10k_osdep.h
+++ b/drivers/net/fm10k/base/fm10k_osdep.h
@@ -146,4 +146,9 @@ typedef int        bool;
 #define fm10k_read_reg FM10K_READ_REG
 #endif
 
+#define FM10K_TSO_MINMSS \
+       (FM10K_DMA_CTRL_MINMSS_64 >> FM10K_DMA_CTRL_MINMSS_SHIFT)
+#define FM10K_TSO_MIN_HEADERLEN                        54
+#define FM10K_TSO_MAX_HEADERLEN                        192
+
 #endif /* _FM10K_OSDEP_H_ */

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index a69c990..b104fc2 100644 (file)
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -937,7 +937,8 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
                DEV_TX_OFFLOAD_VLAN_INSERT |
                DEV_TX_OFFLOAD_IPV4_CKSUM  |
                DEV_TX_OFFLOAD_UDP_CKSUM   |
-               DEV_TX_OFFLOAD_TCP_CKSUM;
+               DEV_TX_OFFLOAD_TCP_CKSUM   |
+               DEV_TX_OFFLOAD_TCP_TSO;
 
        dev_info->hash_key_size = FM10K_RSSRK_SIZE * sizeof(uint32_t);
        dev_info->reta_size = FM10K_MAX_RSS_INDICES;

diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c
index d3f7b89..1bac28d 100644 (file)
--- a/drivers/net/fm10k/fm10k_rxtx.c
+++ b/drivers/net/fm10k/fm10k_rxtx.c
@@ -395,7 +395,7 @@ static inline void tx_free_descriptors(struct fm10k_tx_queue *q)
 static inline void tx_xmit_pkt(struct fm10k_tx_queue *q, struct rte_mbuf *mb)
 {
        uint16_t last_id;
-       uint8_t flags;
+       uint8_t flags, hdrlen;
 
        /* always set the LAST flag on the last descriptor used to
         * transmit the packet */
@@ -420,7 +420,7 @@ static inline void tx_xmit_pkt(struct fm10k_tx_queue *q, struct rte_mbuf *mb)
        /* set checksum flags on first descriptor of packet. SCTP checksum
         * offload is not supported, but we do not explicitly check for this
         * case in favor of greatly simplified processing. */
-       if (mb->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_L4_MASK))
+       if (mb->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_L4_MASK | PKT_TX_TCP_SEG))
                q->hw_ring[q->next_free].flags |= FM10K_TXD_FLAG_CSUM;
 
        /* set vlan if requested */
@@ -432,6 +432,21 @@ static inline void tx_xmit_pkt(struct fm10k_tx_queue *q, struct rte_mbuf *mb)
                        rte_cpu_to_le_64(MBUF_DMA_ADDR(mb));
        q->hw_ring[q->next_free].buflen =
                        rte_cpu_to_le_16(rte_pktmbuf_data_len(mb));
+
+       if (mb->ol_flags & PKT_TX_TCP_SEG) {
+               hdrlen = mb->outer_l2_len + mb->outer_l3_len + mb->l2_len +
+                       mb->l3_len + mb->l4_len;
+               if (q->hw_ring[q->next_free].flags & FM10K_TXD_FLAG_FTAG)
+                       hdrlen += sizeof(struct fm10k_ftag);
+
+               if (likely((hdrlen >= FM10K_TSO_MIN_HEADERLEN) &&
+                               (hdrlen <= FM10K_TSO_MAX_HEADERLEN) &&
+                               (mb->tso_segsz >= FM10K_TSO_MINMSS))) {
+                       q->hw_ring[q->next_free].mss = mb->tso_segsz;
+                       q->hw_ring[q->next_free].hdrlen = hdrlen;
+               }
+       }
+
        if (++q->next_free == q->nb_desc)
                q->next_free = 0;
 
@@ -447,7 +462,7 @@ static inline void tx_xmit_pkt(struct fm10k_tx_queue *q, struct rte_mbuf *mb)
                        q->next_free = 0;
        }
 
-       q->hw_ring[last_id].flags = flags;
+       q->hw_ring[last_id].flags |= flags;
 }
 
 uint16_t