d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/i40e: check illegal packets

Browse Source 
Some illegal packets will lead to TX/RX hang and
can't recover automatically. This patch check those
illegal packets and protect TX/RX from hanging.

Signed-off-by: Yanglong Wu <yanglong.wu@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
This commit is contained in:
Yanglong Wu 2018-06-20 10:12:47 +08:00 committed by Ferruh Yigit
parent 3320d4a240
commit bfeed0262b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/i40e/i40e_rxtx.c
View File

@ -1439,13 +1439,13 @@ i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
/* Check for m->nb_segs to not exceed the limits. */ /* Check for m->nb_segs to not exceed the limits. */
if (!(ol_flags & PKT_TX_TCP_SEG)) { if (!(ol_flags & PKT_TX_TCP_SEG)) {
if (m->nb_segs > I40E_TX_MAX_SEG || if (m->nb_segs > I40E_TX_MAX_MTU_SEG) {
m->nb_segs > I40E_TX_MAX_MTU_SEG) {
rte_errno = -EINVAL; rte_errno = -EINVAL;
return i; return i;
} }
} else if ((m->tso_segsz < I40E_MIN_TSO_MSS) || } else if (m->nb_segs > I40E_TX_MAX_SEG ||
(m->tso_segsz > I40E_MAX_TSO_MSS)) { m->tso_segsz < I40E_MIN_TSO_MSS ||
m->tso_segsz > I40E_MAX_TSO_MSS) {
/* MSS outside the range (256B - 9674B) are considered /* MSS outside the range (256B - 9674B) are considered
* malicious * malicious
*/ */
@ -1458,6 +1458,13 @@ i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
return i; return i;
} }
/* check the size of packet */
if (m->pkt_len > I40E_FRAME_SIZE_MAX ||
m->pkt_len < I40E_TX_MIN_PKT_LEN) {
rte_errno = -EINVAL;
return i;
}
#ifdef RTE_LIBRTE_ETHDEV_DEBUG #ifdef RTE_LIBRTE_ETHDEV_DEBUG
ret = rte_validate_tx_offload(m); ret = rte_validate_tx_offload(m);
if (ret != 0) { if (ret != 0) {

2
drivers/net/i40e/i40e_rxtx.h
View File

@ -30,6 +30,8 @@
#define I40E_TX_MAX_SEG UINT8_MAX #define I40E_TX_MAX_SEG UINT8_MAX
#define I40E_TX_MAX_MTU_SEG 8 #define I40E_TX_MAX_MTU_SEG 8
#define I40E_TX_MIN_PKT_LEN 17
#undef container_of #undef container_of
#define container_of(ptr, type, member) ({ \ #define container_of(ptr, type, member) ({ \
typeof(((type *)0)->member)(*__mptr) = (ptr); \ typeof(((type *)0)->member)(*__mptr) = (ptr); \