[v3] net/i40e: illagel pactket checking

Message ID 20180615061842.67636-1-yanglong.wu@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Qi Zhang
Headers
Series [v3] net/i40e: illagel pactket checking |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Yanglong Wu June 15, 2018, 6:18 a.m. UTC
  Some illegal packets will lead to TX/RX hang and
can't recover automatically. This pacth check those
illegal packets and protect TX/RX from hanging.

Signed-off-by: Yanglong Wu <yanglong.wu@intel.com>
---
v2:
fix coding style issue and error
---
v3:
rework as comments
---
 drivers/net/i40e/i40e_rxtx.c | 15 +++++++++++----
 drivers/net/i40e/i40e_rxtx.h |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)
  

Comments

Qi Zhang June 15, 2018, 2:56 p.m. UTC | #1
> -----Original Message-----
> From: Wu, Yanglong
> Sent: Friday, June 15, 2018 2:19 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Ananyev, Konstantin
> <konstantin.ananyev@intel.com>; Wu, Yanglong <yanglong.wu@intel.com>
> Subject: [PATCH v3] net/i40e: illagel pactket checking
> 

illagel pactket --> illegal packet

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

pacth -> patch

> 
> Signed-off-by: Yanglong Wu <yanglong.wu@intel.com>
> ---
> v2:
> fix coding style issue and error
> ---
> v3:
> rework as comments
> ---
>  drivers/net/i40e/i40e_rxtx.c | 15 +++++++++++----
> drivers/net/i40e/i40e_rxtx.h |  2 ++
>  2 files changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index
> 6032d5541..42b08f1f0 100644
> --- a/drivers/net/i40e/i40e_rxtx.c
> +++ b/drivers/net/i40e/i40e_rxtx.c
> @@ -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. */
>  		if (!(ol_flags & PKT_TX_TCP_SEG)) {
> -			if (m->nb_segs > I40E_TX_MAX_SEG ||
> -			    m->nb_segs > I40E_TX_MAX_MTU_SEG) {
> +			if (m->nb_segs > I40E_TX_MAX_MTU_SEG) {
>  				rte_errno = -EINVAL;
>  				return i;
>  			}
> -		} else if ((m->tso_segsz < I40E_MIN_TSO_MSS) ||
> -				(m->tso_segsz > I40E_MAX_TSO_MSS)) {
> +		} else if (m->nb_segs > I40E_TX_MAX_SEG ||
> +			   m->tso_segsz < I40E_MIN_TSO_MSS ||
> +			   m->tso_segsz > I40E_MAX_TSO_MSS) {
>  			/* MSS outside the range (256B - 9674B) are considered
>  			 * malicious
>  			 */
> @@ -1458,6 +1458,13 @@ i40e_prep_pkts(__rte_unused void *tx_queue,
> struct rte_mbuf **tx_pkts,
>  			return i;
>  		}
> 
> +		/* check the size of pkt len */

Could be "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
>  		ret = rte_validate_tx_offload(m);
>  		if (ret != 0) {
> diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index
> ea73a8a1b..3fc619af9 100644
> --- a/drivers/net/i40e/i40e_rxtx.h
> +++ b/drivers/net/i40e/i40e_rxtx.h
> @@ -30,6 +30,8 @@
>  #define I40E_TX_MAX_SEG     UINT8_MAX
>  #define I40E_TX_MAX_MTU_SEG 8
> 
> +#define I40E_TX_MIN_PKT_LEN 17
> +
>  #undef container_of
>  #define container_of(ptr, type, member) ({ \
>  		typeof(((type *)0)->member)(*__mptr) = (ptr); \
> --
> 2.11.0
  

Patch

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 6032d5541..42b08f1f0 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -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. */
 		if (!(ol_flags & PKT_TX_TCP_SEG)) {
-			if (m->nb_segs > I40E_TX_MAX_SEG ||
-			    m->nb_segs > I40E_TX_MAX_MTU_SEG) {
+			if (m->nb_segs > I40E_TX_MAX_MTU_SEG) {
 				rte_errno = -EINVAL;
 				return i;
 			}
-		} else if ((m->tso_segsz < I40E_MIN_TSO_MSS) ||
-				(m->tso_segsz > I40E_MAX_TSO_MSS)) {
+		} else if (m->nb_segs > I40E_TX_MAX_SEG ||
+			   m->tso_segsz < I40E_MIN_TSO_MSS ||
+			   m->tso_segsz > I40E_MAX_TSO_MSS) {
 			/* MSS outside the range (256B - 9674B) are considered
 			 * malicious
 			 */
@@ -1458,6 +1458,13 @@  i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 			return i;
 		}
 
+		/* check the size of pkt len */
+		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
 		ret = rte_validate_tx_offload(m);
 		if (ret != 0) {
diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h
index ea73a8a1b..3fc619af9 100644
--- a/drivers/net/i40e/i40e_rxtx.h
+++ b/drivers/net/i40e/i40e_rxtx.h
@@ -30,6 +30,8 @@ 
 #define I40E_TX_MAX_SEG     UINT8_MAX
 #define I40E_TX_MAX_MTU_SEG 8
 
+#define I40E_TX_MIN_PKT_LEN 17
+
 #undef container_of
 #define container_of(ptr, type, member) ({ \
 		typeof(((type *)0)->member)(*__mptr) = (ptr); \