d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/bonding: fix slaves initializing on MTU setting

Browse Source 
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 complain for the slave device
"Port 0 must be configured before MTU set"

Test can be reproduced with ovs.

Fixes: b26bee10ee37 ("ethdev: forbid MTU set before device configure")
Cc: stable@dpdk.org

Signed-off-by: Junjie Wan <wanjunjie@bytedance.com>
Tested-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Min Hu (Connor) <humin29@huawei.com>
This commit is contained in:
Junjie Wan 2022-02-15 18:59:40 +08:00 committed by Ferruh Yigit
parent 6f65049e89
commit b3eaaf1d08
5 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/test/test_link_bonding.c
View File

@ -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,

4
app/test/test_link_bonding_rssconf.c
View File

@ -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,

4
drivers/net/bonding/eth_bond_private.h
View File

@ -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);

6
drivers/net/bonding/rte_eth_bond_api.c
View File

@ -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 */

43
drivers/net/bonding/rte_eth_bond_pmd.c
View File

@ -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
*/
@ -3848,6 +3867,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;
}