From patchwork Wed Feb 1 08:17:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 20117 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 950685688; Wed, 1 Feb 2017 09:17:33 +0100 (CET) Received: from nbfkord-smmo03.seg.att.com (nbfkord-smmo03.seg.att.com [209.65.160.84]) by dpdk.org (Postfix) with ESMTP id 1CFDBDE5 for ; Wed, 1 Feb 2017 09:17:32 +0100 (CET) Received: from unknown [12.187.104.26] (EHLO webmail.solarflare.com) by nbfkord-smmo03.seg.att.com(mxl_mta-7.2.4-7) with ESMTP id c9991985.2b630981b940.3703770.00-2479.7687898.nbfkord-smmo03.seg.att.com (envelope-from ); Wed, 01 Feb 2017 08:17:32 +0000 (UTC) X-MXL-Hash: 5891999c7a25f301-c97c978d7724caee030c84bc0f2f6b857a6fc4a9 Received: from unknown [12.187.104.26] (EHLO webmail.solarflare.com) by nbfkord-smmo03.seg.att.com(mxl_mta-7.2.4-7) over TLS secured channel with ESMTP id 89991985.0.3703767.00-2374.7687891.nbfkord-smmo03.seg.att.com (envelope-from ); Wed, 01 Feb 2017 08:17:30 +0000 (UTC) X-MXL-Hash: 5891999a2e70a547-c5da5819c4050877788cb157ca07f045f4e17427 Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Wed, 1 Feb 2017 00:17:26 -0800 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25 via Frontend Transport; Wed, 1 Feb 2017 00:17:25 -0800 Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com [10.17.10.10]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v118HO4F023686; Wed, 1 Feb 2017 08:17:24 GMT Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1]) by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v118HOKo023230; Wed, 1 Feb 2017 08:17:24 GMT From: Andrew Rybchenko To: CC: Ivan Malov Date: Wed, 1 Feb 2017 08:17:11 +0000 Message-ID: <1485937031-23172-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=HuVwbhnS c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==] X-AnalysisOut: [:17 a=n2v9WMKugxEA:10 a=pK7X0mNQAAAA:8 a=zRKbQ67AAAAA:8 a=] X-AnalysisOut: [P-ZdS70bGoJ07pC65YkA:9 a=5HA-qpC1VU4iIGLgRoNS:22 a=PA03WX8] X-AnalysisOut: [tBzeizutn5_OT:22] X-Spam: [F=0.4834137961; CM=0.500; S=0.483(2015072901)] X-MAIL-FROM: X-SOURCE-IP: [12.187.104.26] Subject: [dpdk-dev] [PATCH] net/sfc: multicast list set must not fail if list is empty X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Ivan Malov 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 Signed-off-by: Andrew Rybchenko --- 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);