The mac_addr_add API describes that only the 0 pool should be passed unless VMDq has been enabled, though there was no validation so far. Add such a check, then cleanup the MAC related operations (adding, removing, restoring).
As a side effect, the net/cnxk does not need to manually reset the mac_pool_sel[] array. Signed-off-by: David Marchand <[email protected]> --- Changes since v2: - added an entry in release notes, - fixed duplicate mac address handling for !vmdq, - rewrote update of eth_dev_mac_restore to isolate the !vmdq case, --- doc/guides/rel_notes/release_26_07.rst | 2 + drivers/net/cnxk/cnxk_ethdev_ops.c | 1 - lib/ethdev/rte_ethdev.c | 52 ++++++++++++++++++-------- 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/doc/guides/rel_notes/release_26_07.rst b/doc/guides/rel_notes/release_26_07.rst index b59793f177..3d2e71102b 100644 --- a/doc/guides/rel_notes/release_26_07.rst +++ b/doc/guides/rel_notes/release_26_07.rst @@ -97,6 +97,8 @@ API Changes * At port configuration time, the number of VMDq pools advertised by a driver is now used to validate VMDq related Rx and Tx modes (``RTE_ETH_MQ_RX_VMDQ_FLAG``, ``RTE_ETH_MQ_TX_VMDQ_DCB``, ``RTE_ETH_MQ_TX_VMDQ_ONLY``). + * A check was added in ``rte_eth_dev_mac_addr_add`` to validate that the ``pool`` parameter is 0 + when VMDq is not configured. ABI Changes diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index 49e77e49a6..75decf7098 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -1240,7 +1240,6 @@ cnxk_nix_mc_addr_list_configure(struct rte_eth_dev *eth_dev, struct rte_ether_ad /* Update address in NIC data structure */ rte_ether_addr_copy(&mc_addr_set[i], &data->mac_addrs[j]); rte_ether_addr_copy(&mc_addr_set[i], &dev->dmac_addrs[j]); - data->mac_pool_sel[j] = RTE_BIT64(0); } roc_nix_npc_promisc_ena_dis(nix, true); diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index eae34954e2..a628a7661a 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -1677,7 +1677,7 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, { struct rte_ether_addr *addr; uint16_t i; - uint32_t pool = 0; + uint32_t pool; uint64_t pool_mask; /* replay MAC address configuration including default MAC */ @@ -1685,9 +1685,11 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, 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); + dev->dev_ops->mac_addr_add(dev, addr, 0, 0); if (dev->dev_ops->mac_addr_add != NULL) { + bool vmdq = (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_VMDQ_FLAG) != 0; + for (i = 1; i < dev_info->max_mac_addrs; i++) { addr = &dev->data->mac_addrs[i]; @@ -1695,15 +1697,19 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, if (rte_is_zero_ether_addr(addr)) continue; - pool = 0; - pool_mask = dev->data->mac_pool_sel[i]; - - do { - if (pool_mask & UINT64_C(1)) - dev->dev_ops->mac_addr_add(dev, addr, i, pool); - pool_mask >>= 1; - pool++; - } while (pool_mask); + if (!vmdq) { + dev->dev_ops->mac_addr_add(dev, addr, i, 0); + } else { + pool = 0; + pool_mask = dev->data->mac_pool_sel[i]; + + do { + if (pool_mask & UINT64_C(1)) + dev->dev_ops->mac_addr_add(dev, addr, i, pool); + pool_mask >>= 1; + pool++; + } while (pool_mask); + } } } } @@ -5406,8 +5412,9 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, uint32_t pool) { struct rte_eth_dev *dev; - int index; uint64_t pool_mask; + bool vmdq; + int index; int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); @@ -5432,6 +5439,12 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, RTE_ETHDEV_LOG_LINE(ERR, "Pool ID must be 0-%d", RTE_ETH_64_POOLS - 1); return -EINVAL; } + vmdq = (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_VMDQ_FLAG) != 0; + if (!vmdq && pool != 0) { + RTE_ETHDEV_LOG_LINE(ERR, "Port %u: VMDq is not configured (pool %d)", + port_id, pool); + return -EINVAL; + } index = eth_dev_get_mac_addr_index(port_id, addr); if (index < 0) { @@ -5442,6 +5455,9 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, return -ENOSPC; } } else { + if (!vmdq) + return 0; + pool_mask = dev->data->mac_pool_sel[index]; /* Check if both MAC address and pool is already there, and do nothing */ @@ -5456,8 +5472,10 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, /* Update address in NIC data structure */ rte_ether_addr_copy(addr, &dev->data->mac_addrs[index]); - /* Update pool bitmap in NIC data structure */ - dev->data->mac_pool_sel[index] |= RTE_BIT64(pool); + if (vmdq) { + /* Update pool bitmap in NIC data structure */ + dev->data->mac_pool_sel[index] |= RTE_BIT64(pool); + } } ret = eth_err(port_id, ret); @@ -5502,8 +5520,10 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) /* Update address in NIC data structure */ rte_ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]); - /* reset pool bitmap */ - dev->data->mac_pool_sel[index] = 0; + if ((dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_VMDQ_FLAG) != 0) { + /* reset pool bitmap */ + dev->data->mac_pool_sel[index] = 0; + } rte_ethdev_trace_mac_addr_remove(port_id, addr); -- 2.53.0
