diff mbox series

[2/2] net/failsafe: support multicast address list set

Message ID 1535730814-24624-3-git-send-email-arybchenko@solarflare.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers
Series net/failsafe: support multicast MAC address set |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Andrew Rybchenko Aug. 31, 2018, 3:53 p.m. UTC 
  From: Evgeny Im <Evgeny.Im@oktetlabs.com>

Signed-off-by: Evgeny Im <Evgeny.Im@oktetlabs.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 doc/guides/nics/features/failsafe.ini   |  1 +
 doc/guides/rel_notes/release_18_11.rst  |  6 ++++
 drivers/net/failsafe/failsafe.c         |  1 +
 drivers/net/failsafe/failsafe_ether.c   | 17 +++++++++
 drivers/net/failsafe/failsafe_ops.c     | 48 +++++++++++++++++++++++++
 drivers/net/failsafe/failsafe_private.h |  2 ++
 6 files changed, 75 insertions(+)

Comments

Andrew Rybchenko Sept. 3, 2018, 6:47 a.m. UTC | #1 
On 08/31/2018 06:53 PM, Andrew Rybchenko wrote:
> From: Evgeny Im <Evgeny.Im@oktetlabs.com>
>
> Signed-off-by: Evgeny Im <Evgeny.Im@oktetlabs.com>
> Signed-off-by: Andrew Rybchenko <arybchenko@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)

<...>
diff mbox series

Patch

diff --git a/doc/guides/nics/features/failsafe.ini b/doc/guides/nics/features/failsafe.ini
index 83cc99d19..39ee57965 100644
--- a/doc/guides/nics/features/failsafe.ini
+++ b/doc/guides/nics/features/failsafe.ini
@@ -12,6 +12,7 @@  Jumbo frame          = Y
 Promiscuous mode     = Y
 Allmulticast mode    = Y
 Unicast MAC filter   = Y
+Multicast MAC filter = 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 24204e67b..54e0e4ee4 100644
--- a/doc/guides/rel_notes/release_18_11.rst
+++ b/doc/guides/rel_notes/release_18_11.rst
@@ -54,6 +54,12 @@  New Features
      Also, make sure to start the actual text at the margin.
      =========================================================
 
+* **Updated failsafe driver.**
+
+  Updated the failsafe driver including the following changes:
+
+  * Support multicast MAC address set.
+
 
 API Changes
 -----------
diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 657919f93..c3999f026 100644
--- 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");
+	rte_free(PRIV(dev)->mcast_addrs);
 	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 5b5cb3b49..5078feabe 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -424,6 +424,23 @@  failsafe_eth_dev_state_sync(struct rte_eth_dev *dev)
 	ret = dev->dev_ops->dev_start(dev);
 	if (ret)
 		goto err_remove;
+	/*
+	 * 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 not used.
+	 */
+	if (PRIV(dev)->nb_mcast_addr > 0) {
+		ret = dev->dev_ops->set_mc_addr_list(dev,
+						     PRIV(dev)->mcast_addrs,
+						     PRIV(dev)->nb_mcast_addr);
+		if (ret) {
+			ERROR("Could not set list of multicast addresses to sub_device %d",
+			      i);
+			goto err_remove;
+		}
+	}
 	return 0;
 err_remove:
 	FOREACH_SUBDEV(sdev, i, dev)
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;
+			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)
@@ -1036,6 +1083,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,
+	.set_mc_addr_list = fs_set_mc_addr_list,
 	.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 886af8616..abbe73e87 100644
--- 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_mcast_addr;
+	struct ether_addr *mcast_addrs;
 	/* current capabilities */
 	struct rte_eth_dev_info infos;
 	struct rte_eth_dev_owner my_owner; /* Unique owner. */