From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6CE44488FB for ; Fri, 10 Oct 2025 08:33:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C2F8402E1; Fri, 10 Oct 2025 08:33:26 +0200 (CEST) Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by mails.dpdk.org (Postfix) with ESMTP id CA7FA402B5 for ; Fri, 10 Oct 2025 08:33:23 +0200 (CEST) X-QQ-mid: zesmtpgz4t1760078001tfd4ca66d X-QQ-Originating-IP: ZTRV5QF6VFpcIvu0bTjdyfbrqtKKRfg0gvizC+82qKY= Received: from sunshaojie-Precision-5820-Tower ( [203.174.112.180]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 10 Oct 2025 14:33:18 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 12672905526891121051 EX-QQ-RecipientCnt: 4 From: Wenbo Cao To: stephen@networkplumber.org, Wenbo Cao Cc: yaojun@mucse.com, stable@dpdk.org Subject: [PATCH v3 3/4] net/rnp: fix TSO segmentation for packets of 64KB Date: Fri, 10 Oct 2025 14:33:05 +0800 Message-Id: <20251010063306.161198-4-caowenbo@mucse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251010063306.161198-1-caowenbo@mucse.com> References: <20251010063306.161198-1-caowenbo@mucse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: zesmtpgz:mucse.com:qybglogicsvrgz:qybglogicsvrgz5a-0 X-QQ-XMAILINFO: OW4JKxETGMY2GFAamlO1sNBaE2ktu7rW2GN0HhN/gtfvQtFv+CDaRckr gnmna1LiElYrORoQsxzf/IJ3Wu9QAP+IfiTOABK5osOYR7FnbyIthGVieV4vq9CgeU+IhiB bXw+uWi3+yw2xxeRfdXtFsDWGIv5YVOuwnYDSZLbESkyK0IDU6557qiiupJclBXOYVlL3Tt iTNWDPC+n/JLb1vZ+xBBhh51T0EDezGWDyuc0MzA8ynHa3B7ODYaGlArbrzSqNDl4VK0NyY 1bxoSocvYM8Km7ilNsKiz/hRAbrBq5ogZCm/h532fTS8KN+SdsyYTi32iMVR8CuOFqliTWn ni59z4uh+n69qtNhR7jblLXwyVHn7Ff5c/wd9vDoKiDqz/H4Y8AEDO9n5e/3ApA5xD/tOGk CIlLxz7fExlfP8H5jQuruH1iHbjY06fXPv1QZxHK/BB4/eXby66OhZR83/SRTnrl4uY6MlM moN294QT+p9psMezCP6+802kaCEl18sbXxEjm4KMp/1Bd0vYNtD2JGSHZZHqLTxE3DnbbmS LQPpsHadx9BhN+S7k1vf4EgfDNFP92/EVc9oWUdgKdRbjlCddqVaG5vRZPEvKcPGxmvZIEX yMAjFn1qw12h1SOTBRulP36lUiTt2l1mQRrrFHZ2K6kzQmOuHFvZLjghItXw26M9oAd5/iU CRU5ECSOTp7KuKwD7K0PhAsD4/1cNVzdNa6/D7jiK1sZ2EeozdnEYfei4AMWfmhL0QRWcbo mk4j19Q9tA7JaSzOMVQ0USzk7gMNq4pwoPwf4TWEWbqS5cCzi1Om6JmnhZlWs9sRJGLpLfv ZTYoyFQXeyON3pvUCAI0tB28TELUhpsEwvNqVDj5dOXFQ5KoJGM+V0/9CMpF9SGOvYXr3Va zbo24vxAS1oKdPGTzGatDg4ziQfKu5Z8+rvqylr+24H/B4NvYeGwksF+HjIrRzOp93xKfJ7 WAMqCFO0p7G4pmsmcU/IqPDRy3QX2DXGStVWu5eIoZu4akpsrt+qWLEcxDS8/rTyGzUDauh seZ4qreIEnTSnNCKpyuA+gOJEJN7b1+0sfC01buA== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= X-QQ-RECHKSPAM: 0 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Packets exceeding 64KB TSO size must be fragmented across multiple descriptors,Otherwise,it may cause TSO fragmentation anomalies. Fixes: 4530e70f1e32 ("net/rnp: support Tx TSO offload") Cc: stable@dpdk.org Signed-off-by: Wenbo Cao Reviewed-by: Stephen Hemminger --- drivers/net/rnp/rnp_rxtx.c | 48 ++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/drivers/net/rnp/rnp_rxtx.c b/drivers/net/rnp/rnp_rxtx.c index ee31f17cad..81e8c6ba44 100644 --- a/drivers/net/rnp/rnp_rxtx.c +++ b/drivers/net/rnp/rnp_rxtx.c @@ -1157,6 +1157,21 @@ rnp_need_ctrl_desc(uint64_t flags) return (flags & mask) ? 1 : 0; } +#define RNP_MAX_TSO_SEG_LEN (4096) +static inline uint16_t +rnp_calc_pkt_desc(struct rte_mbuf *tx_pkt) +{ + struct rte_mbuf *txd = tx_pkt; + uint16_t count = 0; + + while (txd != NULL) { + count += DIV_ROUND_UP(txd->data_len, RNP_MAX_TSO_SEG_LEN); + txd = txd->next; + } + + return count; +} + static void rnp_build_tx_control_desc(struct rnp_tx_queue *txq, volatile struct rnp_tx_desc *txbd, @@ -1394,6 +1409,10 @@ rnp_multiseg_xmit_pkts(void *_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) tx_pkt = tx_pkts[nb_tx]; ctx_desc_use = rnp_need_ctrl_desc(tx_pkt->ol_flags); nb_used_bd = tx_pkt->nb_segs + ctx_desc_use; + if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) + nb_used_bd = (uint16_t)(rnp_calc_pkt_desc(tx_pkt) + ctx_desc_use); + else + nb_used_bd = tx_pkt->nb_segs + ctx_desc_use; tx_last = (uint16_t)(tx_id + nb_used_bd - 1); if (tx_last >= txq->attr.nb_desc) tx_last = (uint16_t)(tx_last - txq->attr.nb_desc); @@ -1416,8 +1435,11 @@ rnp_multiseg_xmit_pkts(void *_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) m_seg = tx_pkt; first_seg = 1; do { + uint16_t remain_len = 0; + uint64_t dma_addr = 0; + txbd = &txq->tx_bdr[tx_id]; - txbd->d.cmd = 0; + *txbd = txq->zero_desc; txn = &txq->sw_ring[txe->next_id]; if ((first_seg && m_seg->ol_flags)) { rnp_setup_tx_offload(txq, txbd, @@ -1430,11 +1452,29 @@ rnp_multiseg_xmit_pkts(void *_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) rte_pktmbuf_free_seg(txe->mbuf); txe->mbuf = NULL; } + dma_addr = rnp_get_dma_addr(&txq->attr, m_seg); + remain_len = m_seg->data_len; txe->mbuf = m_seg; + while ((tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) && + unlikely(remain_len > RNP_MAX_TSO_SEG_LEN)) { + txbd->d.addr = dma_addr; + txbd->d.blen = rte_cpu_to_le_32(RNP_MAX_TSO_SEG_LEN); + dma_addr += RNP_MAX_TSO_SEG_LEN; + remain_len -= RNP_MAX_TSO_SEG_LEN; + txe->last_id = tx_last; + tx_id = txe->next_id; + txe = txn; + if (txe->mbuf) { + rte_pktmbuf_free_seg(txe->mbuf); + txe->mbuf = NULL; + } + txbd = &txq->tx_bdr[tx_id]; + *txbd = txq->zero_desc; + txn = &txq->sw_ring[txe->next_id]; + } txe->last_id = tx_last; - txbd->d.addr = rnp_get_dma_addr(&txq->attr, m_seg); - txbd->d.blen = rte_cpu_to_le_32(m_seg->data_len); - txbd->d.cmd &= ~RNP_CMD_EOP; + txbd->d.addr = dma_addr; + txbd->d.blen = rte_cpu_to_le_32(remain_len); m_seg = m_seg->next; tx_id = txe->next_id; txe = txn; -- 2.34.1