[RFC net-next 13/15] net/mlx5e: Configure PSP Rx flow steering rules

Jakub Kicinski
2024-05-10T03:04:53Z

From: Raed Salem <raeds@nvidia.com>

Set the Rx PSP flow steering rule where PSP packet is identified and
decrypted using the dedicated UDP destination port number 1000. If packet
is decrypted then a PSP marker and syndrome are added to metadata so SW can
use it later on in Rx data path.

The rule is set as part of init_rx netdev profile implementation.

Signed-off-by: Raed Salem <raeds@nvidia.com>
Signed-off-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
.../mellanox/mlx5/core/en_accel/en_accel.h | 14 +++++-
.../mellanox/mlx5/core/en_accel/nisp_fs.c | 46 ++++++++++++++++---
.../mellanox/mlx5/core/en_accel/nisp_fs.h | 7 +++
3 files changed, 60 insertions(+), 7 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 cea997847fa4..38d2c73a0f79 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
@@ -231,12 +231,24 @@ static inline void mlx5e_accel_tx_finish(struct mlx5e_txqsq *sq,

static inline int mlx5e_accel_init_rx(struct mlx5e_priv *priv)
{
- return mlx5e_ktls_init_rx(priv);
+ int err;
+
+ err = mlx5_accel_nisp_fs_init_rx_tables(priv);
+ if (err)
+ goto out;
+
+ err = mlx5e_ktls_init_rx(priv);
+ if (err)
+ mlx5_accel_nisp_fs_cleanup_rx_tables(priv);
+
+out:
+ return err;
}

static inline void mlx5e_accel_cleanup_rx(struct mlx5e_priv *priv)
{
mlx5e_ktls_cleanup_rx(priv);
+ mlx5_accel_nisp_fs_cleanup_rx_tables(priv);
}

static inline int mlx5e_accel_init_tx(struct mlx5e_priv *priv)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/nisp_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/nisp_fs.c
index 11f583d13bdd..0d80f646e5b8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/nisp_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/nisp_fs.c
@@ -468,9 +468,6 @@ static void accel_nisp_fs_cleanup_rx(struct mlx5e_nisp_fs *fs)
if (!fs->rx_fs)
return;

- for (i = 0; i < ACCEL_FS_NISP_NUM_TYPES; i++)
- accel_nisp_fs_rx_ft_put(fs, i);
-
accel_nisp = fs->rx_fs;
for (i = 0; i < ACCEL_FS_NISP_NUM_TYPES; i++) {
fs_prot = &accel_nisp->fs_prot[i];
@@ -496,13 +493,50 @@ static int accel_nisp_fs_init_rx(struct mlx5e_nisp_fs *fs)
mutex_init(&fs_prot->prot_mutex);
}

- for (i = 0; i < ACCEL_FS_NISP_NUM_TYPES; i++)
- accel_nisp_fs_rx_ft_get(fs, ACCEL_FS_NISP4);
-
fs->rx_fs = accel_nisp;
+
return 0;
}

+void mlx5_accel_nisp_fs_cleanup_rx_tables(struct mlx5e_priv *priv)
+{
+ int i;
+
+ if (!priv->nisp)
+ return;
+
+ for (i = 0; i < ACCEL_FS_NISP_NUM_TYPES; i++)
+ accel_nisp_fs_rx_ft_put(priv->nisp->fs, i);
+}
+
+int mlx5_accel_nisp_fs_init_rx_tables(struct mlx5e_priv *priv)
+{
+ enum accel_fs_nisp_type i;
+ struct mlx5e_nisp_fs *fs;
+ int err;
+
+ if (!priv->nisp)
+ return 0;
+
+ fs = priv->nisp->fs;
+ for (i = 0; i < ACCEL_FS_NISP_NUM_TYPES; i++) {
+ err = accel_nisp_fs_rx_ft_get(fs, i);
+ if (err)
+ goto out_err;
+ }
+
+ return 0;
+
+out_err:
+ i--;
+ while (i >= 0) {
+ accel_nisp_fs_rx_ft_put(fs, i);
+ --i;
+ }
+
+ return err;
+}
+
static int accel_nisp_fs_tx_create_ft_table(struct mlx5e_nisp_fs *fs)
{
int inlen = MLX5_ST_SZ_BYTES(create_flow_group_in);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/nisp_fs.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/nisp_fs.h
index 11cdc447a401..8c44dd51317c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/nisp_fs.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/nisp_fs.h
@@ -12,6 +12,8 @@ struct mlx5e_nisp_fs *mlx5e_accel_nisp_fs_init(struct mlx5e_priv *priv);
void mlx5e_accel_nisp_fs_cleanup(struct mlx5e_nisp_fs *fs);
int mlx5_accel_nisp_fs_init_tx_tables(struct mlx5e_priv *priv);
void mlx5_accel_nisp_fs_cleanup_tx_tables(struct mlx5e_priv *priv);
+int mlx5_accel_nisp_fs_init_rx_tables(struct mlx5e_priv *priv);
+void mlx5_accel_nisp_fs_cleanup_rx_tables(struct mlx5e_priv *priv);
#else
static inline int mlx5_accel_nisp_fs_init_tx_tables(struct mlx5e_priv *priv)
{
@@ -19,5 +21,10 @@ static inline int mlx5_accel_nisp_fs_init_tx_tables(struct mlx5e_priv *priv)
}

static inline void mlx5_accel_nisp_fs_cleanup_tx_tables(struct mlx5e_priv *priv) { }
+static inline int mlx5_accel_nisp_fs_init_rx_tables(struct mlx5e_priv *priv)
+{
+ return 0;
+}
+static inline void mlx5_accel_nisp_fs_cleanup_rx_tables(struct mlx5e_priv *priv) { }
#endif /* CONFIG_MLX5_EN_PSP */
#endif /* __MLX5_NISP_FS_H__ */
--
2.45.0