From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 26E2CA0556; Mon, 17 Oct 2022 10:40:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1926741141; Mon, 17 Oct 2022 10:40:52 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id A2B62400D7; Mon, 17 Oct 2022 10:40:50 +0200 (CEST) Received: from [192.168.38.17] (aros.oktetlabs.ru [192.168.38.17]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id 2AA3983; Mon, 17 Oct 2022 11:40:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 2AA3983 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1665996050; bh=Ytv6uqHbxnnQA9iTWtitG9VsfQuu8MnsjVCZP1KJM/I=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=S4tiBIgL4JexJWtc6XB0/yD/YJVFx6YK6AVoM0sSwVryZVrng3qOWnqiBBQOJtRbw oXhSg4shpcCuYlrotRjkZsDp2i93Qp9qdD+mrg669LYhSOM0DmeByzK0MtYHVB42Hg o390gLYIAvM76QDc8jvlt1TUQgB6bO8WdOskrO10= Message-ID: <8c5c2c63-20de-c1a5-ff06-142bfbc49c47@oktetlabs.ru> Date: Mon, 17 Oct 2022 11:40:49 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Subject: Re: [PATCH] net/bonding: fix descriptor limit reporting Content-Language: en-US To: Chas Williams , "Min Hu (Connor)" Cc: stable@dpdk.org, Hari Kumar Vemula , Ivan Malov , dev@dpdk.org References: <20220911121901.3989343-1-ivan.malov@oktetlabs.ru> From: Andrew Rybchenko Organization: OKTET Labs In-Reply-To: <20220911121901.3989343-1-ivan.malov@oktetlabs.ru> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Chas, Cornor, could you review the patch, please. Thanks, Andrew. On 9/11/22 15:19, Ivan Malov wrote: > Commit 5be3b40fea60 ("net/bonding: fix values of descriptor limits") > breaks reporting of "nb_min" and "nb_align" values obtained from > back-end devices' descriptor limits. This means that work done > by eth_bond_slave_inherit_desc_lim_first() as well as > eth_bond_slave_inherit_desc_lim_next() gets dismissed. > > Revert the offending commit and use proper workaround > for the test case mentioned in the said commit. > > Meanwhile, the test case itself might be poorly constructed. > It tries to run a bond with no back-end devices attached, > but, according to [1] ("Requirements / Limitations"), > at least one back-end device must be attached. > > [1] doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst > > Fixes: 5be3b40fea60 ("net/bonding: fix values of descriptor limits") > Cc: stable@dpdk.org > > Signed-off-by: Ivan Malov > Reviewed-by: Andrew Rybchenko > --- > drivers/net/bonding/rte_eth_bond_pmd.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c > index 3191158ca7..a5429f5e97 100644 > --- a/drivers/net/bonding/rte_eth_bond_pmd.c > +++ b/drivers/net/bonding/rte_eth_bond_pmd.c > @@ -2200,8 +2200,6 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) > > uint16_t max_nb_rx_queues = UINT16_MAX; > uint16_t max_nb_tx_queues = UINT16_MAX; > - uint16_t max_rx_desc_lim = UINT16_MAX; > - uint16_t max_tx_desc_lim = UINT16_MAX; > > dev_info->max_mac_addrs = BOND_MAX_MAC_ADDRS; > > @@ -2235,12 +2233,6 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) > > if (slave_info.max_tx_queues < max_nb_tx_queues) > max_nb_tx_queues = slave_info.max_tx_queues; > - > - if (slave_info.rx_desc_lim.nb_max < max_rx_desc_lim) > - max_rx_desc_lim = slave_info.rx_desc_lim.nb_max; > - > - if (slave_info.tx_desc_lim.nb_max < max_tx_desc_lim) > - max_tx_desc_lim = slave_info.tx_desc_lim.nb_max; > } > } > > @@ -2252,8 +2244,10 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) > memcpy(&dev_info->default_txconf, &internals->default_txconf, > sizeof(dev_info->default_txconf)); > > - dev_info->rx_desc_lim.nb_max = max_rx_desc_lim; > - dev_info->tx_desc_lim.nb_max = max_tx_desc_lim; > + memcpy(&dev_info->rx_desc_lim, &internals->rx_desc_lim, > + sizeof(dev_info->rx_desc_lim)); > + memcpy(&dev_info->tx_desc_lim, &internals->tx_desc_lim, > + sizeof(dev_info->tx_desc_lim)); > > /** > * If dedicated hw queues enabled for link bonding device in LACP mode > @@ -3387,6 +3381,13 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode) > memset(&internals->rx_desc_lim, 0, sizeof(internals->rx_desc_lim)); > memset(&internals->tx_desc_lim, 0, sizeof(internals->tx_desc_lim)); > > + /* > + * Do not restrict descriptor counts until > + * the first back-end device gets attached. > + */ > + internals->rx_desc_lim.nb_max = UINT16_MAX; > + internals->tx_desc_lim.nb_max = UINT16_MAX; > + > memset(internals->active_slaves, 0, sizeof(internals->active_slaves)); > memset(internals->slaves, 0, sizeof(internals->slaves)); >