[dpdk-dev] net/i40e: illagel pactket checking
Checks
Commit Message
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>
---
drivers/net/i40e/i40e_rxtx.c | 10 ++++++++++
drivers/net/i40e/i40e_rxtx.h | 2 ++
2 files changed, 12 insertions(+)
Comments
Hi Yanglong,
> -----Original Message-----
> From: Wu, Yanglong
> Sent: Thursday, June 7, 2018 10:40 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] 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>
> ---
> drivers/net/i40e/i40e_rxtx.c | 10 ++++++++++
> drivers/net/i40e/i40e_rxtx.h | 2 ++
> 2 files changed, 12 insertions(+)
>
> diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
> index 6032d5541..be00b898e 100644
> --- a/drivers/net/i40e/i40e_rxtx.c
> +++ b/drivers/net/i40e/i40e_rxtx.c
> @@ -1458,6 +1458,16 @@ 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 > ETHER_MAX_LEN || m->pkt_len < I40E_TX_MIN_PKT_LEN){
And why pkt_len greater then ETHER_MAX_LEN is not supported?
What about jumbo frames?
> + rte_errno = -EINVAL;
> + return i;}
> +
> + /*check the number of mbuf segments*/
> + if(m->nb_segs > I40E_TX_MAX_MTU_SEG){
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) {
...
}
> + 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
@@ -1458,6 +1458,16 @@ 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 > ETHER_MAX_LEN || 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;}
+
#ifdef RTE_LIBRTE_ETHDEV_DEBUG
ret = rte_validate_tx_offload(m);
if (ret != 0) {
@@ -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); \