[dpdk-dev] fm10k: enable TSO support

Message ID 1443168550-6648-1-git-send-email-xiao.w.wang@intel.com
State Superseded, archived
Headers show

Commit Message

Xiao Wang Sept. 25, 2015, 8:09 a.m.
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>
---
 drivers/net/fm10k/base/fm10k_osdep.h |  5 +++++
 drivers/net/fm10k/fm10k_ethdev.c     |  3 ++-
 drivers/net/fm10k/fm10k_rxtx.c       | 21 ++++++++++++++++++---
 3 files changed, 25 insertions(+), 4 deletions(-)

Comments

Thomas Monjalon Oct. 7, 2015, 12:23 p.m. | #1
2015-09-25 16:09, Wang Xiao W:
> 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>

Please Jing, a review is required.
First comment: the release notes is not updated accordingly.
Xiao Wang Oct. 12, 2015, 6:37 a.m. | #2
v2:
* Updated release note for the new feature.

* Added "likely" in TSO parameters checking.

v1:
* Initial version for fm10k TSO feature.

Wang Xiao W (2):
  fm10k: enable TSO support
  doc: update release note for fm10k TSO support

 doc/guides/rel_notes/release_2_2.rst |  4 ++++
 drivers/net/fm10k/base/fm10k_osdep.h |  5 +++++
 drivers/net/fm10k/fm10k_ethdev.c     |  3 ++-
 drivers/net/fm10k/fm10k_rxtx.c       | 21 ++++++++++++++++++---
 4 files changed, 29 insertions(+), 4 deletions(-)
Thomas Monjalon Oct. 29, 2015, 10:26 p.m. | #3
2015-10-12 14:37, Wang Xiao W:
> v2:
> * Updated release note for the new feature.
> 
> * Added "likely" in TSO parameters checking.
> 
> v1:
> * Initial version for fm10k TSO feature.
> 
> Wang Xiao W (2):
>   fm10k: enable TSO support
>   doc: update release note for fm10k TSO support

Applied, thanks

Patch

diff --git a/drivers/net/fm10k/base/fm10k_osdep.h b/drivers/net/fm10k/base/fm10k_osdep.h
index 53c433c..a1bfa09 100644
--- a/drivers/net/fm10k/base/fm10k_osdep.h
+++ b/drivers/net/fm10k/base/fm10k_osdep.h
@@ -145,4 +145,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
--- 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 b5fa2e6..aed3e92 100644
--- a/drivers/net/fm10k/fm10k_rxtx.c
+++ b/drivers/net/fm10k/fm10k_rxtx.c
@@ -410,7 +410,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 */
@@ -435,7 +435,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 */
@@ -447,6 +447,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 ((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;
 
@@ -462,7 +477,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