| Message ID | 1741644104-97767-5-git-send-email-tariqt@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 32966984bee1defd9f5a8f9be274d7c32f911ba1 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | mlx5 misc fixes 2025-03-10 | expand |
On Tue, Mar 11, 2025 at 12:01:42AM +0200, Tariq Toukan wrote: > From: Shay Drory <shayd@nvidia.com> > > Currently, MultiPort E-Switch is requesting to create a LAG with shared > FDB without checking the LAG is supporting shared FDB. > Add the check. > > Fixes: a32327a3a02c ("net/mlx5: Lag, Control MultiPort E-Switch single FDB mode") > Signed-off-by: Shay Drory <shayd@nvidia.com> > Reviewed-by: Mark Bloch <mbloch@nvidia.com> > Signed-off-by: Tariq Toukan <tariqt@nvidia.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 4 ++-- > drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 1 + > drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 3 ++- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c > index cea5aa314f6c..ed2ba272946b 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c > @@ -951,7 +951,7 @@ void mlx5_disable_lag(struct mlx5_lag *ldev) > mlx5_eswitch_reload_ib_reps(ldev->pf[i].dev->priv.eswitch); > } > > -static bool mlx5_shared_fdb_supported(struct mlx5_lag *ldev) > +bool mlx5_lag_shared_fdb_supported(struct mlx5_lag *ldev) > { > int idx = mlx5_lag_get_dev_index_by_seq(ldev, MLX5_LAG_P1); > struct mlx5_core_dev *dev; > @@ -1038,7 +1038,7 @@ static void mlx5_do_bond(struct mlx5_lag *ldev) > } > > if (do_bond && !__mlx5_lag_is_active(ldev)) { > - bool shared_fdb = mlx5_shared_fdb_supported(ldev); > + bool shared_fdb = mlx5_lag_shared_fdb_supported(ldev); > > roce_lag = mlx5_lag_is_roce_lag(ldev); > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h > index 01cf72366947..c2f256bb2bc2 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h > +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h > @@ -92,6 +92,7 @@ mlx5_lag_is_ready(struct mlx5_lag *ldev) > return test_bit(MLX5_LAG_FLAG_NDEVS_READY, &ldev->state_flags); > } > > +bool mlx5_lag_shared_fdb_supported(struct mlx5_lag *ldev); > bool mlx5_lag_check_prereq(struct mlx5_lag *ldev); > void mlx5_modify_lag(struct mlx5_lag *ldev, > struct lag_tracker *tracker); > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c > index ffac0bd6c895..1770297a112e 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c > @@ -83,7 +83,8 @@ static int enable_mpesw(struct mlx5_lag *ldev) > if (mlx5_eswitch_mode(dev0) != MLX5_ESWITCH_OFFLOADS || > !MLX5_CAP_PORT_SELECTION(dev0, port_select_flow_table) || > !MLX5_CAP_GEN(dev0, create_lag_when_not_master_up) || > - !mlx5_lag_check_prereq(ldev)) > + !mlx5_lag_check_prereq(ldev) || > + !mlx5_lag_shared_fdb_supported(ldev)) > return -EOPNOTSUPP; > > err = mlx5_mpesw_metadata_set(ldev); Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > -- > 2.31.1
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c index cea5aa314f6c..ed2ba272946b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c @@ -951,7 +951,7 @@ void mlx5_disable_lag(struct mlx5_lag *ldev) mlx5_eswitch_reload_ib_reps(ldev->pf[i].dev->priv.eswitch); } -static bool mlx5_shared_fdb_supported(struct mlx5_lag *ldev) +bool mlx5_lag_shared_fdb_supported(struct mlx5_lag *ldev) { int idx = mlx5_lag_get_dev_index_by_seq(ldev, MLX5_LAG_P1); struct mlx5_core_dev *dev; @@ -1038,7 +1038,7 @@ static void mlx5_do_bond(struct mlx5_lag *ldev) } if (do_bond && !__mlx5_lag_is_active(ldev)) { - bool shared_fdb = mlx5_shared_fdb_supported(ldev); + bool shared_fdb = mlx5_lag_shared_fdb_supported(ldev); roce_lag = mlx5_lag_is_roce_lag(ldev); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h index 01cf72366947..c2f256bb2bc2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h @@ -92,6 +92,7 @@ mlx5_lag_is_ready(struct mlx5_lag *ldev) return test_bit(MLX5_LAG_FLAG_NDEVS_READY, &ldev->state_flags); } +bool mlx5_lag_shared_fdb_supported(struct mlx5_lag *ldev); bool mlx5_lag_check_prereq(struct mlx5_lag *ldev); void mlx5_modify_lag(struct mlx5_lag *ldev, struct lag_tracker *tracker); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c index ffac0bd6c895..1770297a112e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c @@ -83,7 +83,8 @@ static int enable_mpesw(struct mlx5_lag *ldev) if (mlx5_eswitch_mode(dev0) != MLX5_ESWITCH_OFFLOADS || !MLX5_CAP_PORT_SELECTION(dev0, port_select_flow_table) || !MLX5_CAP_GEN(dev0, create_lag_when_not_master_up) || - !mlx5_lag_check_prereq(ldev)) + !mlx5_lag_check_prereq(ldev) || + !mlx5_lag_shared_fdb_supported(ldev)) return -EOPNOTSUPP; err = mlx5_mpesw_metadata_set(ldev);