[v5,7/9] net/mlx5: fix setting VF default MAC through representor

Message ID 1616939297-15627-8-git-send-email-xuemingl@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: support SubFunction representor |

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Xueming Li March 28, 2021, 1:48 p.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 | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
  

Comments

Raslan Darawsheh March 31, 2021, 7:46 a.m. UTC | #1
Hi,

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Xueming Li
> Sent: Sunday, March 28, 2021 4:48 PM
> To: Slava Ovsiienko <viacheslavo@nvidia.com>
> Cc: dev@dpdk.org; Xueming(Steven) Li <xuemingl@nvidia.com>; Asaf Penso
> <asafp@nvidia.com>; Matan Azrad <matan@nvidia.com>; Shahaf Shuler
> <shahafs@nvidia.com>
> Subject: [dpdk-dev] [PATCH v5 7/9] net/mlx5: fix setting VF default MAC
> through representor
> 
> 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")
Missing Cc: stable@dpdk.org
Will be added during integration

Kindest regards
Raslan Darawsheh
  

Patch

diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index 7b2be04889..a7946f7756 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,17 +163,21 @@  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,
+				MLX5_REPRESENTOR_REPR(priv->representor_id));
+		}
 		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,
 					MLX5_REPRESENTOR_REPR
 						(priv->representor_id));
-			}
 		}
 		rte_errno = -ENOTSUP;
 		return rte_errno;