* [dpdk-dev] [PATCH 0/2] support MAC changes when no live changes allowed @ 2018-07-09 17:14 Alejandro Lucero 2018-07-09 17:14 ` [dpdk-dev] [PATCH 1/2] ethdev: fix MAC changes when live change not supported Alejandro Lucero ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Alejandro Lucero @ 2018-07-09 17:14 UTC (permalink / raw) To: dev; +Cc: stable This is a patched to fix a functionality coming with the first public release: changing/setting MAC address. The original patch assumes all NICs can safely change or set the MAC in any case. However, this is not always true. NFP depends on the firmware capabilities and this is not always supported. There are other NICs with this same limitation, although, as far as I know, not in DPDK. Linux kernel has a IFF_LIVE_ADDR_CHANGE flag and two NICs are checking this flag for allowing or not live MAC changes. The flag proposed in this patch is just the opposite: advertise if live change not supported and assuming it is supported other way. Although most NICs support rte_eth_dev_default_mac_addr_set and this function returns and error when live change is not supported, note that this function is invoked during port start but the value returned is not checked. It is likely this is good enough for most of the cases, but bonding is relying on this start then mac set/change, and a PMD ports is not properly configured for being used as an slave port in some bonding modes. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH 1/2] ethdev: fix MAC changes when live change not supported 2018-07-09 17:14 [dpdk-dev] [PATCH 0/2] support MAC changes when no live changes allowed Alejandro Lucero @ 2018-07-09 17:14 ` Alejandro Lucero 2018-07-09 17:14 ` [dpdk-dev] [PATCH 2/2] net/nfp: fix live MAC changes " Alejandro Lucero 2018-07-18 8:58 ` [dpdk-dev] [dpdk-stable] [PATCH 0/2] support MAC changes when no live changes allowed Ferruh Yigit 2 siblings, 0 replies; 6+ messages in thread From: Alejandro Lucero @ 2018-07-09 17:14 UTC (permalink / raw) To: dev; +Cc: stable Current code assumes a MAC change can occur when the port has been started. In fact, there are some NICs which require this port state for being successful, but other NICs not always support MAC change in that case. This patch supports a new device flag for a device advertising this limitation, and if the flag is set, the MAC is changed before the port starts. Fixes: af75078fece3 ("first public release") Cc: stable@dpdk.org Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com> --- lib/librte_ethdev/rte_ethdev.c | 28 +++++++++++++++++++--------- lib/librte_ethdev/rte_ethdev.h | 2 ++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index a9977df..8dbc031 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -1254,19 +1254,14 @@ struct rte_eth_dev * } static void -rte_eth_dev_config_restore(uint16_t port_id) +rte_eth_dev_mac_restore(struct rte_eth_dev *dev, + struct rte_eth_dev_info *dev_info) { - struct rte_eth_dev *dev; - struct rte_eth_dev_info dev_info; 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); - /* replay MAC address configuration including default MAC */ addr = &dev->data->mac_addrs[0]; if (*dev->dev_ops->mac_addr_set != NULL) @@ -1275,7 +1270,7 @@ struct rte_eth_dev * (*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++) { + for (i = 1; i < dev_info->max_mac_addrs; i++) { addr = &dev->data->mac_addrs[i]; /* skip zero address */ @@ -1294,6 +1289,14 @@ struct rte_eth_dev * } while (pool_mask); } } +} + +static void +rte_eth_dev_config_restore(struct rte_eth_dev *dev, + struct rte_eth_dev_info *dev_info, uint16_t port_id) +{ + if (!(*dev_info->dev_flags & RTE_ETH_DEV_NOLIVE_MAC_ADDR)) + rte_eth_dev_mac_restore(dev, dev_info); /* replay promiscuous configuration */ if (rte_eth_promiscuous_get(port_id) == 1) @@ -1312,6 +1315,7 @@ struct rte_eth_dev * rte_eth_dev_start(uint16_t port_id) { struct rte_eth_dev *dev; + struct rte_eth_dev_info dev_info; int diag; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); @@ -1327,13 +1331,19 @@ struct rte_eth_dev * return 0; } + rte_eth_dev_info_get(port_id, &dev_info); + + /* Lets restore MAC now if device does not support live change */ + if (*dev_info.dev_flags & RTE_ETH_DEV_NOLIVE_MAC_ADDR) + rte_eth_dev_mac_restore(dev, &dev_info); + diag = (*dev->dev_ops->dev_start)(dev); if (diag == 0) dev->data->dev_started = 1; else return eth_err(port_id, diag); - rte_eth_dev_config_restore(port_id); + rte_eth_dev_config_restore(dev, &dev_info, port_id); if (dev->data->dev_conf.intr_conf.lsc == 0) { RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->link_update, -ENOTSUP); diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 36e3984..85f6908 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -1309,6 +1309,8 @@ struct rte_eth_dev_owner { #define RTE_ETH_DEV_INTR_RMV 0x0008 /** Device is port representor */ #define RTE_ETH_DEV_REPRESENTOR 0x0010 +/** Device does not support MAC change after started */ +#define RTE_ETH_DEV_NOLIVE_MAC_ADDR 0x0020 /** * Iterates over valid ethdev ports owned by a specific owner. -- 1.9.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH 2/2] net/nfp: fix live MAC changes not supported 2018-07-09 17:14 [dpdk-dev] [PATCH 0/2] support MAC changes when no live changes allowed Alejandro Lucero 2018-07-09 17:14 ` [dpdk-dev] [PATCH 1/2] ethdev: fix MAC changes when live change not supported Alejandro Lucero @ 2018-07-09 17:14 ` Alejandro Lucero 2018-07-18 8:58 ` [dpdk-dev] [dpdk-stable] [PATCH 0/2] support MAC changes when no live changes allowed Ferruh Yigit 2 siblings, 0 replies; 6+ messages in thread From: Alejandro Lucero @ 2018-07-09 17:14 UTC (permalink / raw) To: dev; +Cc: stable Some NFP firmwares support live changes to the MAC address, but this is not always true and the firmware advertises it accordingly. This patch checks if firmware does not support live changes and sets RTE_ETH_DEV_NOLIVE_MAC_ADDR in that case. Fixes: af75078fece3 ("first public release") Cc: stable@dpdk.org Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com> --- drivers/net/nfp/nfp_net.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 3658696..fbe74fc 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2883,6 +2883,9 @@ uint32_t nfp_net_txq_full(struct nfp_net_txq *txq) ether_addr_copy((struct ether_addr *)hw->mac_addr, ð_dev->data->mac_addrs[0]); + if (!(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR)) + eth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR; + PMD_INIT_LOG(INFO, "port %d VendorID=0x%x DeviceID=0x%x " "mac=%02x:%02x:%02x:%02x:%02x:%02x", eth_dev->data->port_id, pci_dev->id.vendor_id, -- 1.9.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH 0/2] support MAC changes when no live changes allowed 2018-07-09 17:14 [dpdk-dev] [PATCH 0/2] support MAC changes when no live changes allowed Alejandro Lucero 2018-07-09 17:14 ` [dpdk-dev] [PATCH 1/2] ethdev: fix MAC changes when live change not supported Alejandro Lucero 2018-07-09 17:14 ` [dpdk-dev] [PATCH 2/2] net/nfp: fix live MAC changes " Alejandro Lucero @ 2018-07-18 8:58 ` Ferruh Yigit 2018-08-22 16:00 ` Ferruh Yigit 2 siblings, 1 reply; 6+ messages in thread From: Ferruh Yigit @ 2018-07-18 8:58 UTC (permalink / raw) To: Alejandro Lucero, dev; +Cc: stable On 7/9/2018 6:14 PM, Alejandro Lucero wrote: > This is a patched to fix a functionality coming with the first public > release: changing/setting MAC address. > > The original patch assumes all NICs can safely change or set the MAC > in any case. However, this is not always true. NFP depends on the firmware > capabilities and this is not always supported. There are other NICs with > this same limitation, although, as far as I know, not in DPDK. Linux kernel > has a IFF_LIVE_ADDR_CHANGE flag and two NICs are checking this flag for > allowing or not live MAC changes. > > The flag proposed in this patch is just the opposite: advertise if live > change not supported and assuming it is supported other way. > > Although most NICs support rte_eth_dev_default_mac_addr_set and this > function returns and error when live change is not supported, note that > this function is invoked during port start but the value returned is not > checked. It is likely this is good enough for most of the cases, but > bonding is relying on this start then mac set/change, and a PMD ports is > not properly configured for being used as an slave port in some bonding > modes. Hi Alejandro, Overall looks good to me, only it can be good to update "rte_eth_dev_start" API doc to mention about affect of new flag and perhaps update release notes "API Changes" section to document behavior change of the "rte_eth_dev_start" API based on flag. But, the ethdev library patch was late for this release, I suggest considering the patch for next release, meanwhile it can get more reviews. Thanks, ferruh ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH 0/2] support MAC changes when no live changes allowed 2018-07-18 8:58 ` [dpdk-dev] [dpdk-stable] [PATCH 0/2] support MAC changes when no live changes allowed Ferruh Yigit @ 2018-08-22 16:00 ` Ferruh Yigit 2018-08-23 9:22 ` Alejandro Lucero 0 siblings, 1 reply; 6+ messages in thread From: Ferruh Yigit @ 2018-08-22 16:00 UTC (permalink / raw) To: Alejandro Lucero, dev; +Cc: stable On 7/18/2018 9:58 AM, Ferruh Yigit wrote: > On 7/9/2018 6:14 PM, Alejandro Lucero wrote: >> This is a patched to fix a functionality coming with the first public >> release: changing/setting MAC address. >> >> The original patch assumes all NICs can safely change or set the MAC >> in any case. However, this is not always true. NFP depends on the firmware >> capabilities and this is not always supported. There are other NICs with >> this same limitation, although, as far as I know, not in DPDK. Linux kernel >> has a IFF_LIVE_ADDR_CHANGE flag and two NICs are checking this flag for >> allowing or not live MAC changes. >> >> The flag proposed in this patch is just the opposite: advertise if live >> change not supported and assuming it is supported other way. >> >> Although most NICs support rte_eth_dev_default_mac_addr_set and this >> function returns and error when live change is not supported, note that >> this function is invoked during port start but the value returned is not >> checked. It is likely this is good enough for most of the cases, but >> bonding is relying on this start then mac set/change, and a PMD ports is >> not properly configured for being used as an slave port in some bonding >> modes. > > Hi Alejandro, > > Overall looks good to me, only it can be good to update "rte_eth_dev_start" API > doc to mention about affect of new flag and perhaps update release notes "API > Changes" section to document behavior change of the "rte_eth_dev_start" API > based on flag. Would you mind sending a new version for this release, v18.11, with above documentation update? Thanks, ferruh > > But, the ethdev library patch was late for this release, I suggest considering > the patch for next release, meanwhile it can get more reviews. > > Thanks, > ferruh > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH 0/2] support MAC changes when no live changes allowed 2018-08-22 16:00 ` Ferruh Yigit @ 2018-08-23 9:22 ` Alejandro Lucero 0 siblings, 0 replies; 6+ messages in thread From: Alejandro Lucero @ 2018-08-23 9:22 UTC (permalink / raw) To: Ferruh Yigit; +Cc: dev, dpdk stable On Wed, Aug 22, 2018 at 6:00 PM, Ferruh Yigit <ferruh.yigit@intel.com> wrote: > On 7/18/2018 9:58 AM, Ferruh Yigit wrote: > > On 7/9/2018 6:14 PM, Alejandro Lucero wrote: > >> This is a patched to fix a functionality coming with the first public > >> release: changing/setting MAC address. > >> > >> The original patch assumes all NICs can safely change or set the MAC > >> in any case. However, this is not always true. NFP depends on the > firmware > >> capabilities and this is not always supported. There are other NICs with > >> this same limitation, although, as far as I know, not in DPDK. Linux > kernel > >> has a IFF_LIVE_ADDR_CHANGE flag and two NICs are checking this flag for > >> allowing or not live MAC changes. > >> > >> The flag proposed in this patch is just the opposite: advertise if live > >> change not supported and assuming it is supported other way. > >> > >> Although most NICs support rte_eth_dev_default_mac_addr_set and this > >> function returns and error when live change is not supported, note that > >> this function is invoked during port start but the value returned is not > >> checked. It is likely this is good enough for most of the cases, but > >> bonding is relying on this start then mac set/change, and a PMD ports is > >> not properly configured for being used as an slave port in some bonding > >> modes. > > > > Hi Alejandro, > > > > Overall looks good to me, only it can be good to update > "rte_eth_dev_start" API > > doc to mention about affect of new flag and perhaps update release notes > "API > > Changes" section to document behavior change of the "rte_eth_dev_start" > API > > based on flag. > > Would you mind sending a new version for this release, v18.11, with above > documentation update? > > Sure. I have been on a large PTO break but I planned to send this asap. Thanks > Thanks, > ferruh > > > > > But, the ethdev library patch was late for this release, I suggest > considering > > the patch for next release, meanwhile it can get more reviews. > > > > Thanks, > > ferruh > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-08-23 9:22 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-07-09 17:14 [dpdk-dev] [PATCH 0/2] support MAC changes when no live changes allowed Alejandro Lucero 2018-07-09 17:14 ` [dpdk-dev] [PATCH 1/2] ethdev: fix MAC changes when live change not supported Alejandro Lucero 2018-07-09 17:14 ` [dpdk-dev] [PATCH 2/2] net/nfp: fix live MAC changes " Alejandro Lucero 2018-07-18 8:58 ` [dpdk-dev] [dpdk-stable] [PATCH 0/2] support MAC changes when no live changes allowed Ferruh Yigit 2018-08-22 16:00 ` Ferruh Yigit 2018-08-23 9:22 ` Alejandro Lucero
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).