From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id A98501D623 for ; Fri, 15 Jun 2018 16:56:53 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jun 2018 07:56:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,227,1526367600"; d="scan'208";a="232871524" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga005.jf.intel.com with ESMTP; 15 Jun 2018 07:56:51 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 15 Jun 2018 07:56:50 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.51]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.82]) with mapi id 14.03.0319.002; Fri, 15 Jun 2018 22:56:48 +0800 From: "Zhang, Qi Z" To: "Wu, Yanglong" , "dev@dpdk.org" CC: "Ananyev, Konstantin" Thread-Topic: [PATCH v3] net/i40e: illagel pactket checking Thread-Index: AQHUBHHZqtwf1BraCEy+wJefjeZd66RhZwNw Date: Fri, 15 Jun 2018 14:56:48 +0000 Message-ID: <039ED4275CED7440929022BC67E7061153238AE8@SHSMSX103.ccr.corp.intel.com> References: <20180608035412.91329-1-yanglong.wu@intel.com> <20180615061842.67636-1-yanglong.wu@intel.com> In-Reply-To: <20180615061842.67636-1-yanglong.wu@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYjhhZjczMjQtMjRhYS00ZTQyLTkxMzAtODFjMWFlYmRjYmRkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiYWhTQ3FRckNGcXVtR29OWkhPVzBSbVdBZmFSRXZnNHdvN3IySWFtUjFhZlQzOHBHYXNJUDVlQXpVdVQ2Wkw2aSJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v3] net/i40e: illagel pactket 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, 15 Jun 2018 14:56:54 -0000 > -----Original Message----- > From: Wu, Yanglong > Sent: Friday, June 15, 2018 2:19 PM > To: dev@dpdk.org > Cc: Zhang, Qi Z ; Ananyev, Konstantin > ; Wu, Yanglong > Subject: [PATCH v3] net/i40e: illagel pactket checking >=20 illagel pactket --> illegal packet > Some illegal packets will lead to TX/RX hang and can't recover automatica= lly. > This pacth check those illegal packets and protect TX/RX from hanging. pacth -> patch >=20 > Signed-off-by: Yanglong Wu > --- > 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(-) >=20 > 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, >=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 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 =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); \ > -- > 2.11.0