On 08/31/2018 06:53 PM, Andrew Rybchenko wrote:
From: Evgeny Im <evgeny...@oktetlabs.com>
Signed-off-by: Evgeny Im <evgeny...@oktetlabs.com>
Signed-off-by: Andrew Rybchenko <arybche...@solarflare.com>
<...>
diff --git a/drivers/net/failsafe/failsafe_ops.c
b/drivers/net/failsafe/failsafe_ops.c
index 24e91c931..2583cff58 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -952,6 +952,53 @@ fs_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr
*mac_addr)
return 0;
}
+static int
+fs_set_mc_addr_list(struct rte_eth_dev *dev,
+ struct ether_addr *mc_addr_set, uint32_t nb_mc_addr)
+{
+ struct sub_device *sdev;
+ uint8_t i;
+ int ret;
+
+ fs_lock(dev, 0);
+ FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
+ ret = rte_eth_dev_set_mc_addr_list(PORT_ID(sdev),
+ mc_addr_set, nb_mc_addr);
+ if (ret != 0) {
+ ERROR("Operation rte_eth_dev_set_mc_addr_list failed for
sub_device %d with error %d",
+ i, ret);
+ goto rollback;
+ }
+ }
+ /* Do not reallocate/save if the method is called from sync */
+ if (mc_addr_set != PRIV(dev)->mcast_addrs) {
+ void *mcast_addrs = rte_realloc(PRIV(dev)->mcast_addrs,
+ nb_mc_addr * sizeof(PRIV(dev)->mcast_addrs[0]), 0);
+ if (mcast_addrs == NULL) {
+ ret = -ENOMEM;
Self-NACK since it fails for empty list set since rte_realloc() returns
NULL.
Will fix in v2.
+ goto rollback;
+ }
+ PRIV(dev)->mcast_addrs = mcast_addrs;
+ rte_memcpy(PRIV(dev)->mcast_addrs, mc_addr_set,
+ nb_mc_addr * sizeof(PRIV(dev)->mcast_addrs[0]));
+ }
+ PRIV(dev)->nb_mcast_addr = nb_mc_addr;
+ fs_unlock(dev, 0);
+ return 0;
+
+rollback:
+ FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
+ int rc = rte_eth_dev_set_mc_addr_list(PORT_ID(sdev),
+ PRIV(dev)->mcast_addrs, PRIV(dev)->nb_mcast_addr);
+ if (rc != 0) {
+ ERROR("Multicast MAC address list rollback for sub_device %d
failed with error %d",
+ i, rc);
+ }
+ }
+ fs_unlock(dev, 0);
+ return ret;
+}
+
static int
fs_rss_hash_update(struct rte_eth_dev *dev,
struct rte_eth_rss_conf *rss_conf)
<...>
