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 3AAA8A04A2; Fri, 4 Mar 2022 02:27:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 28C5D42797; Fri, 4 Mar 2022 02:27:04 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 7A54742797 for ; Fri, 4 Mar 2022 02:27:02 +0100 (CET) Received: from dggeme756-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4K8qpL4q5HzZfbQ; Fri, 4 Mar 2022 09:22:18 +0800 (CST) Received: from [10.67.103.128] (10.67.103.128) by dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.21; Fri, 4 Mar 2022 09:27:00 +0800 Subject: Re: [PATCH] net/bonding: fix slaves initializing on mtu setting To: CC: Wan Junjie , Chas Williams , Ferruh Yigit , Andrew Rybchenko , Ivan Ilchenko References: <20220228032617.46618-1-humin29@huawei.com> <20220304012257.39247-1-humin29@huawei.com> <20220304012257.39247-5-humin29@huawei.com> From: "Min Hu (Connor)" Message-ID: Date: Fri, 4 Mar 2022 09:27:00 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 In-Reply-To: <20220304012257.39247-5-humin29@huawei.com> Content-Type: text/plain; charset="gbk"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.103.128] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggeme756-chm.china.huawei.com (10.3.19.102) X-CFilter-Loop: Reflected 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 Sorry, this patch should be skipped. ÔÚ 2022/3/4 9:22, Min Hu (Connor) дµÀ: > From: Wan Junjie > > If a initial process for the bonding device is like: > rte_eth_dev_configure > rte_eth_dev_set_mtu > queue setup and start, etc. > > Pass the vdev args to application, and init bonding device only. > -a 0000:af:00.0 --vdev="net_bonding0,mode=2,slave=0000:af:00.0" > > It will fail and compain for the slave device > "Port 0 must be configured before MTU set" > > Test can be reproduced with ovs. > > Fixes: b26bee1 ("ethdev: forbid MTU set before device configure") > > Signed-off-by: Wan Junjie > --- > app/test/test_link_bonding.c | 4 +++ > app/test/test_link_bonding_rssconf.c | 4 +++ > drivers/net/bonding/eth_bond_private.h | 4 +++ > drivers/net/bonding/rte_eth_bond_api.c | 6 ++++ > drivers/net/bonding/rte_eth_bond_pmd.c | 43 ++++++++++++++++++++++---- > 5 files changed, 55 insertions(+), 6 deletions(-) > > diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c > index dc6fc46b9c..12c50ef393 100644 > --- a/app/test/test_link_bonding.c > +++ b/app/test/test_link_bonding.c > @@ -181,6 +181,10 @@ configure_ethdev(uint16_t port_id, uint8_t start, uint8_t en_isr) > test_params->nb_tx_q, &default_pmd_conf), > "rte_eth_dev_configure for port %d failed", port_id); > > + int ret = rte_eth_dev_set_mtu(port_id, 1550); > + RTE_TEST_ASSERT(ret == 0 || ret == -ENOTSUP, > + "rte_eth_dev_set_mtu for port %d failed", port_id); > + > for (q_id = 0; q_id < test_params->nb_rx_q; q_id++) > TEST_ASSERT_SUCCESS(rte_eth_rx_queue_setup(port_id, q_id, RX_RING_SIZE, > rte_eth_dev_socket_id(port_id), &rx_conf_default, > diff --git a/app/test/test_link_bonding_rssconf.c b/app/test/test_link_bonding_rssconf.c > index f9eae93973..7228965ced 100644 > --- a/app/test/test_link_bonding_rssconf.c > +++ b/app/test/test_link_bonding_rssconf.c > @@ -128,6 +128,10 @@ configure_ethdev(uint16_t port_id, struct rte_eth_conf *eth_conf, > RXTX_QUEUE_COUNT, eth_conf) == 0, "Failed to configure device %u", > port_id); > > + int ret = rte_eth_dev_set_mtu(port_id, 1550); > + RTE_TEST_ASSERT(ret == 0 || ret == -ENOTSUP, > + "rte_eth_dev_set_mtu for port %d failed", port_id); > + > for (rxq = 0; rxq < RXTX_QUEUE_COUNT; rxq++) { > TEST_ASSERT(rte_eth_rx_queue_setup(port_id, rxq, RXTX_RING_SIZE, > rte_eth_dev_socket_id(port_id), NULL, > diff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h > index 156335c425..8222e3cd38 100644 > --- a/drivers/net/bonding/eth_bond_private.h > +++ b/drivers/net/bonding/eth_bond_private.h > @@ -246,6 +246,10 @@ int > slave_configure(struct rte_eth_dev *bonded_eth_dev, > struct rte_eth_dev *slave_eth_dev); > > +int > +slave_start(struct rte_eth_dev *bonded_eth_dev, > + struct rte_eth_dev *slave_eth_dev); > + > void > slave_remove(struct bond_dev_private *internals, > struct rte_eth_dev *slave_eth_dev); > diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c > index b78867b125..4ac191c468 100644 > --- a/drivers/net/bonding/rte_eth_bond_api.c > +++ b/drivers/net/bonding/rte_eth_bond_api.c > @@ -566,6 +566,12 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) > slave_port_id); > return -1; > } > + if (slave_start(bonded_eth_dev, slave_eth_dev) != 0) { > + internals->slave_count--; > + RTE_BOND_LOG(ERR, "rte_bond_slaves_start: port=%d", > + slave_port_id); > + return -1; > + } > } > > /* Update all slave devices MACs */ > diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c > index bfa931098e..58dad0a0e3 100644 > --- a/drivers/net/bonding/rte_eth_bond_pmd.c > +++ b/drivers/net/bonding/rte_eth_bond_pmd.c > @@ -1678,14 +1678,10 @@ int > slave_configure(struct rte_eth_dev *bonded_eth_dev, > struct rte_eth_dev *slave_eth_dev) > { > - struct bond_rx_queue *bd_rx_q; > - struct bond_tx_queue *bd_tx_q; > uint16_t nb_rx_queues; > uint16_t nb_tx_queues; > > int errval; > - uint16_t q_id; > - struct rte_flow_error flow_error; > > struct bond_dev_private *internals = bonded_eth_dev->data->dev_private; > > @@ -1758,6 +1754,19 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, > slave_eth_dev->data->port_id, errval); > return errval; > } > + return 0; > +} > + > +int > +slave_start(struct rte_eth_dev *bonded_eth_dev, > + struct rte_eth_dev *slave_eth_dev) > +{ > + int errval = 0; > + struct bond_rx_queue *bd_rx_q; > + struct bond_tx_queue *bd_tx_q; > + uint16_t q_id; > + struct rte_flow_error flow_error; > + struct bond_dev_private *internals = bonded_eth_dev->data->dev_private; > > /* Setup Rx Queues */ > for (q_id = 0; q_id < bonded_eth_dev->data->nb_rx_queues; q_id++) { > @@ -1806,10 +1815,13 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, > return errval; > } > > - if (internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id] != NULL) > - rte_flow_destroy(slave_eth_dev->data->port_id, > + if (internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id] != NULL) { > + errval = rte_flow_destroy(slave_eth_dev->data->port_id, > internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id], > &flow_error); > + RTE_BOND_LOG(ERR, "bond_ethdev_8023ad_flow_destroy: port=%d, err (%d)", > + slave_eth_dev->data->port_id, errval); > + } > > errval = bond_ethdev_8023ad_flow_set(bonded_eth_dev, > slave_eth_dev->data->port_id); > @@ -2001,6 +2013,13 @@ bond_ethdev_start(struct rte_eth_dev *eth_dev) > internals->slaves[i].port_id); > goto out_err; > } > + if (slave_start(eth_dev, slave_ethdev) != 0) { > + RTE_BOND_LOG(ERR, > + "bonded port (%d) failed to start slave device (%d)", > + eth_dev->data->port_id, > + internals->slaves[i].port_id); > + goto out_err; > + } > /* We will need to poll for link status if any slave doesn't > * support interrupts > */ > @@ -3847,6 +3866,18 @@ bond_ethdev_configure(struct rte_eth_dev *dev) > return -1; > } > > + /* configure slaves so we can pass mtu setting */ > + for (i = 0; i < internals->slave_count; i++) { > + struct rte_eth_dev *slave_ethdev = > + &(rte_eth_devices[internals->slaves[i].port_id]); > + if (slave_configure(dev, slave_ethdev) != 0) { > + RTE_BOND_LOG(ERR, > + "bonded port (%d) failed to configure slave device (%d)", > + dev->data->port_id, > + internals->slaves[i].port_id); > + return -1; > + } > + } > return 0; > } > >