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

net/failsafe: check code of allmulticast mode switch

Browse Source 
rte_eth_allmulticast_enable()/rte_eth_allmulticast_disable() return
value was changed from void to int, so this patch modify usage
of these functions across net/failsafe according to new return type.

Try to keep all-multicast mode consistent across all active
devices in the case of failure.

Signed-off-by: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>
This commit is contained in:
Ivan Ilchenko 2019-09-24 13:56:08 +01:00 committed by Ferruh Yigit
parent 4b0db43df3
commit 5bc4baf0eb
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/failsafe/failsafe_ether.c
View File

@ -140,9 +140,13 @@ fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
if (dev->data->all_multicast != edev->data->all_multicast) {
DEBUG("Configuring all_multicast");
if (dev->data->all_multicast)
rte_eth_allmulticast_enable(PORT_ID(sdev));
ret = rte_eth_allmulticast_enable(PORT_ID(sdev));
else
rte_eth_allmulticast_disable(PORT_ID(sdev));
ret = rte_eth_allmulticast_disable(PORT_ID(sdev));
if (ret != 0) {
ERROR("Failed to apply allmulticast mode");
return ret;
}
} else {
DEBUG("all_multicast already set");
}

44
drivers/net/failsafe/failsafe_ops.c
View File

@ -723,10 +723,28 @@ fs_allmulticast_enable(struct rte_eth_dev *dev)
{
struct sub_device *sdev;
uint8_t i;
int ret = 0;
fs_lock(dev, 0);
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
rte_eth_allmulticast_enable(PORT_ID(sdev));
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
ret = rte_eth_allmulticast_enable(PORT_ID(sdev));
ret = fs_err(sdev, ret);
if (ret != 0) {
ERROR("All-multicast mode enable failed for subdevice %d",
PORT_ID(sdev));
break;
}
}
if (ret != 0) {
/* Rollback in the case of failure */
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
ret = rte_eth_allmulticast_disable(PORT_ID(sdev));
ret = fs_err(sdev, ret);
if (ret != 0)
ERROR("All-multicast mode disable during rollback failed for subdevice %d",
PORT_ID(sdev));
}
}
fs_unlock(dev, 0);
}
@ -735,10 +753,28 @@ fs_allmulticast_disable(struct rte_eth_dev *dev)
{
struct sub_device *sdev;
uint8_t i;
int ret = 0;
fs_lock(dev, 0);
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
rte_eth_allmulticast_disable(PORT_ID(sdev));
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
ret = rte_eth_allmulticast_disable(PORT_ID(sdev));
ret = fs_err(sdev, ret);
if (ret != 0) {
ERROR("All-multicast mode disable failed for subdevice %d",
PORT_ID(sdev));
break;
}
}
if (ret != 0) {
/* Rollback in the case of failure */
FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
ret = rte_eth_allmulticast_enable(PORT_ID(sdev));
ret = fs_err(sdev, ret);
if (ret != 0)
ERROR("All-multicast mode enable during rollback failed for subdevice %d",
PORT_ID(sdev));
}
}
fs_unlock(dev, 0);
}