diff mbox series

[v4,7/8] net/mlx5: fix setting VF default MAC through representor

Message ID 1611041295-12797-8-git-send-email-xuemingl@nvidia.com (mailing list archive)
State Superseded, archived
Delegated to: Raslan Darawsheh
Headers show
Series [v1,1/2] common/mlx5: support device global syntax | expand

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Xueming Li Jan. 19, 2021, 7:28 a.m. UTC
With kernel bonding, there was an error when setting VF MAC address
through representor. The Netlink api requires ifindex of owner PF, not
bonding device ifindex.

Uses owner PF ifindex to modify VF default MAC in case of bonding
device.

Fixes: c21e5facf7d2 ("net/mlx5: use bond index for netdev operations")

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_mac.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index b5b810b508..5a3aec89c1 100644
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -154,6 +154,7 @@  mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
 	uint16_t port_id;
 	struct mlx5_priv *priv = dev->data->dev_private;
+	struct mlx5_priv *pf_priv;
 
 	/*
 	 * Configuring the VF instead of its representor,
@@ -162,19 +163,24 @@  mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 	if (priv->representor && !mlx5_is_hpf(dev)) {
 		DRV_LOG(DEBUG, "VF represented by port %u setting primary MAC address",
 			dev->data->port_id);
+		if (priv->pf_bond >= 0) {
+			/* Bonding, get owner PF ifindex from shared data. */
+			return mlx5_os_vf_mac_addr_modify
+			       (priv,
+				priv->sh->bond.ports[priv->pf_bond].ifindex,
+				mac_addr,
+				rte_eth_representor_id_parse(
+						priv->representor_id,
+						NULL, NULL, NULL));
+		}
 		RTE_ETH_FOREACH_DEV_SIBLING(port_id, dev->data->port_id) {
-			priv = rte_eth_devices[port_id].data->dev_private;
-			if (priv->master == 1) {
-				priv = dev->data->dev_private;
+			pf_priv = rte_eth_devices[port_id].data->dev_private;
+			if (pf_priv->master == 1)
 				return mlx5_os_vf_mac_addr_modify
-				       (priv,
-					mlx5_ifindex(&rte_eth_devices[port_id]),
-					mac_addr,
+				       (priv, pf_priv->if_index, mac_addr,
 					rte_eth_representor_id_parse(
 							priv->representor_id,
-							NULL, NULL, NULL)
-					);
-			}
+							NULL, NULL, NULL));
 		}
 		rte_errno = -ENOTSUP;
 		return rte_errno;