From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id A062F3421 for ; Mon, 30 Jul 2018 03:05:39 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 18:05:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,420,1526367600"; d="scan'208";a="68500761" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by FMSMGA003.fm.intel.com with ESMTP; 29 Jul 2018 18:05:28 -0700 Received: from fmsmsx101.amr.corp.intel.com (10.18.124.199) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 29 Jul 2018 18:05:28 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx101.amr.corp.intel.com (10.18.124.199) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 29 Jul 2018 18:05:28 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.100]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.81]) with mapi id 14.03.0319.002; Mon, 30 Jul 2018 09:05:26 +0800 From: "Zhang, Qi Z" To: "Ananyev, Konstantin" , "Wu, Yanglong" , "dev@dpdk.org" CC: "Yao, Lei A" Thread-Topic: [PATCH v2] net/i40e: fix max frame size checking Thread-Index: AQHUJWU7bnBibF34u06ccTTRugTDIKSiMncAgATFXVA= Date: Mon, 30 Jul 2018 01:05:26 +0000 Message-ID: <039ED4275CED7440929022BC67E7061153261286@SHSMSX103.ccr.corp.intel.com> References: <20180726064602.157850-1-yanglong.wu@intel.com> <20180727044000.64068-1-yanglong.wu@intel.com> <2601191342CEEE43887BDE71AB977258DF51E8DE@irsmsx105.ger.corp.intel.com> In-Reply-To: <2601191342CEEE43887BDE71AB977258DF51E8DE@irsmsx105.ger.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiODBiNjdmMGUtM2QyNy00NGQ1LWJlMTUtNGNjOWIxMTIwYzA5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoicEM1b0RSXC9mSWFqZWhmWU1WUlhrSnBLNHVWQ1RoMFVMYUp5aTcxa1dKK0RldGVKekM2bjNpMXJSTUdDS2phWk4ifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 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 v2] net/i40e: fix max frame size 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: Mon, 30 Jul 2018 01:05:42 -0000 > -----Original Message----- > From: Ananyev, Konstantin > Sent: Friday, July 27, 2018 4:13 PM > To: Wu, Yanglong ; dev@dpdk.org > Cc: Zhang, Qi Z ; Yao, Lei A > Subject: RE: [PATCH v2] net/i40e: fix max frame size checking >=20 >=20 >=20 > > -----Original Message----- > > From: Wu, Yanglong > > Sent: Friday, July 27, 2018 5:40 AM > > To: dev@dpdk.org > > Cc: Zhang, Qi Z ; Ananyev, Konstantin > > ; Yao, Lei A ; Wu, > > Yanglong > > Subject: [PATCH v2] net/i40e: fix max frame size checking > > > > Check patcket size according to TSO or no-TSO. > > > > Fixes: bfeed0262b0c ("net/i40e: check illegal packets") > > > > Signed-off-by: Yanglong Wu > > --- > > v2: > > change as comments. > > --- > > drivers/net/i40e/i40e_ethdev.h | 1 + > > drivers/net/i40e/i40e_rxtx.c | 9 +++++---- > > 2 files changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/net/i40e/i40e_ethdev.h > > b/drivers/net/i40e/i40e_ethdev.h index cb5e5b5d8..3fffe5a55 100644 > > --- a/drivers/net/i40e/i40e_ethdev.h > > +++ b/drivers/net/i40e/i40e_ethdev.h > > @@ -28,6 +28,7 @@ > > #define I40E_NUM_DESC_ALIGN 32 > > #define I40E_BUF_SIZE_MIN 1024 > > #define I40E_FRAME_SIZE_MAX 9728 > > +#define I40E_TSO_FRAME_SIZE_MAX 262144 > > #define I40E_QUEUE_BASE_ADDR_UNIT 128 > > /* number of VSIs and queue default setting */ > > #define I40E_MAX_QP_NUM_PER_VF 16 > > diff --git a/drivers/net/i40e/i40e_rxtx.c > > b/drivers/net/i40e/i40e_rxtx.c index 3be87fe6a..1bbc0340b 100644 > > --- a/drivers/net/i40e/i40e_rxtx.c > > +++ b/drivers/net/i40e/i40e_rxtx.c > > @@ -1439,13 +1439,15 @@ 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_MTU_SEG) { > > + if (m->nb_segs > I40E_TX_MAX_MTU_SEG || > > + m->pkt_len > I40E_FRAME_SIZE_MAX) { > > rte_errno =3D -EINVAL; > > return i; > > } > > } else if (m->nb_segs > I40E_TX_MAX_SEG || > > m->tso_segsz < I40E_MIN_TSO_MSS || > > - m->tso_segsz > I40E_MAX_TSO_MSS) { > > + m->tso_segsz > I40E_MAX_TSO_MSS || > > + m->pkt_len > I40E_TSO_FRAME_SIZE_MAX) { > > /* MSS outside the range (256B - 9674B) are considered > > * malicious > > */ > > @@ -1459,8 +1461,7 @@ i40e_prep_pkts(__rte_unused void *tx_queue, > struct rte_mbuf **tx_pkts, > > } > > > > /* check the size of packet */ > > - if (m->pkt_len > I40E_FRAME_SIZE_MAX || > > - m->pkt_len < I40E_TX_MIN_PKT_LEN) { > > + if (m->pkt_len < I40E_TX_MIN_PKT_LEN) { > > rte_errno =3D -EINVAL; > > return i; > > } > > -- >=20 > Acked-by: Konstantin Ananyev Applied to dpdk-next-net-intel. Thanks! Qi >=20 > > 2.11.0