net/mlx5e: TC, track peer flow slots with bitmap

With SD devices joining the LAG, peer flows are not created for all
devcom peers - SD devices skip peers that belong to a different SD
group. However, the delete path iterated all devcom peers
unconditionally, attempting to delete from slots that were never
populated.

Track which peer slots are populated using a bitmap in mlx5e_tc_flow.
The delete path now iterates only set bits, matching exactly the slots
that were set up during flow creation.

Signed-off-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20260531113954.395443-12-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
index efb34de4cb7adb0b04a95fbd7cdbdc2f2b1ff0f5..a0434ceebe693d59dfb39afc67e17082dc899c0e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
@@ -97,6 +97,9 @@ struct mlx5e_tc_flow {
        struct mlx5e_hairpin_entry *hpe; /* attached hairpin instance */
        struct list_head hairpin; /* flows sharing the same hairpin */
        struct list_head peer[MLX5_MAX_PORTS];    /* flows with peer flow */
+       DECLARE_BITMAP(peer_used, MLX5_MAX_PORTS); /* tracks populated peer
+                                                   * slots
+                                                   */
        struct list_head unready; /* flows not ready to be offloaded (e.g
                                   * due to missing route)
                                   */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 3846c16c3138af258f247426b4fbce1eae57dc34..2a16368a948ed594179cc60a6fb8ea5e46c04235 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -2128,6 +2128,7 @@ static void mlx5e_tc_del_fdb_peer_flow(struct mlx5e_tc_flow *flow,
 
        mutex_lock(&esw->offloads.peer_mutex);
        list_del(&flow->peer[peer_index]);
+       clear_bit(peer_index, flow->peer_used);
        mutex_unlock(&esw->offloads.peer_mutex);
 
        list_for_each_entry_safe(peer_flow, tmp, &flow->peer_flows, peer_flows) {
@@ -2147,16 +2148,10 @@ static void mlx5e_tc_del_fdb_peer_flow(struct mlx5e_tc_flow *flow,
 
 static void mlx5e_tc_del_fdb_peers_flow(struct mlx5e_tc_flow *flow)
 {
-       struct mlx5_devcom_comp_dev *devcom;
-       struct mlx5_devcom_comp_dev *pos;
-       struct mlx5_eswitch *peer_esw;
        int i;
 
-       devcom = flow->priv->mdev->priv.eswitch->devcom;
-       mlx5_devcom_for_each_peer_entry(devcom, peer_esw, pos) {
-               i = mlx5_lag_get_dev_seq(peer_esw->dev);
+       for_each_set_bit(i, flow->peer_used, MLX5_MAX_PORTS)
                mlx5e_tc_del_fdb_peer_flow(flow, i);
-       }
 }
 
 static void mlx5e_tc_del_flow(struct mlx5e_priv *priv,
@@ -4618,6 +4613,7 @@ static int mlx5e_tc_add_fdb_peer_flow(struct flow_cls_offload *f,
        flow_flag_set(flow, DUP);
        mutex_lock(&esw->offloads.peer_mutex);
        list_add_tail(&flow->peer[i], &esw->offloads.peer_flows[i]);
+       set_bit(i, flow->peer_used);
        mutex_unlock(&esw->offloads.peer_mutex);
 
 out: