DPDK patches and discussions
 help / color / mirror / Atom feed
From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Cc: Ivan Malov <ivan.malov@oktetlabs.ru>
Subject: [dpdk-dev] [PATCH] net/sfc: multicast list set must not fail if list is empty
Date: Wed, 1 Feb 2017 08:17:11 +0000	[thread overview]
Message-ID: <1485937031-23172-1-git-send-email-arybchenko@solarflare.com> (raw)

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

             reply	other threads:[~2017-02-01  8:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-01  8:17 Andrew Rybchenko [this message]
2017-02-01 18:29 ` Ferruh Yigit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1485937031-23172-1-git-send-email-arybchenko@solarflare.com \
    --to=arybchenko@solarflare.com \
    --cc=dev@dpdk.org \
    --cc=ivan.malov@oktetlabs.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).