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 D134745BE5; Mon, 28 Oct 2024 03:09:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13DD140A82; Mon, 28 Oct 2024 03:09:17 +0100 (CET) Received: from smtpbguseast1.qq.com (smtpbguseast1.qq.com [54.204.34.129]) by mails.dpdk.org (Postfix) with ESMTP id B1A884069F for ; Mon, 28 Oct 2024 03:09:04 +0100 (CET) X-QQ-mid: bizesmtpsz8t1730081318tyxpjbp X-QQ-Originating-IP: gy+1aeAzT5szuSGGycr/mKx2mDJnrrDaTJ/fcayyOKU= Received: from wxdbg.localdomain.com ( [36.24.66.21]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 28 Oct 2024 10:08:38 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 18063511842555537454 From: Jiawen Wu To: dev@dpdk.org Cc: Jiawen Wu Subject: [PATCH v2 06/13] net/txgbe: check length of Tx packets Date: Mon, 28 Oct 2024 10:31:40 +0800 Message-Id: <20241028023147.60157-7-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: N02q4IFO9cRVCM16UMTWIfiZUZJLQDzYQGl6Z1LWpe8IZ2GjxPZTv8cg UhRESYl3QjMXYNuGqkAObvDj1I6u/fxTkGDietSOrDHig0hDV3FU4EdUaaY1eoar+e49bJD rrKYb0Jt0etIYkg5uwkDa4Bir5Wtl2lUc5qQEDAcuhgufREx6okufWJTy/O0OSb1FbbhlLh sZv65pN4p90YxAtE8dc4bST2QgUbaL92oYsfxYzRvepI40wNpmmi2dh2r9yB8KGBZpQu+io u4GKywAvsFYYPvSOETa2D5/zWxdpse79aglHs6zKncY/p6map+vk1FfGaLdeGJEJjDM5cOb 9Sb1AfSte2seZMhUxgYRRbVKrjTTzaEh4t/CZ6Xp93OtuAIMeOO4U+QW4lScXTMNzTSjHyS AC7Z8HbSuP5qlIapHkZMu8ic4eFTKZC1z3DoE5QuIEy50k3DTdBA8Iz8fCs8xN7uWO0MLs3 NJuh0Z4WobuYXhtOP95XQnQQG15EQ6lrkwE8vK0BxYHKQnUy9M8aPodChmOH8+K5kmQlGGE bggzz+5DIl/cMKIDOaA+Yygh4SFuoRo63NAhIxKtF6Irxd711g4j79JjtVm28CH+ga/1M/Q 0uBRGjKVuZz5o+IHIITrnlU/s5R7XXJ6HwTiQ9XhOFPW3PSAH0+EfpOddGZegQeUwe/GNth eoUq/+UKYRNKcSTAIDU+pG6noTpmTDkA68Qo7+E7OAJwmf4xuF+hHTuui91bNfYz37QBIP2 78WC3osoch+COFJTCsEF9unSRgzKgqWFwnDw8P2Fkze/rpeC7ozUY59qE07un08gseksGcy Ok+1oCHzUYsUEAKo4ifPhqzZmqdFx4jaLq4BnL4hbsRkwN97cyWG+DVYa4hbiEiBAJuPC9k 35tK8M1GMZqlfy933I4NGTSToRULgHxp9frKFTBRXWry4LghXSHqXcNtbwm+8B3iWGS4SLW OsvuPtvgOVF5esLXCsNUWl47J0uU5qN/LFNjZp9lHZYpBFmZpcnFe7/MU X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= 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. Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_rxtx.c | 33 +++++++++++++++++++++++++ drivers/net/txgbe/txgbe_rxtx_vec_neon.c | 10 +++++--- drivers/net/txgbe/txgbe_rxtx_vec_sse.c | 11 ++++++--- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c index 2d2b437643..06acbd0881 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -160,6 +160,8 @@ tx4(volatile struct txgbe_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 = TXGBE_FRAME_SIZE_DFT; /* write data to descriptor */ txdp->qw0 = rte_cpu_to_le_64(buf_dma_addr); @@ -180,6 +182,8 @@ tx1(volatile struct txgbe_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 = TXGBE_FRAME_SIZE_DFT; /* write data to descriptor */ txdp->qw0 = cpu_to_le64(buf_dma_addr); @@ -813,6 +817,30 @@ txgbe_parse_tun_ptid(struct rte_mbuf *tx_pkt, uint8_t tun_len) return ptid; } +static inline bool +txgbe_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 txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) @@ -864,6 +892,11 @@ txgbe_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 (txgbe_check_pkt_err(tx_pkt)) { + rte_pktmbuf_free(tx_pkt); + continue; + } + pkt_len = tx_pkt->pkt_len; /* diff --git a/drivers/net/txgbe/txgbe_rxtx_vec_neon.c b/drivers/net/txgbe/txgbe_rxtx_vec_neon.c index a96baf9b1d..d4d647fab5 100644 --- a/drivers/net/txgbe/txgbe_rxtx_vec_neon.c +++ b/drivers/net/txgbe/txgbe_rxtx_vec_neon.c @@ -476,9 +476,13 @@ static inline void vtx1(volatile struct txgbe_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 = TXGBE_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/txgbe/txgbe_rxtx_vec_sse.c b/drivers/net/txgbe/txgbe_rxtx_vec_sse.c index 1a3f2ce3cd..8ecce33471 100644 --- a/drivers/net/txgbe/txgbe_rxtx_vec_sse.c +++ b/drivers/net/txgbe/txgbe_rxtx_vec_sse.c @@ -607,9 +607,14 @@ static inline void vtx1(volatile struct txgbe_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 = TXGBE_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