From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 1F5895B3C; Mon, 18 Feb 2019 16:25:23 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 07:25:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,385,1544515200"; d="scan'208";a="300640190" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.237.221.114]) ([10.237.221.114]) by orsmga005.jf.intel.com with ESMTP; 18 Feb 2019 07:25:20 -0800 To: "Parthasarathy, JananeeX M" , Chas Williams <3chas3@gmail.com>, Hyong Youb Kim , "Doherty, Declan" , Chas Williams Cc: "dev@dpdk.org" , "stable@dpdk.org" , "Vemula, Hari KumarX" , "Pattan, Reshma" References: <20190110102235.1238-1-hyonkim@cisco.com> <20190110102235.1238-3-hyonkim@cisco.com> <7AE31235A30B41498D1C31348DC858BD5B5329AB@IRSMSX103.ger.corp.intel.com> From: Ferruh Yigit Openpgp: preference=signencrypt Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= mQINBFXZCFABEADCujshBOAaqPZpwShdkzkyGpJ15lmxiSr3jVMqOtQS/sB3FYLT0/d3+bvy qbL9YnlbPyRvZfnP3pXiKwkRoR1RJwEo2BOf6hxdzTmLRtGtwWzI9MwrUPj6n/ldiD58VAGQ +iR1I/z9UBUN/ZMksElA2D7Jgg7vZ78iKwNnd+vLBD6I61kVrZ45Vjo3r+pPOByUBXOUlxp9 GWEKKIrJ4eogqkVNSixN16VYK7xR+5OUkBYUO+sE6etSxCr7BahMPKxH+XPlZZjKrxciaWQb +dElz3Ab4Opl+ZT/bK2huX+W+NJBEBVzjTkhjSTjcyRdxvS1gwWRuXqAml/sh+KQjPV1PPHF YK5LcqLkle+OKTCa82OvUb7cr+ALxATIZXQkgmn+zFT8UzSS3aiBBohg3BtbTIWy51jNlYdy ezUZ4UxKSsFuUTPt+JjHQBvF7WKbmNGS3fCid5Iag4tWOfZoqiCNzxApkVugltxoc6rG2TyX CmI2rP0mQ0GOsGXA3+3c1MCdQFzdIn/5tLBZyKy4F54UFo35eOX8/g7OaE+xrgY/4bZjpxC1 1pd66AAtKb3aNXpHvIfkVV6NYloo52H+FUE5ZDPNCGD0/btFGPWmWRmkPybzColTy7fmPaGz cBcEEqHK4T0aY4UJmE7Ylvg255Kz7s6wGZe6IR3N0cKNv++O7QARAQABtCVGZXJydWggWWln aXQgPGZlcnJ1aC55aWdpdEBpbnRlbC5jb20+iQJVBBMBAgA/AhsDBgsJCAcDAgYVCAIJCgsE FgIDAQIeAQIXgBYhBNI2U4dCLsKE45mBx/kz60PfE2EfBQJbughWBQkHwjOGAAoJEPkz60Pf E2Eft84QAIbKWqhgqRfoiw/BbXbA1+qm2o4UgkCRQ0yJgt9QsnbpOmPKydHH0ixCliNz1J8e mRXCkMini1bTpnzp7spOjQGLeAFkNFz6BMq8YF2mVWbGEDE9WgnAxZdi0eLY7ZQnHbE6AxKL SXmpe9INb6z3ztseFt7mqje/W/6DWYIMnH3Yz9KzxujFWDcq8UCAvPkxVQXLTMpauhFgYeEx Nub5HbvhxTfUkapLwRQsSd/HbywzqZ3s/bbYMjj5JO3tgMiM9g9HOjv1G2f1dQjHi5YQiTZl 1eIIqQ3pTic6ROaiZqNmQFXPsoOOFfXF8nN2zg8kl/sSdoXWHhama5hbwwtl1vdaygQYlmdK H2ueiFh/UvT3WG3waNv2eZiEbHV8Rk52Xyn2w1G90lV0fYC6Ket1Xjoch7kjwbx793Kz/RfQ rmBY8/S4DTGn3oq3dMdQY+b6+7VMUeLMMh2CXYO9ErkOq+qNTD1IY+cBAkXnaDbQfz0zbste ZGWH74FAZ9nCpDOqbRTrBL42aMGhfOWEyeA1x7+hl6JZfabBWAuf4nnCXuorKHzBXTrf7u7p fXsKQClWRW77PF1VmzrtKNVSytQAmlCWApQIw20AarFipXmVdIjHmJPU611WoyxZPb4JTOxx 5cv9B+nr/RIB+v5dcStyHCCwO1be7nBDdCgd4F6kTQPLuQINBFfWTL4BEACnNA29e8TarUsB L5n6eLZHXcFvVwNLVlirWOClHXf44o2KnN3ww+eBEmKVfEFo9MSuGDNHS8Zw1NiGMYxLIUgd U6gGrVVs/VrQWL82pbMk6jCj98N+BXIri+6K1z+AImz7ax7iF1kDgRAnFWU0znWWBgM2mM8Y gDjcxfXk4sCKnvf6Gjo08Ey5zmqx7dekAKU2EEp8Q1EJY3jbymLdZWRP4AFFMTS1rGMk0/tt v71NBg1GobCcbNfn9chK/jhqxYhAJqq86RdJQkt3/9x1U1Oq0vXCt4JVVHmkxePtUiuWTTt+ aYlUAsKYZsWvncExvw77x2ArYDmaK0yfjh37wp0lY7DOJHFxoyT8tyWZlLci/VMRG2Ja33xj 0CN4C1yBg+QDeV3QFxQo42iA/ykdXPUR3ezmsND3XKvVLTC4DNb3V/EZQ7jBj64+bEK0VW4G B31VP00ApNQvSoczsIOAKdk97RNbpmPw6q10ILIB+9T1xbnFYzshzGF17oC0/GENIHATx8vZ masOZoDiOZQpeneLgnFE9JfzhLTxv6wNZcc/HLXRQVTkDsQr8ERtkAoHCf1E5+b5Yr7pfnE4 YuhET746o25S53ELUYPIs49qoJsEJL34/oexMfPGyPIlrbufiNyty5jc/1MRwUlhJlJ5IOHy ZUa+6CLR7GdImusFkPJUJwARAQABiQI8BBgBAgAmAhsMFiEE0jZTh0IuwoTjmYHH+TPrQ98T YR8FAlu6CHAFCQXE7zIACgkQ+TPrQ98TYR9nXxAAqNBgkYNyGuWUuy0GwDQCbu3iiMyH1+D7 llafPcK4NYy1Z4AYuVwC9nmLaoj+ozdqS3ncRo57ncRsKEJC46nDJJZYZ5LSJVn63Y3NBF86 lxQAgjj2oyZEwaLKtKbAFsXL43jv1pUGgSvWwYtDwHITXXFQto9rZEuUDRFSx4sg9OR+Q6/6 LY+nQQ3OdHlBkflzYMPcWgDcvcTAO6yasLEUf7UcYoSWTyMYjLB4QuNlXzTswzGVMssJF/vo V8lD1eqqaSUWG3STF6GVLQOr1NLvN5+kUBiEStHFxBpgSCvYY9sNV8FS6N24CAWMBl+10W+D 2h1yiiP5dOdPcBDYKsgqDD91/sP0WdyMJkwdQJtD49f9f+lYloxHnSAxMleOpyscg1pldw+i mPaUY1bmIknLhhkqfMmjywQOXpac5LRMibAAYkcB8v7y3kwELnt8mhqqZy6LUsqcWygNbH/W K3GGt5tRpeIXeJ25x8gg5EBQ0Jnvp/IbBYQfPLtXH0Myq2QuAhk/1q2yEIbVjS+7iowEZNyE 56K63WBJxsJPB2mvmLgn98GqB4G6GufP1ndS0XDti/2K0o8rep9xoY/JDGi0n0L0tk9BHyoP Y7kaEpu7UyY3nVdRLe5H1/MnFG8hdJ97WqnPS0buYZlrbTV0nRFL/NI2VABl18vEEXvNQiO+ vM8= Message-ID: <81ccbfb1-44a1-2a7a-4ff0-08382557f66e@intel.com> Date: Mon, 18 Feb 2019 15:25:19 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <7AE31235A30B41498D1C31348DC858BD5B5329AB@IRSMSX103.ger.corp.intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH 2/2] net/bonding: avoid the next active slave going out of bound 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, 18 Feb 2019 15:25:24 -0000 On 2/11/2019 10:25 AM, Parthasarathy, JananeeX M wrote: > Hi > >> -----Original Message----- >> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Chas Williams >> Sent: Saturday, February 09, 2019 6:47 PM >> To: Hyong Youb Kim ; Yigit, Ferruh >> ; Doherty, Declan ; Chas >> Williams >> Cc: dev@dpdk.org; stable@dpdk.org >> Subject: Re: [dpdk-dev] [PATCH 2/2] net/bonding: avoid the next active slave >> going out of bound >> >> >> >> On 1/10/19 5:22 AM, Hyong Youb Kim wrote: >>> For bonding modes like broadcast that use bond_ethdev_rx_burst(), it >>> is fairly easy to produce a crash simply by bringing a slave port's >>> link down. When slave links go down, the driver on one thread reduces >>> active_slave_count via the LSC callback and deactivate_slave(). At the >>> same time, bond_ethdev_rx_burst() running on a forwarding thread may >>> increment active_slave (next active slave) beyond active_slave_count. >>> Here is a typical sequence of events. >>> >>> At time 0: >>> active_slave_count = 3 >>> active_slave = 2 >>> >>> At time 1: >>> A slave link goes down. >>> Thread 0 (main) reduces active_slave_count to 2. >>> >>> At time 2: >>> Thread 1 (forwarding) executes bond_ethdev_rx_burst(). >>> - Reads active_slave_count = 2. >>> - Increments active_slave at the end to 3. >>> >>> From this point on, everytime bond_ethdev_rx_burst() runs, >>> active_slave increments by one, eventually going well out of bound of >>> the active_slaves array and causing a crash. >>> >>> Make the rx burst function to first check that active_slave is within >>> bound. If not, reset it to 0 to avoid out-of-range array access. >>> >>> Fixes: e1110e977648 ("net/bonding: fix Rx slave fairness") >>> Cc: stable@dpdk.org >>> >>> Signed-off-by: Hyong Youb Kim >> >> Acked-by: Chas Williams >> >>> --- >>> drivers/net/bonding/rte_eth_bond_pmd.c | 14 ++++++++++++++ >>> 1 file changed, 14 insertions(+) >>> >>> diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c >>> b/drivers/net/bonding/rte_eth_bond_pmd.c >>> index daf2440cd..bc2405e54 100644 >>> --- a/drivers/net/bonding/rte_eth_bond_pmd.c >>> +++ b/drivers/net/bonding/rte_eth_bond_pmd.c >>> @@ -68,6 +68,15 @@ bond_ethdev_rx_burst(void *queue, struct rte_mbuf >> **bufs, uint16_t nb_pkts) >>> internals = bd_rx_q->dev_private; >>> slave_count = internals->active_slave_count; >>> active_slave = internals->active_slave; >>> + /* >>> + * Reset the active slave index, in case active_slave goes out >>> + * of bound. It can hapen when slave links go down, and >>> + * another thread (LSC callback) shrinks the slave count. >>> + */ >>> + if (active_slave >= slave_count) { >>> + internals->active_slave = 0; >>> + active_slave = 0; >>> + } > > Instead of introducing new conditions again at the top of functions, it would be better to check greater than, equal to >= instead of the equal to in below condition. > if (++internals->active_slave == slave_count) > internals->active_slave = 0; > > Thereby we can reduce the multiple if conditions and still ensure internals->active_slave points to correct index always. > >>> >>> for (i = 0; i < slave_count && nb_pkts; i++) { >>> uint16_t num_rx_slave; >>> @@ -273,6 +282,11 @@ bond_ethdev_rx_burst_8023ad_fast_queue(void >> *queue, struct rte_mbuf **bufs, >>> active_slave = internals->active_slave; >>> memcpy(slaves, internals->active_slaves, >>> sizeof(internals->active_slaves[0]) * slave_count); >>> + /* active_slave may go out of bound. See bond_ethdev_rx_burst() */ >>> + if (active_slave >= slave_count) { >>> + internals->active_slave = 0; >>> + active_slave = 0; >>> + } > > Same as above comment would be better. >>> >>> for (i = 0; i < slave_count && nb_pkts; i++) { >>> uint16_t num_rx_slave; >>> > > It would be better to check the internals->active_slave during deactivate_slave() as well in rte_eth_bond_api.c. > Since slave counts would be decremented during de-activation and resetting here appropriately would be better. > > Regards > M.P.Jananee I don't see this comment on the patchwork, can you double check if your comment hit the mailing list?