[dpdk-dev] [PATCH] net/sfc: multicast list set must not fail if list is empty

[dpdk-dev] [PATCH] net/sfc: multicast list set must not fail if list is empty

[Andrew Rybchenko]

From: Ivan Malov <ivan.malov@oktetlabs.ru>

The patch is to fix sfc_set_mc_addr_list() behaviour in order
to make it accept an empty multicast address list thus making
it possible to remove multicast addresses inserted previously

Fixes: 0fa0070e4391 ("net/sfc: support multicast addresses list controls")

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
We have decided do not rely on rte_calloc() behaviour for 0 elements.
So, a bit longer patch to handle zero elements.

 drivers/net/sfc/sfc_ethdev.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 3ad9ada..71587fb 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -805,8 +805,7 @@
 		     uint32_t nb_mc_addr)
 {
 	struct sfc_adapter *sa = dev->data->dev_private;
-	uint8_t *mc_addrs_p;
-	uint8_t *mc_addrs;
+	uint8_t *mc_addrs_p = NULL;
 	int rc;
 	unsigned int i;
 
@@ -816,16 +815,20 @@
 		return -EINVAL;
 	}
 
-	mc_addrs_p = rte_calloc("mc-addrs", nb_mc_addr, EFX_MAC_ADDR_LEN, 0);
-	if (mc_addrs_p == NULL)
-		return -ENOMEM;
+	if (nb_mc_addr != 0) {
+		uint8_t *mc_addrs;
 
-	mc_addrs = mc_addrs_p;
+		mc_addrs_p = rte_calloc("mc-addrs", nb_mc_addr,
+					EFX_MAC_ADDR_LEN, 0);
+		if (mc_addrs_p == NULL)
+			return -ENOMEM;
 
-	for (i = 0; i < nb_mc_addr; ++i) {
-		(void)rte_memcpy(mc_addrs, mc_addr_set[i].addr_bytes,
-				 EFX_MAC_ADDR_LEN);
-		mc_addrs += EFX_MAC_ADDR_LEN;
+		mc_addrs = mc_addrs_p;
+		for (i = 0; i < nb_mc_addr; ++i) {
+			(void)rte_memcpy(mc_addrs, mc_addr_set[i].addr_bytes,
+					 EFX_MAC_ADDR_LEN);
+			mc_addrs += EFX_MAC_ADDR_LEN;
+		}
 	}
 
 	rc = efx_mac_multicast_list_set(sa->nic, mc_addrs_p, nb_mc_addr);
-- 
1.8.2.3

Re: [dpdk-dev] [PATCH] net/sfc: multicast list set must not fail if list is empty

[Ferruh Yigit]

On 2/1/2017 8:17 AM, Andrew Rybchenko wrote:
> From: Ivan Malov <ivan.malov@oktetlabs.ru>
> 
> The patch is to fix sfc_set_mc_addr_list() behaviour in order
> to make it accept an empty multicast address list thus making
> it possible to remove multicast addresses inserted previously
> 
> Fixes: 0fa0070e4391 ("net/sfc: support multicast addresses list controls")
> 
> Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

Applied to dpdk-next-net/master, thanks.