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 4FB7245BE5; Mon, 28 Oct 2024 03:08:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B32A14067C; Mon, 28 Oct 2024 03:08:53 +0100 (CET) Received: from bg1.exmail.qq.com (bg1.exmail.qq.com [114.132.67.179]) by mails.dpdk.org (Postfix) with ESMTP id DBE374067A for ; Mon, 28 Oct 2024 03:08:49 +0100 (CET) X-QQ-mid: bizesmtpsz8t1730081323tdc765b X-QQ-Originating-IP: iPDa7CkpqNwC2HmsKYbWx7pwtkOKFdsXZNiHfaisePg= Received: from wxdbg.localdomain.com ( [36.24.66.21]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 28 Oct 2024 10:08:42 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 17615118539695730899 From: Jiawen Wu To: dev@dpdk.org Cc: Jiawen Wu Subject: [PATCH v2 08/13] net/ngbe: check length of Tx packets Date: Mon, 28 Oct 2024 10:31:42 +0800 Message-Id: <20241028023147.60157-9-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20241028023147.60157-1-jiawenwu@trustnetic.com> References: <20241023064836.2017879-1-jiawenwu@trustnetic.com> <20241028023147.60157-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpsz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz8a-1 X-QQ-XMAILINFO: MYfhlf1c9BtRUi1JlFMWXgzI+Fa1YZxCDrlnnBz0DP0iYZroQEqFd52l 9XXIiFg9pBvK05bZ5XZgEDovSsu+nr0RyC01FbvZVt4i+6KgleFh7NwAn46H5CoqPDt9ajL UBDVnFq6VKVSLtBubmB/curHd6WKGbN7vIYbdcHJXTVXC7KC3FJd2E93RCBNFOwXX4DtWR/ GVm2Lz1gAEVg1GUg+osp/AEICLo6cHh+z1NvcYtSGcLZFj3odhZfagcTXjqUlDqDwdL3Mzx Cm09yrvxzYpbKvxt2hztQv99XxhS3UFighcHS0qsNNJpwO7sHRb5C5JIBXkCixnzJMOWrH7 R6aI7Mf8VNtF/iSHsdqSd7UyVhRCtnGuVkSoGHK/Ol8CNlDCpRfDLeUYCYudTbqjf8DEI1m 6X/z4T6d7ENIuY6qVL6iZEnsQfdMIX18QabbpIFmVQQW4X3he4UPUHPgpfH/hnxxllLeO4E l6nlxSRKuJg4E2PCI1jvbQySnMZ90eZrAgYRKXGMNctbme+1UFH+byBalO6239ZNtofKjqz NH1NfGFWtrae3IPGpv5BLVARQ4Q6CMskaYwSqx7V8RmC4UFRbpNPRG1IOjvG5lMGQOZbukI 1wBkx4m1ZRjHsh5pbm5UE7C5crrrwtrkjFbnDtfULy4lRehGYsuLqNp5c1zNG6qNH0a8WNT BzbxKTweDt3E3LFkZQoPbroNlsgR0bwSGvPUhnluBJ+Tt8KrpWZ3NkJKhJoNRKdOeQPFulp 4X874O4+nXNCFGjwNnGr/BtUI1OGFJ2QBXufcpyFUlklJheXJIWonrH+3kGxkfBRysQSNkC XXwt1GMsoXWiCDYexsIpryc26wPYx6nlalmorgoqXmifo7ITgENuKPh8Myx6X8cHwA/XN7L JP4aJrKnzL6kcfHLBJHUXx6GvDtfwbDu6WQlYFptSD4IvozQFAI1d5lWuJOk3mqJy2wzctj /fjMnkSLTYvnN0m99VsVju51FrdmjAPvH8dI3QrfFi+RgU8MphodCSP9l0uQZwgWx+9S1wZ s4s0LamFYSwcqE+4ZG X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= X-QQ-RECHKSPAM: 0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add checking of the Tx packet length to avoid TDM fatal error as far as possible. Set the pkt_len=1518 for invalid packet in simple Tx code path, and drop it directly in featured Tx code path. Althrough the hardware does not support TDM desc check. Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_rxtx.c | 33 +++++++++++++++++++++++++++ drivers/net/ngbe/ngbe_rxtx_vec_neon.c | 10 +++++--- drivers/net/ngbe/ngbe_rxtx_vec_sse.c | 11 ++++++--- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c index f3eb797d0c..25a314f10a 100644 --- a/drivers/net/ngbe/ngbe_rxtx.c +++ b/drivers/net/ngbe/ngbe_rxtx.c @@ -113,6 +113,8 @@ tx4(volatile struct ngbe_tx_desc *txdp, struct rte_mbuf **pkts) for (i = 0; i < 4; ++i, ++txdp, ++pkts) { buf_dma_addr = rte_mbuf_data_iova(*pkts); pkt_len = (*pkts)->data_len; + if (pkt_len < RTE_ETHER_HDR_LEN) + pkt_len = NGBE_FRAME_SIZE_DFT; /* write data to descriptor */ txdp->qw0 = rte_cpu_to_le_64(buf_dma_addr); @@ -133,6 +135,8 @@ tx1(volatile struct ngbe_tx_desc *txdp, struct rte_mbuf **pkts) buf_dma_addr = rte_mbuf_data_iova(*pkts); pkt_len = (*pkts)->data_len; + if (pkt_len < RTE_ETHER_HDR_LEN) + pkt_len = NGBE_FRAME_SIZE_DFT; /* write data to descriptor */ txdp->qw0 = cpu_to_le64(buf_dma_addr); @@ -555,6 +559,30 @@ ngbe_xmit_cleanup(struct ngbe_tx_queue *txq) return 0; } +static inline bool +ngbe_check_pkt_err(struct rte_mbuf *tx_pkt) +{ + uint32_t total_len = 0, nb_seg = 0; + struct rte_mbuf *mseg; + + mseg = tx_pkt; + do { + if (mseg->data_len == 0) + return true; + total_len += mseg->data_len; + nb_seg++; + mseg = mseg->next; + } while (mseg != NULL); + + if (tx_pkt->pkt_len != total_len || tx_pkt->pkt_len == 0) + return true; + + if (tx_pkt->nb_segs != nb_seg || tx_pkt->nb_segs > 64) + return true; + + return false; +} + uint16_t ngbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) @@ -599,6 +627,11 @@ ngbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) { new_ctx = 0; tx_pkt = *tx_pkts++; + if (ngbe_check_pkt_err(tx_pkt)) { + rte_pktmbuf_free(tx_pkt); + continue; + } + pkt_len = tx_pkt->pkt_len; /* diff --git a/drivers/net/ngbe/ngbe_rxtx_vec_neon.c b/drivers/net/ngbe/ngbe_rxtx_vec_neon.c index dcf12b7070..37075ea5e7 100644 --- a/drivers/net/ngbe/ngbe_rxtx_vec_neon.c +++ b/drivers/net/ngbe/ngbe_rxtx_vec_neon.c @@ -476,9 +476,13 @@ static inline void vtx1(volatile struct ngbe_tx_desc *txdp, struct rte_mbuf *pkt, uint64_t flags) { - uint64x2_t descriptor = { - pkt->buf_iova + pkt->data_off, - (uint64_t)pkt->pkt_len << 45 | flags | pkt->data_len}; + uint16_t pkt_len = pkt->data_len; + + if (pkt_len < RTE_ETHER_HDR_LEN) + pkt_len = NGBE_FRAME_SIZE_DFT; + + uint64x2_t descriptor = {pkt->buf_iova + pkt->data_off, + (uint64_t)pkt_len << 45 | flags | pkt_len}; vst1q_u64((uint64_t *)(uintptr_t)txdp, descriptor); } diff --git a/drivers/net/ngbe/ngbe_rxtx_vec_sse.c b/drivers/net/ngbe/ngbe_rxtx_vec_sse.c index b128bd3a67..19c69cdfa6 100644 --- a/drivers/net/ngbe/ngbe_rxtx_vec_sse.c +++ b/drivers/net/ngbe/ngbe_rxtx_vec_sse.c @@ -563,9 +563,14 @@ static inline void vtx1(volatile struct ngbe_tx_desc *txdp, struct rte_mbuf *pkt, uint64_t flags) { - __m128i descriptor = _mm_set_epi64x((uint64_t)pkt->pkt_len << 45 | - flags | pkt->data_len, - pkt->buf_iova + pkt->data_off); + uint16_t pkt_len = pkt->data_len; + __m128i descriptor; + + if (pkt_len < RTE_ETHER_HDR_LEN) + pkt_len = NGBE_FRAME_SIZE_DFT; + + descriptor = _mm_set_epi64x((uint64_t)pkt_len << 45 | flags | pkt_len, + pkt->buf_iova + pkt->data_off); _mm_store_si128((__m128i *)(uintptr_t)txdp, descriptor); } -- 2.27.0