net/mlx5: fix jump ipool entry size
PATCH 1/1 net/mlx5: fix jump ipool entry size
In mlx5 PMD, MLX5_IPOOL_JUMP ipool configuration is used to initialize the ipool containing either:
- flow table entry when DV flow engine is chosen or,
- group table entry when HW steering flow engine is chosen.
Default configuration for MLX5_IPOOL_JUMP ipool specified entry size as size of mlx5_flow_tbl_data_entry struct, used with DV flow engine. This could lead to memory corruption when mlx5_flow_group struct (used with HW steering flow engine) would have bigger size than mlx5_flow_tbl_data_entry.
This patch fixes that. Entry size for MLX5_IPOOL_JUMP ipool is chosen dynamically based on device configuration.
--- drivers/net/mlx5/mlx5.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/net/mlx5/mlx5.c +14 -1
@@ -241,7 +241,12 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = { .type = "mlx5_port_id_ipool", }, [MLX5_IPOOL_JUMP] = { - .size = sizeof(struct mlx5_flow_tbl_data_entry), +/* +* MLX5_IPOOL_JUMP ipool entry size depends on selected flow engine. +* When HW steering is enabled mlx5_flow_group struct is used. +* Otherwise mlx5_flow_tbl_data_entry struct is used. +*/ + .size = 0, .trunk_size = 64, .grow_trunk = 3, .grow_shift = 2,
@@ -904,6 +909,14 @@ mlx5_flow_ipool_create(struct mlx5_dev_ctx_shared *sh) sizeof(struct mlx5_flow_handle) :MLX5_FLOW_HANDLE_VERBS_SIZE ;break ; +#if defined(HAVE_IBV_FLOW_DV_SUPPORT ) || !defined(HAVE_INFINIBAND_VERBS_H ) +/* Set MLX5_IPOOL_JUMP ipool entry size depending on selected flow engine. */ +case MLX5_IPOOL_JUMP : + cfg.size = sh->config.dv_flow_en ==2 ? +sizeof (struct mlx5_flow_group ) : +sizeof (struct mlx5_flow_tbl_data_entry ); +break ; +#endif }if (sh->config.reclaim_mode) { cfg.release_mem_en =1 ;
Signature · 1 line
2.25.1
Thanks.
Quoted 20 lines
-----Original Message-----
From: Dariusz Sosnowski <[email protected]>
Sent: Saturday, August 26, 2023 2:44 AM
To: Matan Azrad <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>
Cc: [email protected]; [email protected]
Subject: [PATCH] net/mlx5: fix jump ipool entry sizeIn mlx5 PMD,
MLX5_IPOOL_JUMPipool configuration is used to initialize the ipool containing either:- flow table entry when DV flow engine is chosen or,
- group table entry when HW steering flow engine is chosen.Default configuration for
MLX5_IPOOL_JUMPipool specified entry size as size ofmlx5_flow_tbl_data_entrystruct, used with DV flow engine.
This could lead to memory corruption whenmlx5_flow_groupstruct (used with HW steering flow engine) would have bigger size thanmlx5_flow_tbl_data_entry.
Quoted 8 lines
This patch fixes that. Entry size for
MLX5_IPOOL_JUMPipool is chosen dynamically based on device configuration.Signed-off-by Dariusz Sosnowski <[email protected]>
Quoted 8 lines
--- drivers/net/mlx5/mlx5.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)drivers/net/mlx5/mlx5.c index renamed from drivers/net/mlx5/mlx5.c +0
-0
b373306f98..7c79cbb7be100644drivers/net/mlx5/mlx5.c +0
-0
Hi,
Quoted 21 lines
-----Original Message-----
From: Dariusz Sosnowski <[email protected]>
Sent: Friday, August 25, 2023 9:44 PM
To: Matan Azrad <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>
Cc: [email protected]; [email protected]
Subject: [PATCH] net/mlx5: fix jump ipool entry sizeIn mlx5 PMD,
MLX5_IPOOL_JUMPipool configuration is used to initialize the ipool containing either:- flow table entry when DV flow engine is chosen or,
- group table entry when HW steering flow engine is chosen.Default configuration for
MLX5_IPOOL_JUMPipool specified entry size as size ofmlx5_flow_tbl_data_entrystruct, used with DV flow engine. This could lead to memory corruption whenmlx5_flow_groupstruct (used with HW steering flow engine) would have bigger size thanmlx5_flow_tbl_data_entry.
Quoted 6 lines
This patch fixes that. Entry size for
MLX5_IPOOL_JUMPipool is chosen dynamically based on device configuration.
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh