Skip to contentSkip to conversation

net/mlx5: fix condition of LACP miss flow

PATCH In review Bing Zhao 2 participants 2 messages Feb 21, 2024 – Feb 27, 2024 Network drivers

lore
Share & tools
lore

Bing Zhao

author
#0 lore raw

PATCH 1/1 net/mlx5: fix condition of LACP miss flow

The LACP traffic is only related to the bond interface. The default miss flow to redirect the LACP traffic with ethertype 0x8809 to the kernel driver should only be created on the bond device.

This commit will:
1. remove the incorrect assertion of the port role.
2. skip the resource allocation and flow rule creation on the representor port.

Fixes 0f0ae73a3287 ("net/mlx5: add parameter for LACP packets control")
Fixes 49dffadf4b0c ("net/mlx5: fix LACP redirection in Rx domain")
---
 drivers/net/mlx5/mlx5_flow_hw.c | 3 +--
 drivers/net/mlx5/mlx5_trigger.c | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/mlx5/mlx5_flow_hw.c +1 -2
index 3bb3a9a178..d346c93677 100644
@@ -8718,7 +8718,7 @@ flow_hw_create_ctrl_tables(struct rte_eth_dev *dev, struct rte_flow_error *error
 		}
 	}
 	/* Create LACP default miss table. */
-	if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0) {
+	if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0 && priv->master) {
 		lacp_rx_items_tmpl = flow_hw_create_lacp_rx_pattern_template(dev, error);
 		if (!lacp_rx_items_tmpl) {
 			DRV_LOG(ERR, "port %u failed to create pattern template"
@@ -12475,7 +12475,6 @@ mlx5_flow_hw_lacp_rx_flow(struct rte_eth_dev *dev)
 		.type = MLX5_HW_CTRL_FLOW_TYPE_LACP_RX,
 	};
 
-	MLX5_ASSERT(priv->master);
 	if (!priv->dr_ctx || !priv->hw_lacp_rx_tbl)
 		return 0;
 	return flow_hw_create_ctrl_flow(dev, dev, priv->hw_lacp_rx_tbl, eth_lacp, 0,
drivers/net/mlx5/mlx5_trigger.c +4 -4
index 5ac25d7e2d..f8d67282ce 100644
@@ -1524,7 +1524,7 @@ mlx5_traffic_enable_hws(struct rte_eth_dev *dev)
 	}
 	if (priv->isolated)
 		return 0;
-	if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0)
+	if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0 && priv->master)
 		if (mlx5_flow_hw_lacp_rx_flow(dev))
 			goto error;
 	if (dev->data->promiscuous)
@@ -1632,14 +1632,14 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
 		DRV_LOG(INFO, "port %u FDB default rule is disabled",
 			dev->data->port_id);
 	}
-	if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0) {
+	if (!priv->sh->config.lacp_by_user && priv->pf_bond >= 0 && priv->master) {
 		ret = mlx5_flow_lacp_miss(dev);
 		if (ret)
 			DRV_LOG(INFO, "port %u LACP rule cannot be created - "
 				"forward LACP to kernel.", dev->data->port_id);
 		else
-			DRV_LOG(INFO, "LACP traffic will be missed in port %u."
-				, dev->data->port_id);
+			DRV_LOG(INFO, "LACP traffic will be missed in port %u.",
+				dev->data->port_id);
 	}
 	if (priv->isolated)
 		return 0;
Signature · 1 line
2.34.1
#1 lore raw

Hi,

Quoted 19 lines

-----Original Message-----
From: Bing Zhao <[email protected]>
Sent: Wednesday, February 21, 2024 8:50 AM
To: Suanming Mou <[email protected]>; Raslan Darawsheh <[email protected]>; [email protected]
Cc: Matan Azrad <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Dariusz Sosnowski <[email protected]>; [email protected]
Subject: [PATCH] net/mlx5: fix condition of LACP miss flow

The LACP traffic is only related to the bond interface. The default miss flow to redirect the LACP traffic with ethertype 0x8809 to the kernel driver should only be created on the bond device.

This commit will:
1. remove the incorrect assertion of the port role.
2. skip the resource allocation and flow rule creation on the representor port.

Quoted 6 lines
Fixes 0f0ae73a3287 ("net/mlx5: add parameter for LACP packets control")
Fixes 49dffadf4b0c ("net/mlx5: fix LACP redirection in Rx domain")

Patch applied to next-net-mlx,
Kindest regards
Raslan Darawsheh