From: Steve Shin <jonshin@cisco.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, iryzhov@nfware.com,
Steve Shin <jonshin@cisco.com>
Subject: [dpdk-dev] [PATCH v3] ethdev: fix MAC address replay
Date: Mon, 23 Jan 2017 15:50:20 -0800 [thread overview]
Message-ID: <20170123235020.19641-1-jonshin@cisco.com> (raw)
In-Reply-To: <20170120222349.14567-1-jonshin@cisco.com>
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")
---
v2: Added default MAC replay & Code optimization
V3: Covered a case (ex, SR-IOV) where multiple pools
exist in the mac_pool_sel array.
Signed-off-by: Steve Shin <jonshin@cisco.com>
---
lib/librte_ether/rte_ethdev.c | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 4790faf..fbc0765 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -931,34 +931,38 @@ 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;
+ uint32_t pool;
+ 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 including default MAC */
+ if (*dev->dev_ops->mac_addr_set != NULL) {
+ addr = &dev->data->mac_addrs[0];
+ (*dev->dev_ops->mac_addr_set)(dev, addr);
+ }
- /* replay MAC address configuration */
- for (i = 0; i < dev_info.max_mac_addrs; i++) {
- addr = dev->data->mac_addrs[i];
+ 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;
+ /* 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;
+ 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);
}
}
--
2.9.3
next prev parent reply other threads:[~2017-01-23 23:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-19 18:47 [dpdk-dev] [PATCH] lib/librte_ether: error handling on " Steve Shin
2017-01-19 19:35 ` Steve Shin (jonshin)
2017-01-19 22:39 ` Igor Ryzhov
2017-01-20 2:30 ` Steve Shin (jonshin)
2017-01-20 12:17 ` Igor Ryzhov
2017-01-20 19:12 ` Steve Shin (jonshin)
2017-01-20 22:23 ` [dpdk-dev] [PATCH v2] ethdev: fix " Steve Shin
2017-01-23 8:50 ` Igor Ryzhov
2017-01-23 23:19 ` Steve Shin (jonshin)
2017-01-23 23:50 ` Steve Shin [this message]
2017-01-24 2:21 ` [dpdk-dev] [PATCH v4] " Steve Shin
2017-01-24 10:09 ` Igor Ryzhov
2017-01-24 13:21 ` Ferruh Yigit
2017-01-24 14:00 ` Igor Ryzhov
2017-01-25 10:25 ` Thomas Monjalon
2017-01-27 17:57 ` [dpdk-dev] [PATCH v5] " Steve Shin
2017-01-30 9:21 ` Thomas Monjalon
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=20170123235020.19641-1-jonshin@cisco.com \
--to=jonshin@cisco.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=iryzhov@nfware.com \
/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).