* Re: [dpdk-dev] [PATCH v2] net/i40e: illagel pactket checking
2018-06-08 3:54 ` [dpdk-dev] [PATCH v2] " Yanglong Wu
@ 2018-06-08 14:04 ` Ananyev, Konstantin
2018-06-08 17:24 ` Wiles, Keith
` (5 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Ananyev, Konstantin @ 2018-06-08 14:04 UTC (permalink / raw)
To: Wu, Yanglong, dev; +Cc: Zhang, Qi Z
> -----Original Message-----
> From: Wu, Yanglong
> Sent: Friday, June 8, 2018 4:54 AM
> 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 v2] net/i40e: illagel pactket checking
>
> 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
> ---
> drivers/net/i40e/i40e_rxtx.c | 11 +++++++++++
> drivers/net/i40e/i40e_rxtx.h | 2 ++
> 2 files changed, 13 insertions(+)
>
> diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
> index 6032d5541..05cf3956c 100644
> --- a/drivers/net/i40e/i40e_rxtx.c
> +++ b/drivers/net/i40e/i40e_rxtx.c
> @@ -1458,6 +1458,17 @@ 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; }
Please follow DPDK coding style:
If (...) {
...
}
> +
> + /*check the number of mbuf segments*/
> + if (m->nb_segs > I40E_TX_MAX_MTU_SEG) {
> + rte_errno = -EINVAL;
> + return i; }
I'll just repeat comment from my previous mail:
We already checking that in that function:
/* 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) {
rte_errno = -EINVAL;
return i;
}
} else if ((m->tso_segsz < I40E_MIN_TSO_MSS) ||
(m->tso_segsz > I40E_MAX_TSO_MSS)) {
/* MSS outside the range (256B - 9674B) are considered
* malicious
*/
rte_errno = -EINVAL;
return i;
}
Though it seems it is not totally correct, should probably be:
if (!(ol_flags & PKT_TX_TCP_SEG)) {
if (m->nb_segs > I40E_TX_MAX_SEG) {
...
}
} else if (m->nb_segs > I40E_TX_MAX_MTU_SEG ||
m->tso_segsz < I40E_MIN_TSO_MSS ||
m->tso_segsz > I40E_MAX_TSO_MSS) {
...
}
Konstantin
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [dpdk-dev] [PATCH v2] net/i40e: illagel pactket checking
2018-06-08 3:54 ` [dpdk-dev] [PATCH v2] " Yanglong Wu
2018-06-08 14:04 ` Ananyev, Konstantin
@ 2018-06-08 17:24 ` Wiles, Keith
2018-06-15 6:18 ` [dpdk-dev] [PATCH v3] " Yanglong Wu
` (4 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Wiles, Keith @ 2018-06-08 17:24 UTC (permalink / raw)
To: Wu, Yanglong; +Cc: dev, Zhang, Qi Z, Ananyev, Konstantin
> On Jun 7, 2018, at 8:54 PM, Yanglong Wu <yanglong.wu@intel.com> wrote:
>
> 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.
The subject line has a number of spelling mistakes and that is used in the comments, please fix.
>
> Signed-off-by: Yanglong Wu <yanglong.wu@intel.com>
> ---
> v2:
> fix coding style issue and error
> ---
> drivers/net/i40e/i40e_rxtx.c | 11 +++++++++++
> drivers/net/i40e/i40e_rxtx.h | 2 ++
> 2 files changed, 13 insertions(+)
>
> diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
> index 6032d5541..05cf3956c 100644
> --- a/drivers/net/i40e/i40e_rxtx.c
> +++ b/drivers/net/i40e/i40e_rxtx.c
> @@ -1458,6 +1458,17 @@ 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; }
> +
> + /*check the number of mbuf segments*/
> + if (m->nb_segs > I40E_TX_MAX_MTU_SEG) {
> + rte_errno = -EINVAL;
> + return i; }
Also I am being a bit picky, but the comments should have a space after the /* and before the */, and of course the changes that Konstantin suggested.
> +
> #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
>
Regards,
Keith
^ permalink raw reply [flat|nested] 14+ messages in thread* [dpdk-dev] [PATCH v3] net/i40e: illagel pactket checking
2018-06-08 3:54 ` [dpdk-dev] [PATCH v2] " Yanglong Wu
2018-06-08 14:04 ` Ananyev, Konstantin
2018-06-08 17:24 ` Wiles, Keith
@ 2018-06-15 6:18 ` Yanglong Wu
2018-06-15 14:56 ` Zhang, Qi Z
2018-06-19 8:42 ` [dpdk-dev] [PATCH v3] net/i40e: illegal " Yanglong Wu
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Yanglong Wu @ 2018-06-15 6:18 UTC (permalink / raw)
To: dev; +Cc: qi.z.zhang, konstantin.ananyev, Yanglong Wu
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(-)
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); \
--
2.11.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [dpdk-dev] [PATCH v3] net/i40e: illagel pactket checking
2018-06-15 6:18 ` [dpdk-dev] [PATCH v3] " Yanglong Wu
@ 2018-06-15 14:56 ` Zhang, Qi Z
0 siblings, 0 replies; 14+ messages in thread
From: Zhang, Qi Z @ 2018-06-15 14:56 UTC (permalink / raw)
To: Wu, Yanglong, dev; +Cc: Ananyev, Konstantin
> -----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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [dpdk-dev] [PATCH v3] net/i40e: illegal pactket checking
2018-06-08 3:54 ` [dpdk-dev] [PATCH v2] " Yanglong Wu
` (2 preceding siblings ...)
2018-06-15 6:18 ` [dpdk-dev] [PATCH v3] " Yanglong Wu
@ 2018-06-19 8:42 ` Yanglong Wu
2018-06-19 9:10 ` [dpdk-dev] [PATCH] " Yanglong Wu
` (2 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Yanglong Wu @ 2018-06-19 8:42 UTC (permalink / raw)
To: dev; +Cc: qi.z.zhang, konstantin.ananyev, Yanglong Wu
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>
---
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 */
+ 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
^ permalink raw reply [flat|nested] 14+ messages in thread* [dpdk-dev] [PATCH] net/i40e: illegal pactket checking
2018-06-08 3:54 ` [dpdk-dev] [PATCH v2] " Yanglong Wu
` (3 preceding siblings ...)
2018-06-19 8:42 ` [dpdk-dev] [PATCH v3] net/i40e: illegal " Yanglong Wu
@ 2018-06-19 9:10 ` Yanglong Wu
2018-06-20 1:44 ` Yanglong Wu
2018-06-20 1:46 ` [dpdk-dev] [PATCH v3] " Yanglong Wu
6 siblings, 0 replies; 14+ messages in thread
From: Yanglong Wu @ 2018-06-19 9:10 UTC (permalink / raw)
To: dev; +Cc: qi.z.zhang, konstantin.ananyev, Yanglong Wu
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>
---
v2:
fix coding style issue and spelling 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 */
+ 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
^ permalink raw reply [flat|nested] 14+ messages in thread* [dpdk-dev] [PATCH] net/i40e: illegal pactket checking
2018-06-08 3:54 ` [dpdk-dev] [PATCH v2] " Yanglong Wu
` (4 preceding siblings ...)
2018-06-19 9:10 ` [dpdk-dev] [PATCH] " Yanglong Wu
@ 2018-06-20 1:44 ` Yanglong Wu
2018-06-20 1:46 ` [dpdk-dev] [PATCH v3] " Yanglong Wu
6 siblings, 0 replies; 14+ messages in thread
From: Yanglong Wu @ 2018-06-20 1:44 UTC (permalink / raw)
To: dev; +Cc: qi.z.zhang, konstantin.ananyev, Yanglong Wu
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>
---
v2:
fix coding style issue and spelling 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..e7916f99c 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 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
^ permalink raw reply [flat|nested] 14+ messages in thread* [dpdk-dev] [PATCH v3] net/i40e: illegal pactket checking
2018-06-08 3:54 ` [dpdk-dev] [PATCH v2] " Yanglong Wu
` (5 preceding siblings ...)
2018-06-20 1:44 ` Yanglong Wu
@ 2018-06-20 1:46 ` Yanglong Wu
2018-06-20 2:12 ` [dpdk-dev] [PATCH v4] net/i40e: illegal packet checking Yanglong Wu
6 siblings, 1 reply; 14+ messages in thread
From: Yanglong Wu @ 2018-06-20 1:46 UTC (permalink / raw)
To: dev; +Cc: qi.z.zhang, konstantin.ananyev, Yanglong Wu
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>
---
v2:
fix coding style issue and spelling 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..e7916f99c 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 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
^ permalink raw reply [flat|nested] 14+ messages in thread* [dpdk-dev] [PATCH v4] net/i40e: illegal packet checking
2018-06-20 1:46 ` [dpdk-dev] [PATCH v3] " Yanglong Wu
@ 2018-06-20 2:12 ` Yanglong Wu
2018-06-22 9:17 ` Ananyev, Konstantin
2018-06-22 11:52 ` Zhang, Qi Z
0 siblings, 2 replies; 14+ messages in thread
From: Yanglong Wu @ 2018-06-20 2:12 UTC (permalink / raw)
To: dev; +Cc: qi.z.zhang, konstantin.ananyev, Yanglong Wu
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>
---
v2:
fix coding style issue and spelling error
---
v3:
rework as comments
---
v4:
fix spelling error
---
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..e7916f99c 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 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
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [dpdk-dev] [PATCH v4] net/i40e: illegal packet checking
2018-06-20 2:12 ` [dpdk-dev] [PATCH v4] net/i40e: illegal packet checking Yanglong Wu
@ 2018-06-22 9:17 ` Ananyev, Konstantin
2018-06-22 11:52 ` Zhang, Qi Z
1 sibling, 0 replies; 14+ messages in thread
From: Ananyev, Konstantin @ 2018-06-22 9:17 UTC (permalink / raw)
To: Wu, Yanglong, dev; +Cc: Zhang, Qi Z
> -----Original Message-----
> From: Wu, Yanglong
> Sent: Wednesday, June 20, 2018 3:13 AM
> 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 v4] net/i40e: illegal packet checking
>
> 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>
> ---
> v2:
> fix coding style issue and spelling error
> ---
> v3:
> rework as comments
> ---
> v4:
> fix spelling error
> ---
> 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..e7916f99c 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 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); \
> --
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> 2.11.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [dpdk-dev] [PATCH v4] net/i40e: illegal packet checking
2018-06-20 2:12 ` [dpdk-dev] [PATCH v4] net/i40e: illegal packet checking Yanglong Wu
2018-06-22 9:17 ` Ananyev, Konstantin
@ 2018-06-22 11:52 ` Zhang, Qi Z
1 sibling, 0 replies; 14+ messages in thread
From: Zhang, Qi Z @ 2018-06-22 11:52 UTC (permalink / raw)
To: Wu, Yanglong, dev; +Cc: Ananyev, Konstantin
> -----Original Message-----
> From: Wu, Yanglong
> Sent: Wednesday, June 20, 2018 10:13 AM
> 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 v4] net/i40e: illegal packet checking
>
> 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>
Applied to dpdk-next-net-intel
Thanks!
Qi>
^ permalink raw reply [flat|nested] 14+ messages in thread