mlx5: steering: use correct enum type
Subsystems (5)
PATCH 1/2 mlx5: steering: use correct enum type
The newly added code triggers a harmless warning with clang:
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1080:9: error: implicit conversion from enumeration type 'enum mlx5_reformat_ctx_type' to different enumeration type 'enum mlx5dr_action_type' [-Werror,-Wenum-conversion]
rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL;
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1084:51: error: implicit conversion from enumeration type 'enum mlx5dr_action_type' to different enumeration type 'enum mlx5_reformat_ctx_type' [-Werror,-Wenum-conversion]
ret = mlx5dr_cmd_create_reformat_ctx(dmn->mdev, rt, data_sz, data,
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~Change it to use mlx5_reformat_ctx_type instead of mlx5dr_action_type.
--- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c +1 -1
@@ -1074,7 +1074,7 @@ dr_action_create_reformat_action(struct mlx5dr_domain *dmn,case DR_ACTION_TYP_L2_TO_TNL_L2 :case DR_ACTION_TYP_L2_TO_TNL_L3 : { -enum mlx5dr_action_type rt; +enum mlx5_reformat_ctx_type rt;if (action->action_type ==DR_ACTION_TYP_L2_TO_TNL_L2 ) rt =MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL ;
Signature · 1 line
2.20.0
PATCH 2/2 mlx5: fix type mismatch
In mlx5, pointers to 'phys_addr_t' and 'u64' are mixed since the addition of the pool memory allocator, leading to incorrect behavior on 32-bit architectures and this compiler warning:
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c:121:8: error: incompatible pointer types passing 'u64 *' (aka 'unsigned long long *') to parameter of type 'phys_addr_t *' (aka 'unsigned int *') [-Werror,-Wincompatible-pointer-types]
&icm_mr->dm.addr, &icm_mr->dm.obj_id);
^~~~~~~~~~~~~~~~
include/linux/mlx5/driver.h:1092:39: note: passing argument to parameter 'addr' here
u64 length, u16 uid, phys_addr_t *addr, u32 *obj_id);Change the code to use 'u64' consistently in place of 'phys_addr_t' to fix this. The alternative of using phys_addr_t more would require a larger rework.
--- drivers/infiniband/hw/mlx5/cmd.c | 4 ++-- drivers/infiniband/hw/mlx5/cmd.h | 4 ++-- drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 4 ++-- include/linux/mlx5/driver.h | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
drivers/infiniband/hw/mlx5/cmd.c +2 -2
@@ -82,7 +82,7 @@ int mlx5_cmd_modify_cong_params(struct mlx5_core_dev *dev,return mlx5_cmd_exec (dev, in, in_size, out,sizeof (out)); } -int mlx5_cmd_alloc_memic (struct mlx5_dm *dm,phys_addr_t *addr, +int mlx5_cmd_alloc_memic (struct mlx5_dm *dm,u64 *addr,u64 length,u32 alignment) {struct mlx5_core_dev *dev = dm->dev;
@@ -157,7 +157,7 @@ int mlx5_cmd_alloc_memic(struct mlx5_dm *dm, phys_addr_t *addr,return -ENOMEM ; } -int mlx5_cmd_dealloc_memic (struct mlx5_dm *dm,phys_addr_t addr,u64 length) +int mlx5_cmd_dealloc_memic (struct mlx5_dm *dm,u64 addr,u64 length) {struct mlx5_core_dev *dev = dm->dev;u64 hw_start_addr =MLX5_CAP64_DEV_MEM (dev, memic_bar_start_addr);
drivers/infiniband/hw/mlx5/cmd.h +2 -2
@@ -44,9 +44,9 @@ int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point,int mlx5_cmd_query_ext_ppcnt_counters (struct mlx5_core_dev *dev,void *out);int mlx5_cmd_modify_cong_params (struct mlx5_core_dev *mdev,void *in,int in_size); -int mlx5_cmd_alloc_memic (struct mlx5_dm *dm,phys_addr_t *addr, +int mlx5_cmd_alloc_memic (struct mlx5_dm *dm,u64 *addr,u64 length,u32 alignment); -int mlx5_cmd_dealloc_memic (struct mlx5_dm *dm,phys_addr_t addr,u64 length); +int mlx5_cmd_dealloc_memic (struct mlx5_dm *dm,u64 addr,u64 length);void mlx5_cmd_dealloc_pd (struct mlx5_core_dev *dev,u32 pdn,u16 uid);void mlx5_cmd_destroy_tir (struct mlx5_core_dev *dev,u32 tirn,u16 uid);void mlx5_cmd_destroy_tis (struct mlx5_core_dev *dev,u32 tisn,u16 uid);
drivers/infiniband/hw/mlx5/mlx5_ib.h +1 -1
@@ -561,7 +561,7 @@ enum mlx5_ib_mtt_access_flags {struct mlx5_ib_dm {struct ib_dm ibdm; -phys_addr_t dev_addr; +u64 dev_addr;u32 type;size_t size;union {
drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c +2 -2
@@ -90,7 +90,7 @@ void mlx5_dm_cleanup(struct mlx5_core_dev *dev) }int mlx5_dm_sw_icm_alloc (struct mlx5_core_dev *dev,enum mlx5_sw_icm_type type, -u64 length,u16 uid,phys_addr_t *addr,u32 *obj_id) +u64 length,u16 uid,u64 *addr,u32 *obj_id) {u32 num_blocks =DIV_ROUND_UP_ULL (length,MLX5_SW_ICM_BLOCK_SIZE (dev));u32 out[MLX5_ST_SZ_DW (general_obj_out_cmd_hdr)] = {};
@@ -175,7 +175,7 @@ int mlx5_dm_sw_icm_alloc(struct mlx5_core_dev *dev, enum mlx5_sw_icm_type type,EXPORT_SYMBOL_GPL (mlx5_dm_sw_icm_alloc);int mlx5_dm_sw_icm_dealloc (struct mlx5_core_dev *dev,enum mlx5_sw_icm_type type, -u64 length,u16 uid,phys_addr_t addr,u32 obj_id) +u64 length,u16 uid,u64 addr,u32 obj_id) {u32 num_blocks =DIV_ROUND_UP_ULL (length,MLX5_SW_ICM_BLOCK_SIZE (dev));u32 out[MLX5_ST_SZ_DW (general_obj_out_cmd_hdr)] = {};
include/linux/mlx5/driver.h +2 -2
@@ -1089,9 +1089,9 @@ int mlx5_lag_query_cong_counters(struct mlx5_core_dev *dev,struct mlx5_uars_page *mlx5_get_uars_page (struct mlx5_core_dev *mdev);void mlx5_put_uars_page (struct mlx5_core_dev *mdev,struct mlx5_uars_page *up);int mlx5_dm_sw_icm_alloc (struct mlx5_core_dev *dev,enum mlx5_sw_icm_type type, -u64 length,u16 uid,phys_addr_t *addr,u32 *obj_id); +u64 length,u16 uid,u64 *addr,u32 *obj_id);int mlx5_dm_sw_icm_dealloc (struct mlx5_core_dev *dev,enum mlx5_sw_icm_type type, -u64 length,u16 uid,phys_addr_t addr,u32 obj_id); +u64 length,u16 uid,u64 addr,u32 obj_id);#ifdef CONFIG_MLX5_CORE_IPOIB struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev *mdev,
Signature · 1 line
2.20.0
Re: [PATCH net-next 2/2] mlx5: fix type mismatch
Quoted 17 lines · Arnd Bergmann
In mlx5, pointers to '
phys_addr_t' and 'u64' are mixed since the addition
of the pool memory allocator, leading to incorrect behavior on 32-bit architectures and this compiler warning:
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c:121:8:
error: incompatible pointer types passing 'u64 *' (aka 'unsigned long long *') to parameter of type 'phys_addr_t*' (aka 'unsigned int *') [-Werror,-Wincompatible-pointer-types]&icm_mr->dm.addr, &icm_mr-Quoted 1 line
dm.obj_id);
^~~~~~~~~~~~~~~~ include/linux/mlx5/driver.h:1092:39: note: passing argument to parameter 'addr' here u64 length, u16 uid, phys_addr_t *addr, u32
*obj_id);
Quoted 8 lines
Change the code to use 'u64' consistently in place of '
phys_addr_t' to
fix this. The alternative of usingphys_addr_tmore would require a larger
rework.Fixes 29cf8febd185 ("net/mlx5: DR, ICM pool memory allocator")Signed-off-by Arnd Bergmann <[email protected]>
Hi Arnd,
Nathan Chancellor Already submitted a patch to fix this and it is more minimal:
https://patchwork.ozlabs.org/patch/1158177/
I would like to use that patch if it is ok with you..
Quoted 128 lines
--- drivers/infiniband/hw/mlx5/cmd.c | 4 ++-- drivers/infiniband/hw/mlx5/cmd.h | 4 ++-- drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 4 ++-- include/linux/mlx5/driver.h | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)drivers/infiniband/hw/mlx5/cmd.c +1
-1@@ -82,7 +82,7 @@ int mlx5_cmd_modify_cong_params(structmlx5_core_dev *dev, return mlx5_cmd_exec(dev, in, in_size, out, sizeof(out)); } -int mlx5_cmd_alloc_memic (struct mlx5_dm *dm,phys_addr_t *addr, +int mlx5_cmd_alloc_memic (struct mlx5_dm *dm,u64 *addr,u64 length,u32 alignment) {drivers/infiniband/hw/mlx5/cmd.c +1
-1struct mlx5_core_dev *dev = dm->dev;@@ -157,7 +157,7 @@ int mlx5_cmd_alloc_memic(struct mlx5_dm *dm, phys_addr_t *addr, return -ENOMEM ; } -int mlx5_cmd_dealloc_memic (struct mlx5_dm *dm,phys_addr_t addr,u64 length) +int mlx5_cmd_dealloc_memic (struct mlx5_dm *dm,u64 addr,u64 length) {drivers/infiniband/hw/mlx5/cmd.c +0
-0struct mlx5_core_dev *dev = dm->dev; u64 hw_start_addr = MLX5_CAP64_DEV_MEM(dev,
memic_bar_start_addr);drivers/infiniband/hw/mlx5/cmd.h +2
-2@@ -44,9 +44,9 @@ int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point, int mlx5_cmd_query_ext_ppcnt_counters(struct mlx5_core_dev *dev,void *out);int mlx5_cmd_modify_cong_params (struct mlx5_core_dev *mdev,void *in,int in_size); -int mlx5_cmd_alloc_memic (struct mlx5_dm *dm,phys_addr_t *addr, +int mlx5_cmd_alloc_memic (struct mlx5_dm *dm,u64 *addr,u64 length,u32 alignment); -int mlx5_cmd_dealloc_memic (struct mlx5_dm *dm,phys_addr_t addr,u64 length); +int mlx5_cmd_dealloc_memic(struct mlx5_dm *dm, u64 addr, u64length);
void mlx5_cmd_dealloc_pd(structmlx5_core_dev*dev, u32 pdn, u16
uid);
void mlx5_cmd_destroy_tir(structmlx5_core_dev*dev, u32 tirn, u16
uid);
void mlx5_cmd_destroy_tis(structmlx5_core_dev*dev, u32 tisn, u16
uid);drivers/infiniband/hw/mlx5/mlx5_ib.h +1
-1@@ -561,7 +561,7 @@ enum mlx5_ib_mtt_access_flags {struct mlx5_ib_dm {struct ib_dm ibdm; -phys_addr_t dev_addr; +u64 dev_addr;u32 type;size_t size;union {drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c +1
-1@@ -90,7 +90,7 @@ void mlx5_dm_cleanup(struct mlx5_core_dev *dev) } int mlx5_dm_sw_icm_alloc(struct mlx5_core_dev *dev, enum mlx5_sw_icm_type type, -u64 length,u16 uid,phys_addr_t *addr,u32 *obj_id) + u64 length, u16 uid, u64 *addr, u32 *obj_id) {u32
num_blocks= DIV_ROUND_UP_ULL(length,MLX5_SW_ICM_BLOCK_SIZE(dev));drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c +1
-1u32 out[MLX5_ST_SZ_DW (general_obj_out_cmd_hdr)] = {};@@ -175,7 +175,7 @@ int mlx5_dm_sw_icm_alloc(struct mlx5_core_dev *dev, enum mlx5_sw_icm_type type,EXPORT_SYMBOL_GPL (mlx5_dm_sw_icm_alloc ); int mlx5_dm_sw_icm_dealloc(struct mlx5_core_dev *dev, enum mlx5_sw_icm_type type, -u64 length,u16 uid,phys_addr_t addr,u32 obj_id) + u64 length, u16 uid, u64 addr, u32 obj_id){
u32num_blocks= DIV_ROUND_UP_ULL(length,MLX5_SW_ICM_BLOCK_SIZE(dev));drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c +0
-0u32 out[MLX5_ST_SZ_DW (general_obj_out_cmd_hdr)] = {};include/linux/mlx5/driver.h +1
-1@@ -1089,9 +1089,9 @@ int mlx5_lag_query_cong_counters(structmlx5_core_dev *dev, struct mlx5_uars_page *mlx5_get_uars_page(struct mlx5_core_dev *mdev);void mlx5_put_uars_page (struct mlx5_core_dev *mdev,struct mlx5_uars_page *up);int mlx5_dm_sw_icm_alloc (struct mlx5_core_dev *dev,enum mlx5_sw_icm_type type, -u64 length,u16 uid,phys_addr_t *addr,u32 *obj_id); + u64 length, u16 uid, u64 *addr, u32 *obj_id);int mlx5_dm_sw_icm_dealloc(struct
mlx5_core_dev*dev, enummlx5_sw_icm_typetype,include/linux/mlx5/driver.h +0
-1- u64 length, u16 uid, phys_addr_t addr, u32
obj_id);include/linux/mlx5/driver.h +1
-0+ u64 length, u16 uid, u64 addr, u32 obj_id);#ifdef CONFIG_MLX5_CORE_IPOIB struct net_device *mlx5_rdma_netdev_alloc(struct mlx5_core_dev*mdev,
Re: [PATCH net-next 2/2] mlx5: fix type mismatch
Quoted 28 lines · Saeed Mahameed
Quoted 17 lines · Arnd Bergmann
In mlx5, pointers to '
phys_addr_t' and 'u64' are mixed since the addition
of the pool memory allocator, leading to incorrect behavior on 32-bit architectures and this compiler warning:
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c:121:8:
error: incompatible pointer types passing 'u64 *' (aka 'unsigned long long *') to parameter of type 'phys_addr_t*' (aka 'unsigned int *') [-Werror,-Wincompatible-pointer-types]&icm_mr->dm.addr, &icm_mr-Quoted 1 line
dm.obj_id);
^~~~~~~~~~~~~~~~ include/linux/mlx5/driver.h:1092:39: note: passing argument to parameter 'addr' here u64 length, u16 uid, phys_addr_t *addr, u32
*obj_id);Quoted 8 lines
Change the code to use 'u64' consistently in place of '
phys_addr_t' to
fix this. The alternative of usingphys_addr_tmore would require a larger
rework.Fixes 29cf8febd185 ("net/mlx5: DR, ICM pool memory allocator")Signed-off-by Arnd Bergmann <[email protected]>
Quoted 7 lines
Hi Arnd,
Nathan Chancellor Already submitted a patch to fix this and it is more minimal:
https://patchwork.ozlabs.org/patch/1158177/I would like to use that patch if it is ok with you..
Yes, please do. I think I had tried something like that initially and concluded it wasn't quite right before I went into a different direction with my patch.
Looking at the two versions now, I also prefer Nathan's, and I just confirmed that it fixes all the randconfig failures I ran into.
Arnd
Quoted 10 lines · Arnd Bergmann
The newly added code triggers a harmless warning with clang:
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1080:9: error: implicit conversion from enumeration type 'enummlx5_reformat_ctx_type' to different enumeration type 'enummlx5dr_action_type' [-Werror,-Wenum-conversion]rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL; ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1084:51: error: implicit conversion from enumeration type 'enum mlx5dr_action_type' to different enumeration type 'enum mlx5_reformat_ctx_type' [-Werror,-Wenum-conversion] ret = mlx5dr_cmd_create_reformat_ctx(dmn->mdev, rt, data_sz, data, ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~
Quoted 4 lines
Change it to use
mlx5_reformat_ctx_typeinstead ofmlx5dr_action_type.Fixes 9db810ed2d37 ("net/mlx5: DR, Expose steering action functionality")Signed-off-by Arnd Bergmann <[email protected]>
I sent the same fix a couple of days ago:
https://lore.kernel.org/netdev/[email protected]/
I don't care which patch goes in since they are the same thing so:
Quoted 17 lines · Nathan Chancellor
Quoted 10 lines · Arnd Bergmann
The newly added code triggers a harmless warning with clang:
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1080:9: error: implicit conversion from enumeration type 'enummlx5_reformat_ctx_type' to different enumeration type 'enummlx5dr_action_type' [-Werror,-Wenum-conversion]rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL; ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c:1084:51: error: implicit conversion from enumeration type 'enum mlx5dr_action_type' to different enumeration type 'enum mlx5_reformat_ctx_type' [-Werror,-Wenum-conversion] ret = mlx5dr_cmd_create_reformat_ctx(dmn->mdev, rt, data_sz, data, ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~Quoted 4 lines
Change it to use
mlx5_reformat_ctx_typeinstead ofmlx5dr_action_type.Fixes 9db810ed2d37 ("net/mlx5: DR, Expose steering action functionality")Signed-off-by Arnd Bergmann <[email protected]>
Quoted 7 lines
I sent the same fix a couple of days ago:
https://lore.kernel.org/netdev/[email protected]/
I don't care which patch goes in since they are the same thing so:
Reviewed-by Nathan Chancellor <[email protected]>
GCC recently gained support (via me scanning the commit logs for an unrelated feature) for -Wenum-warnings (though I think it's off by default) so hopefully these kinds of issues will taper off over time.
Signature · 2 lines
Thanks, ~Nick Desaulniers