[PATCH v4 08/10] net/mlx5: pass maximum number of unicast MAC to common code
David Marchand
david.marchand at redhat.com
Thu Jul 9 18:02:44 CEST 2026
Isolate how the MAC addresses array is walked through in the common code
by passing the max index at which a unicast MAC address is stored in
dev->data->mac_addrs[].
In the sync callback, the size of the array allocated on the stack is
known by the caller, treat the mac_n field as an input parameter too.
With this change, only net/mlx5 knows about the max number of
unicast/multicast MAC addresses.
Signed-off-by: David Marchand <david.marchand at redhat.com>
---
drivers/common/mlx5/linux/mlx5_nl.c | 33 ++++++++++++++++++-----------
drivers/common/mlx5/linux/mlx5_nl.h | 2 +-
drivers/common/mlx5/mlx5_common.h | 8 -------
drivers/net/mlx5/linux/mlx5_os.c | 1 +
drivers/net/mlx5/mlx5.h | 8 +++++++
5 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/drivers/common/mlx5/linux/mlx5_nl.c b/drivers/common/mlx5/linux/mlx5_nl.c
index ceb504f84d..152b4cdda1 100644
--- a/drivers/common/mlx5/linux/mlx5_nl.c
+++ b/drivers/common/mlx5/linux/mlx5_nl.c
@@ -468,19 +468,22 @@ mlx5_nl_mac_addr_cb(struct nlmsghdr *nh, void *arg)
struct mlx5_nl_mac_addr *data = arg;
struct ndmsg *r = NLMSG_DATA(nh);
struct rtattr *attribute;
+ int mac_n = 0;
int len;
+ int ret;
len = nh->nlmsg_len - NLMSG_LENGTH(sizeof(*r));
for (attribute = MLX5_NDA_RTA(r);
RTA_OK(attribute, len);
attribute = RTA_NEXT(attribute, len)) {
if (attribute->rta_type == NDA_LLADDR) {
- if (data->mac_n == MLX5_MAX_MAC_ADDRESSES) {
+ if (mac_n == data->mac_n) {
DRV_LOG(WARNING,
"not enough room to finalize the"
" request");
rte_errno = ENOMEM;
- return -rte_errno;
+ ret = -rte_errno;
+ goto out;
}
#ifdef RTE_PMD_MLX5_DEBUG
char m[RTE_ETHER_ADDR_FMT_SIZE];
@@ -489,11 +492,15 @@ mlx5_nl_mac_addr_cb(struct nlmsghdr *nh, void *arg)
RTA_DATA(attribute));
DRV_LOG(DEBUG, "bridge MAC address %s", m);
#endif
- memcpy(&(*data->mac)[data->mac_n++],
+ memcpy(&(*data->mac)[mac_n++],
RTA_DATA(attribute), RTE_ETHER_ADDR_LEN);
}
}
- return 0;
+ ret = 0;
+
+out:
+ data->mac_n = mac_n;
+ return ret;
}
/**
@@ -505,9 +512,9 @@ mlx5_nl_mac_addr_cb(struct nlmsghdr *nh, void *arg)
* Net device interface index.
* @param mac[out]
* Pointer to the array table of MAC addresses to fill.
- * Its size should be of MLX5_MAX_MAC_ADDRESSES.
- * @param mac_n[out]
- * Number of entries filled in MAC array.
+ * @param mac_n[in,out]
+ * Size of the MAC array on input.
+ * Number of entries filled in MAC array on output.
*
* @return
* 0 on success, a negative errno value otherwise and rte_errno is set.
@@ -532,7 +539,7 @@ mlx5_nl_mac_addr_list(int nlsk_fd, unsigned int iface_idx,
};
struct mlx5_nl_mac_addr data = {
.mac = mac,
- .mac_n = 0,
+ .mac_n = *mac_n,
};
uint32_t sn = MLX5_NL_SN_GENERATE;
int ret;
@@ -766,16 +773,18 @@ mlx5_nl_mac_addr_remove(int nlsk_fd, unsigned int iface_idx,
* Net device interface index.
* @param mac_addrs
* Mac addresses array to sync.
+ * @param uc_n
+ * Number of UC entries in @p mac_addrs.
* @param n
* @p mac_addrs array size.
*/
RTE_EXPORT_INTERNAL_SYMBOL(mlx5_nl_mac_addr_sync)
void
mlx5_nl_mac_addr_sync(int nlsk_fd, unsigned int iface_idx,
- struct rte_ether_addr *mac_addrs, int n)
+ struct rte_ether_addr *mac_addrs, int uc_n, int n)
{
struct rte_ether_addr macs[n];
- int macs_n = 0;
+ int macs_n = n;
int i;
int ret;
@@ -794,7 +803,7 @@ mlx5_nl_mac_addr_sync(int nlsk_fd, unsigned int iface_idx,
continue;
if (rte_is_multicast_ether_addr(&macs[i])) {
/* Find the first entry available. */
- for (j = MLX5_MAX_UC_MAC_ADDRESSES; j != n; ++j) {
+ for (j = uc_n; j != n; ++j) {
if (rte_is_zero_ether_addr(&mac_addrs[j])) {
mac_addrs[j] = macs[i];
break;
@@ -802,7 +811,7 @@ mlx5_nl_mac_addr_sync(int nlsk_fd, unsigned int iface_idx,
}
} else {
/* Find the first entry available. */
- for (j = 0; j != MLX5_MAX_UC_MAC_ADDRESSES; ++j) {
+ for (j = 0; j != uc_n; ++j) {
if (rte_is_zero_ether_addr(&mac_addrs[j])) {
mac_addrs[j] = macs[i];
break;
diff --git a/drivers/common/mlx5/linux/mlx5_nl.h b/drivers/common/mlx5/linux/mlx5_nl.h
index 500198b654..d71eadeffb 100644
--- a/drivers/common/mlx5/linux/mlx5_nl.h
+++ b/drivers/common/mlx5/linux/mlx5_nl.h
@@ -63,7 +63,7 @@ int mlx5_nl_mac_addr_remove(int nlsk_fd, unsigned int iface_idx,
struct rte_ether_addr *mac);
__rte_internal
void mlx5_nl_mac_addr_sync(int nlsk_fd, unsigned int iface_idx,
- struct rte_ether_addr *mac_addrs, int n);
+ struct rte_ether_addr *mac_addrs, int uc_n, int n);
__rte_internal
int mlx5_nl_promisc(int nlsk_fd, unsigned int iface_idx, int enable);
__rte_internal
diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h
index 3e66c9e6c8..dbc06aff7e 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -159,14 +159,6 @@ enum {
PCI_DEVICE_ID_MELLANOX_CONNECTX10 = 0x1027,
};
-/* Maximum number of simultaneous unicast MAC addresses. */
-#define MLX5_MAX_UC_MAC_ADDRESSES 128
-/* Maximum number of simultaneous Multicast MAC addresses. */
-#define MLX5_MAX_MC_MAC_ADDRESSES 128
-/* Maximum number of simultaneous MAC addresses. */
-#define MLX5_MAX_MAC_ADDRESSES \
- (MLX5_MAX_UC_MAC_ADDRESSES + MLX5_MAX_MC_MAC_ADDRESSES)
-
/* Recognized Infiniband device physical port name types. */
enum mlx5_nl_phys_port_name_type {
MLX5_PHYS_PORT_NAME_TYPE_NOTSET = 0, /* Not set. */
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 1b241ba9d2..5b6e45df2a 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1762,6 +1762,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
mlx5_nl_mac_addr_sync(priv->nl_socket_route,
mlx5_ifindex(eth_dev),
eth_dev->data->mac_addrs,
+ MLX5_MAX_UC_MAC_ADDRESSES,
MLX5_MAX_MAC_ADDRESSES);
priv->ctrl_flows = 0;
rte_spinlock_init(&priv->flow_list_lock);
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 27e6f4e31a..3ad8bad02f 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -82,6 +82,14 @@
/* Maximum allowed MTU to be reported whenever PMD cannot query it from OS. */
#define MLX5_ETH_MAX_MTU (9978)
+/* Maximum number of simultaneous unicast MAC addresses. */
+#define MLX5_MAX_UC_MAC_ADDRESSES 128
+/* Maximum number of simultaneous Multicast MAC addresses. */
+#define MLX5_MAX_MC_MAC_ADDRESSES 128
+/* Maximum number of simultaneous MAC addresses. */
+#define MLX5_MAX_MAC_ADDRESSES \
+ (MLX5_MAX_UC_MAC_ADDRESSES + MLX5_MAX_MC_MAC_ADDRESSES)
+
enum mlx5_ipool_index {
#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
MLX5_IPOOL_DECAP_ENCAP = 0, /* Pool for encap/decap resource. */
--
2.54.0
More information about the dev
mailing list