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 <jiawe...@trustnetic.com>
---
drivers/net/txgbe/txgbe_rxtx.c | 33 +++++++++++++++++++++++++
drivers/net/txgbe/txgbe_rxtx_vec_neon.c | 11 ++++++---
drivers/net/txgbe/txgbe_rxtx_vec_sse.c | 11 ++++++---
3 files changed, 49 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..14be7886ef 100644
--- a/drivers/net/txgbe/txgbe_rxtx_vec_neon.c
+++ b/drivers/net/txgbe/txgbe_rxtx_vec_neon.c
@@ -476,9 +476,14 @@ 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;
+ uint64x2_t descriptor;
+
+ if (pkt_len < RTE_ETHER_HDR_LEN)
+ pkt_len = TXGBE_FRAME_SIZE_DFT;
+
+ 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
