From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id C637F1BB27 for ; Fri, 22 Jun 2018 11:17:53 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jun 2018 02:17:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,256,1526367600"; d="scan'208";a="239666232" Received: from irsmsx107.ger.corp.intel.com ([163.33.3.99]) by fmsmga006.fm.intel.com with ESMTP; 22 Jun 2018 02:17:49 -0700 Received: from irsmsx105.ger.corp.intel.com ([169.254.7.126]) by IRSMSX107.ger.corp.intel.com ([169.254.10.238]) with mapi id 14.03.0319.002; Fri, 22 Jun 2018 10:17:48 +0100 From: "Ananyev, Konstantin" To: "Wu, Yanglong" , "dev@dpdk.org" CC: "Zhang, Qi Z" Thread-Topic: [PATCH v4] net/i40e: illegal packet checking Thread-Index: AQHUCD1TpM6sq7noD0aqPCeKHu/xPaRsAxww Date: Fri, 22 Jun 2018 09:17:47 +0000 Message-ID: <2601191342CEEE43887BDE71AB977258C0C402D6@irsmsx105.ger.corp.intel.com> References: <20180620014641.134405-1-yanglong.wu@intel.com> <20180620021247.134575-1-yanglong.wu@intel.com> In-Reply-To: <20180620021247.134575-1-yanglong.wu@intel.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNjNjMDEwNzMtMzEyMy00NWEwLTkxMGUtNjlhZjIyNDFjZmUxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiVENwdlFXNTdNU21aQWwrMHhtd3lUQSs1XC9pV3RhSlc1cHpUOEs2RGh4bjJSYkxjMFVxTzVkZ1JWRGt1UlgySDIifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v4] net/i40e: illegal packet checking X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jun 2018 09:17:54 -0000 > -----Original Message----- > From: Wu, Yanglong > Sent: Wednesday, June 20, 2018 3:13 AM > To: dev@dpdk.org > Cc: Zhang, Qi Z ; Ananyev, Konstantin ; Wu, Yanglong > > Subject: [PATCH v4] net/i40e: illegal packet checking >=20 > 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. >=20 > Signed-off-by: Yanglong Wu > --- > 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(-) >=20 > 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, struc= t rte_mbuf **tx_pkts, >=20 > /* 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 =3D -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; > } >=20 > + /* check the size of packet */ > + if (m->pkt_len > I40E_FRAME_SIZE_MAX || > + m->pkt_len < I40E_TX_MIN_PKT_LEN) { > + rte_errno =3D -EINVAL; > + return i; > + } > + > #ifdef RTE_LIBRTE_ETHDEV_DEBUG > ret =3D rte_validate_tx_offload(m); > if (ret !=3D 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 >=20 > +#define I40E_TX_MIN_PKT_LEN 17 > + > #undef container_of > #define container_of(ptr, type, member) ({ \ > typeof(((type *)0)->member)(*__mptr) =3D (ptr); \ > -- Acked-by: Konstantin Ananyev > 2.11.0