net/failsafe: support multicast address list set

Signed-off-by: Evgeny Im <evgeny.im@oktetlabs.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>

diff --git a/doc/guides/nics/features/failsafe.ini b/doc/guides/nics/features/failsafe.ini
index 89e253d..e3c4c08 100644 (file)
--- a/doc/guides/nics/features/failsafe.ini
+++ b/doc/guides/nics/features/failsafe.ini
@@ -15,6 +15,7 @@ Jumbo frame          = Y
 Promiscuous mode     = Y
 Allmulticast mode    = Y
 Unicast MAC filter   = Y
 Promiscuous mode     = Y
 Allmulticast mode    = Y
 Unicast MAC filter   = Y

+Multicast MAC filter = Y

 VLAN filter          = Y
 Flow control         = Y
 Flow API             = Y
 VLAN filter          = Y
 Flow control         = Y
 Flow API             = Y

diff --git a/doc/guides/rel_notes/release_18_11.rst b/doc/guides/rel_notes/release_18_11.rst
index 1581c2b..a4f1d5d 100644 (file)
--- a/doc/guides/rel_notes/release_18_11.rst
+++ b/doc/guides/rel_notes/release_18_11.rst
@@ -79,6 +79,7 @@ New Features
   * Support for Rx and Tx queues start and stop.
   * Support for Rx and Tx queues deferred start.
   * Support for runtime Rx and Tx queues setup.
   * Support for Rx and Tx queues start and stop.
   * Support for Rx and Tx queues deferred start.
   * Support for runtime Rx and Tx queues setup.

+  * Support multicast MAC address set.

 
 * **Added ability to switch queue deferred start flag on testpmd app.**
 
 
 * **Added ability to switch queue deferred start flag on testpmd app.**
 

diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 657919f..c3999f0 100644 (file)
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -304,6 +304,7 @@ fs_rte_eth_free(const char *name)
        ret = pthread_mutex_destroy(&PRIV(dev)->hotplug_mutex);
        if (ret)
                ERROR("Error while destroying hotplug mutex");
        ret = pthread_mutex_destroy(&PRIV(dev)->hotplug_mutex);
        if (ret)
                ERROR("Error while destroying hotplug mutex");

+       rte_free(PRIV(dev)->mcast_addrs);

        rte_free(PRIV(dev));
        rte_eth_dev_release_port(dev);
        return ret;
        rte_free(PRIV(dev));
        rte_eth_dev_release_port(dev);
        return ret;

diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index 191f95f..51c96f7 100644 (file)
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -179,6 +179,23 @@ fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
                        return ret;
                }
        }
                        return ret;
                }
        }

+       /*
+        * Propagate multicast MAC addresses to sub-devices,
+        * if non zero number of addresses is set.
+        * The condition is required to avoid breakage of failsafe
+        * for sub-devices which do not support the operation
+        * if the feature is really not used.
+        */
+       if (PRIV(dev)->nb_mcast_addr > 0) {
+               DEBUG("Configuring multicast MAC addresses");
+               ret = rte_eth_dev_set_mc_addr_list(PORT_ID(sdev),
+                                                  PRIV(dev)->mcast_addrs,
+                                                  PRIV(dev)->nb_mcast_addr);
+               if (ret) {
+                       ERROR("Failed to apply multicast MAC addresses");
+                       return ret;
+               }
+       }

        /* VLAN filter */
        vfc1 = &dev->data->vlan_filter_conf;
        vfc2 = &edev->data->vlan_filter_conf;
        /* VLAN filter */
        vfc1 = &dev->data->vlan_filter_conf;
        vfc2 = &edev->data->vlan_filter_conf;

diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index 7fadf06..86d7fa2 100644 (file)
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -1126,6 +1126,55 @@ fs_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
        return 0;
 }
 
        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;
+       void *mcast_addrs;
+
+       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;
+               }
+       }
+
+       mcast_addrs = rte_realloc(PRIV(dev)->mcast_addrs,
+               nb_mc_addr * sizeof(PRIV(dev)->mcast_addrs[0]), 0);
+       if (mcast_addrs == NULL && nb_mc_addr > 0) {
+               ret = -ENOMEM;
+               goto rollback;
+       }
+       rte_memcpy(mcast_addrs, mc_addr_set,
+                  nb_mc_addr * sizeof(PRIV(dev)->mcast_addrs[0]));
+       PRIV(dev)->nb_mcast_addr = nb_mc_addr;
+       PRIV(dev)->mcast_addrs = mcast_addrs;
+
+       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)
 static int
 fs_rss_hash_update(struct rte_eth_dev *dev,
                        struct rte_eth_rss_conf *rss_conf)


@@ -1214,6 +1263,7 @@ const struct eth_dev_ops failsafe_ops = {
        .mac_addr_remove = fs_mac_addr_remove,
        .mac_addr_add = fs_mac_addr_add,
        .mac_addr_set = fs_mac_addr_set,
        .mac_addr_remove = fs_mac_addr_remove,
        .mac_addr_add = fs_mac_addr_add,
        .mac_addr_set = fs_mac_addr_set,

+       .set_mc_addr_list = fs_set_mc_addr_list,

        .rss_hash_update = fs_rss_hash_update,
        .filter_ctrl = fs_filter_ctrl,
 };
        .rss_hash_update = fs_rss_hash_update,
        .filter_ctrl = fs_filter_ctrl,
 };

diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index 886af86..abbe73e 100644 (file)
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -143,6 +143,8 @@ struct fs_priv {
        uint32_t nb_mac_addr;
        struct ether_addr mac_addrs[FAILSAFE_MAX_ETHADDR];
        uint32_t mac_addr_pool[FAILSAFE_MAX_ETHADDR];
        uint32_t nb_mac_addr;
        struct ether_addr mac_addrs[FAILSAFE_MAX_ETHADDR];
        uint32_t mac_addr_pool[FAILSAFE_MAX_ETHADDR];

+       uint32_t nb_mcast_addr;
+       struct ether_addr *mcast_addrs;

        /* current capabilities */
        struct rte_eth_dev_info infos;
        struct rte_eth_dev_owner my_owner; /* Unique owner. */
        /* current capabilities */
        struct rte_eth_dev_info infos;
        struct rte_eth_dev_owner my_owner; /* Unique owner. */