Hi Greg,
On Mon, Jan 29, 2024 at 09:04:58AM -0800, Greg Kroah-Hartman wrote:
> 6.1-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Leon Romanovsky <leonro@xxxxxxxxxx>
>
> [ Upstream commit 20f5468a7988dedd94a57ba8acd65ebda6a59723 ]
>
> All ConnectX devices have software parsing capability enabled, but it is
> more correct to set allow_swp only if capability exists, which for IPsec
> means that crypto offload is supported.
>
> Fixes: 2451da081a34 ("net/mlx5: Unify device IPsec capabilities check")
> Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx>
> Signed-off-by: Saeed Mahameed <saeedm@xxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en/params.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c
> index 29dd3a04c154..d3de1b7a80bf 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c
> @@ -990,8 +990,8 @@ void mlx5e_build_sq_param(struct mlx5_core_dev *mdev,
> void *wq = MLX5_ADDR_OF(sqc, sqc, wq);
> bool allow_swp;
>
> - allow_swp =
> - mlx5_geneve_tx_allowed(mdev) || !!mlx5_ipsec_device_caps(mdev);
> + allow_swp = mlx5_geneve_tx_allowed(mdev) ||
> + (mlx5_ipsec_device_caps(mdev) & MLX5_IPSEC_CAP_CRYPTO);
> mlx5e_build_sq_param_common(mdev, param);
> MLX5_SET(wq, wq, log_wq_sz, params->log_sq_size);
> MLX5_SET(sqc, sqc, allow_swp, allow_swp);
When compiling 6.1.76-rc1 this commit causes the following build
failure:
drivers/net/ethernet/mellanox/mlx5/core/en/params.c: In function ‘mlx5e_build_sq_param’:
drivers/net/ethernet/mellanox/mlx5/core/en/params.c:994:53: error: ‘MLX5_IPSEC_CAP_CRYPTO’ undeclared (first use in this function)
994 | (mlx5_ipsec_device_caps(mdev) & MLX5_IPSEC_CAP_CRYPTO);
| ^~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/mellanox/mlx5/core/en/params.c:994:53: note: each undeclared identifier is reported only once for each function it appears in
Attached the used config.
Regards,
Salvatore
Attachment:
test.config.xz
Description: application/xz
