[PATCH net-next V2 11/13] net/mlx5e: psp: Dynamically reconfigure based on SHAMPO mode
flat view
STALE69d
SUPERSEDED: 1 (1M)
From: Tariq Toukan <tariqt@nvidia.com>
Date: 2026-08-04 08:38:36
Also in:
linux-kselftest, linux-rdma, lkml
Subsystem:
mellanox ethernet driver (mlx5e), mellanox ethernet innova drivers, mellanox mlx5 core vpi driver, networking drivers, the rest · Maintainers:
Saeed Mahameed, Tariq Toukan, Mark Bloch, Leon Romanovsky, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Revision v2 of 4 in this series; 1 review trailer.
Revisions (4)
- v1 [diff vs current]
- v2 current
- v3 [diff vs current]
- v4 [diff vs current]
From: Cosmin Ratiu <redacted> 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 <redacted> Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> --- .../mellanox/mlx5/core/en_accel/en_accel.h | 9 ++++++++ .../mellanox/mlx5/core/en_accel/psp.c | 23 +++++++++++++++++-- .../mellanox/mlx5/core/en_accel/psp.h | 2 ++ .../net/ethernet/mellanox/mlx5/core/en_main.c | 8 ++++++- 4 files changed, 39 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..a0bb19cc956d 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,15 @@ static inline void mlx5e_accel_cleanup_rx(struct mlx5e_priv *priv) mlx5_accel_psp_fs_cleanup_rx_tables(priv); } +static inline int mlx5e_accel_update_rx(struct mlx5e_priv *priv) +{ +#ifdef CONFIG_MLX5_EN_PSP + return mlx5e_psp_update_rx(priv); +#else + return 0; +#endif +} + 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 37635be7346b..ad8dbd8c2f27 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) {
@@ -766,6 +772,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);
@@ -807,7 +814,7 @@ static int accel_psp_fs_rx_create(struct mlx5e_psp_fs *fs, mlx5_ttc_fwd_dest(ttc, fs_psp2tt(i), &dest); } - err = accel_psp_fs_rx_reconfigure(fs, false); + err = accel_psp_fs_rx_reconfigure(fs, decap_enable); if (err) { NL_SET_ERR_MSG(extack, "Failed RX steering config for HW GRO"); goto err_decrypt_ft;
@@ -1081,7 +1088,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;
@@ -1358,3 +1366,14 @@ void mlx5e_psp_cleanup(struct mlx5e_priv *priv) priv->psp = NULL; kfree(psp); } + +int 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 0; + + 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..76f6c69de0e9 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); +int 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 int mlx5e_psp_update_rx(struct mlx5e_priv *priv) { return 0; } #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 3b9d42c7e9c2..3c6ef500d0fb 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c@@ -6286,7 +6286,13 @@ 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; + + return mlx5e_accel_update_rx(priv); } static const struct mlx5e_profile mlx5e_nic_profile = {
--
2.44.0