From patchwork Fri Jan 27 17:57:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Shin X-Patchwork-Id: 20063 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 75A092B83; Fri, 27 Jan 2017 18:57:36 +0100 (CET) Received: from rcdn-iport-7.cisco.com (rcdn-iport-7.cisco.com [173.37.86.78]) by dpdk.org (Postfix) with ESMTP id 7F27C12A8 for ; Fri, 27 Jan 2017 18:57:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=2572; q=dns/txt; s=iport; t=1485539854; x=1486749454; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=uHmRPvWHymBqZ3VMbihCxLQrT4WV/FzkmtjV9Lq6e14=; b=by2T/YivyATk36751FzKYKSYXtK/lQhhHetizLLmgl15PVHHMfgokwV3 ytri4H/strOk5uZ3Dpi0OYEZs220ltfnxbVpbJfPSPo7GMzwL4oEabPO9 EGF11UhcH+8vCK4mZD3SaFXMIQmM9HiLhx/EdU8KmzCndheJpSXmblIFd g=; X-IronPort-AV: E=Sophos;i="5.33,296,1477958400"; d="scan'208";a="199311214" Received: from rcdn-core-4.cisco.com ([173.37.93.155]) by rcdn-iport-7.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Jan 2017 17:57:33 +0000 Received: from sjc-ads-512.cisco.com (sjc-ads-512.cisco.com [10.28.13.212]) by rcdn-core-4.cisco.com (8.14.5/8.14.5) with ESMTP id v0RHvXJA031748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 27 Jan 2017 17:57:33 GMT Received: from sjc-ads-512.cisco.com (localhost.localdomain [127.0.0.1]) by sjc-ads-512.cisco.com (8.13.8/8.13.8) with ESMTP id v0RHvW3R017847; Fri, 27 Jan 2017 09:57:32 -0800 Received: (from jonshin@localhost) by sjc-ads-512.cisco.com (8.13.8/8.13.8/Submit) id v0RHvWsn017846; Fri, 27 Jan 2017 09:57:32 -0800 From: Steve Shin To: dev@dpdk.org Cc: ferruh.yigit@intel.com, iryzhov@nfware.com, Steve Shin Date: Fri, 27 Jan 2017 09:57:29 -0800 Message-Id: <20170127175729.17803-1-jonshin@cisco.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170124022145.7540-1-jonshin@cisco.com> References: <20170124022145.7540-1-jonshin@cisco.com> Subject: [dpdk-dev] [PATCH v5] ethdev: fix MAC address replay 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" This patch fixes a bug in replaying MAC address to the hardware in rte_eth_dev_config_restore() routine. Added default MAC replay as well. Fixes: 4bdefaade6d1 ("ethdev: VMDQ enhancements") Reviewed-by: Igor Ryzhov --- v2: Added default MAC replay & Code optimization. v3: Covered a case (ex, SR-IOV) where multiple pools exist in the mac_pool_sel array. v4: removed a coding style warning. v5: Added default MAC replay with dev_ops->mac_addr_add. Signed-off-by: Steve Shin --- lib/librte_ether/rte_ethdev.c | 48 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 4790faf..15746a7 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -931,34 +931,40 @@ rte_eth_dev_config_restore(uint8_t port_id) { struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; - struct ether_addr addr; + struct ether_addr *addr; uint16_t i; uint32_t pool = 0; + uint64_t pool_mask; dev = &rte_eth_devices[port_id]; rte_eth_dev_info_get(port_id, &dev_info); - if (RTE_ETH_DEV_SRIOV(dev).active) - pool = RTE_ETH_DEV_SRIOV(dev).def_vmdq_idx; - - /* replay MAC address configuration */ - for (i = 0; i < dev_info.max_mac_addrs; i++) { - addr = dev->data->mac_addrs[i]; - - /* skip zero address */ - if (is_zero_ether_addr(&addr)) - continue; - - /* add address to the hardware */ - if (*dev->dev_ops->mac_addr_add && - (dev->data->mac_pool_sel[i] & (1ULL << pool))) - (*dev->dev_ops->mac_addr_add)(dev, &addr, i, pool); - else { - RTE_PMD_DEBUG_TRACE("port %d: MAC address array not supported\n", - port_id); - /* exit the loop but not return an error */ - break; + /* replay MAC address configuration including default MAC */ + addr = &dev->data->mac_addrs[0]; + if (*dev->dev_ops->mac_addr_set != NULL) + (*dev->dev_ops->mac_addr_set)(dev, addr); + else if (*dev->dev_ops->mac_addr_add != NULL) + (*dev->dev_ops->mac_addr_add)(dev, addr, 0, pool); + + if (*dev->dev_ops->mac_addr_add != NULL) { + for (i = 1; i < dev_info.max_mac_addrs; i++) { + addr = &dev->data->mac_addrs[i]; + + /* skip zero address */ + if (is_zero_ether_addr(addr)) + continue; + + pool = 0; + pool_mask = dev->data->mac_pool_sel[i]; + + do { + if (pool_mask & 1ULL) + (*dev->dev_ops->mac_addr_add)(dev, + addr, i, pool); + pool_mask >>= 1; + pool++; + } while (pool_mask); } }