From: Cosmin Ratiu <[email protected]> Add an mlx5e_update_nic_rx() -> mlx5e_psp_update_rx() hook. This allows PSP steering to reconfigure when netdev features change.
When this signal is received, toggle PSP between standard and decap modes when SHAMPO mode changes, optionally creating the decap steering table. The toggling of traffic is atomic (a single steering rule update), so no packets should get eaten/lost. It is probable though that the rxhash will change, and decapsulated packets will be received by a different core than before. Established PSP connections receiving traffic might experience reordering/retransmits as a result. Also enable decap when configuring the device if the mode indicates it. Signed-off-by: Cosmin Ratiu <[email protected]> Reviewed-by: Dragos Tatulea <[email protected]> Signed-off-by: Tariq Toukan <[email protected]> --- .../mellanox/mlx5/core/en_accel/en_accel.h | 5 ++++ .../mellanox/mlx5/core/en_accel/psp.c | 23 +++++++++++++++++-- .../mellanox/mlx5/core/en_accel/psp.h | 2 ++ .../net/ethernet/mellanox/mlx5/core/en_main.c | 10 +++++++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h index 8a2ea7616440..98709d48b801 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h @@ -251,6 +251,11 @@ static inline void mlx5e_accel_cleanup_rx(struct mlx5e_priv *priv) mlx5_accel_psp_fs_cleanup_rx_tables(priv); } +static inline void mlx5e_accel_update_rx(struct mlx5e_priv *priv) +{ + mlx5e_psp_update_rx(priv); +} + static inline int mlx5e_accel_init_tx(struct mlx5e_priv *priv) { return mlx5e_ktls_init_tx(priv); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c index 84133cbf8689..c40d2ddf6af2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c @@ -92,6 +92,12 @@ struct mlx5e_psp_fs { struct mlx5e_psp_rx_table rx; }; +static bool shampo_enabled(struct mlx5e_priv *priv) +{ + return priv->channels.params.packet_merge.type == + MLX5E_PACKET_MERGE_SHAMPO; +} + /* PSP RX flow steering */ static enum mlx5_traffic_types fs_psp2tt(enum accel_fs_psp_type i) { @@ -767,6 +773,7 @@ static void accel_psp_fs_rx_destroy(struct mlx5e_psp_fs *fs) } static int accel_psp_fs_rx_create(struct mlx5e_psp_fs *fs, + bool decap_enable, struct netlink_ext_ack *extack) { struct mlx5_ttc_table *ttc = mlx5e_fs_get_ttc(fs->fs, false); @@ -808,7 +815,7 @@ static int accel_psp_fs_rx_create(struct mlx5e_psp_fs *fs, mlx5_ttc_fwd_dest(ttc, fs_psp2tt(i), &dest); } - accel_psp_fs_rx_reconfigure(fs, false); + accel_psp_fs_rx_reconfigure(fs, decap_enable); return 0; @@ -1078,7 +1085,8 @@ static int accel_psp_fs_create(struct mlx5e_priv *priv, { int err; - err = accel_psp_fs_rx_create(priv->psp->fs, extack); + err = accel_psp_fs_rx_create(priv->psp->fs, shampo_enabled(priv), + extack); if (err) return err; @@ -1355,3 +1363,14 @@ void mlx5e_psp_cleanup(struct mlx5e_priv *priv) priv->psp = NULL; kfree(psp); } + +void mlx5e_psp_update_rx(struct mlx5e_priv *priv) +{ + struct mlx5e_psp *psp = priv->psp; + + netdev_assert_locked(priv->netdev); + if (!psp || !psp->fs->check.ft) + return; + + accel_psp_fs_rx_reconfigure(psp->fs, shampo_enabled(priv)); +} diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.h index 3f441e7dd55a..43571a039ea6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.h @@ -49,6 +49,7 @@ int mlx5e_psp_register(struct mlx5e_priv *priv); void mlx5e_psp_unregister(struct mlx5e_priv *priv); int mlx5e_psp_init(struct mlx5e_priv *priv); void mlx5e_psp_cleanup(struct mlx5e_priv *priv); +void mlx5e_psp_update_rx(struct mlx5e_priv *priv); #else static inline void mlx5_accel_psp_fs_cleanup_rx_tables(struct mlx5e_priv *priv) { } static inline void mlx5_accel_psp_fs_cleanup_tx_tables(struct mlx5e_priv *priv) { } @@ -61,5 +62,6 @@ static inline int mlx5e_psp_register(struct mlx5e_priv *priv) { return 0; } static inline void mlx5e_psp_unregister(struct mlx5e_priv *priv) { } static inline int mlx5e_psp_init(struct mlx5e_priv *priv) { return 0; } static inline void mlx5e_psp_cleanup(struct mlx5e_priv *priv) { } +static inline void mlx5e_psp_update_rx(struct mlx5e_priv *priv) { } #endif /* CONFIG_MLX5_EN_PSP */ #endif /* __MLX5E_ACCEL_PSP_H__ */ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index fc110a7d16e8..b5449d849838 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -6288,7 +6288,15 @@ static void mlx5e_nic_disable(struct mlx5e_priv *priv) static int mlx5e_update_nic_rx(struct mlx5e_priv *priv) { - return mlx5e_refresh_tirs(priv->mdev, false, false); + int err; + + err = mlx5e_refresh_tirs(priv->mdev, false, false); + if (err) + return err; + + mlx5e_accel_update_rx(priv); + + return 0; } static const struct mlx5e_profile mlx5e_nic_profile = { -- 2.44.0
