net/mlx5: fix compilation issue on ARM SOC
Checks
Commit Message
On some ARM environment, the below compilation error will be seen
dpdk/drivers/net/mlx5/mlx5_flow_dv.c: In function
'flow_dv_translate_item_nvgre':
/tmp/dpdk/drivers/net/mlx5/mlx5_flow_dv.c:785:22: error: pointer targets
in initialization differ in signedness [-Werror=pointer-sign]
const char *tni_v = nvgre_v->tni;
The reason for this error is that nvgre_v->tni is defined as byte array
in size of 3B. However the code in the function iterate till the 4B in
order to copy/set also the subsequent field after it (flow_id)
Fixing by pointing to this struct from a different pointer.
Fixes: fc2c498ccb94 ("net/mlx5: add Direct Verbs translate items")
Cc: orika@mellanox.com
Cc: xuemingl@mellanox.com
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
drivers/net/mlx5/mlx5_flow_dv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Comments
Hi
Small nit otherwise acked.
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Shahaf Shuler
> Sent: Monday, October 15, 2018 11:24 AM
> To: Yongseok Koh <yskoh@mellanox.com>
> Cc: dev@dpdk.org; Ori Kam <orika@mellanox.com>; Xueming(Steven) Li
> <xuemingl@mellanox.com>
> Subject: [dpdk-dev] [PATCH] net/mlx5: fix compilation issue on ARM SOC
>
> On some ARM environment, the below compilation error will be seen
>
> dpdk/drivers/net/mlx5/mlx5_flow_dv.c: In function
> 'flow_dv_translate_item_nvgre':
> /tmp/dpdk/drivers/net/mlx5/mlx5_flow_dv.c:785:22: error: pointer targets
> in initialization differ in signedness [-Werror=pointer-sign]
> const char *tni_v = nvgre_v->tni;
>
> The reason for this error is that nvgre_v->tni is defined as byte array
> in size of 3B. However the code in the function iterate till the 4B in
> order to copy/set also the subsequent field after it (flow_id)
>
> Fixing by pointing to this struct from a different pointer.
>
> Fixes: fc2c498ccb94 ("net/mlx5: add Direct Verbs translate items")
> Cc: orika@mellanox.com
> Cc: xuemingl@mellanox.com
>
> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
> ---
> drivers/net/mlx5/mlx5_flow_dv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index a013201eab..05df8d51a4 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -780,6 +780,7 @@ flow_dv_translate_item_nvgre(void *matcher, void
> *key,
> const struct rte_flow_item_nvgre *nvgre_v = item->spec;
> void *misc_m = MLX5_ADDR_OF(fte_match_param, matcher,
> misc_parameters);
> void *misc_v = MLX5_ADDR_OF(fte_match_param, key,
> misc_parameters);
> + const char *tni_v = (const char *)&nvgre_v->tni;
What about creating also tni_m?
Also to avoid confusion maybe change to nvgre_id?
> char *gre_key_m;
> char *gre_key_v;
> int size;
> @@ -794,7 +795,7 @@ flow_dv_translate_item_nvgre(void *matcher, void
> *key,
> gre_key_v = MLX5_ADDR_OF(fte_match_set_misc, misc_v,
> gre_key_h);
> memcpy(gre_key_m, nvgre_m->tni, size);
> for (i = 0; i < size; ++i)
> - gre_key_v[i] = gre_key_m[i] & ((const char *)(nvgre_v->tni))[i];
> + gre_key_v[i] = gre_key_m[i] & tni_v[i];
> flow_dv_translate_item_gre(matcher, key, item, inner);
> }
>
> --
> 2.12.0
Thanks,
Ori
@@ -780,6 +780,7 @@ flow_dv_translate_item_nvgre(void *matcher, void *key,
const struct rte_flow_item_nvgre *nvgre_v = item->spec;
void *misc_m = MLX5_ADDR_OF(fte_match_param, matcher, misc_parameters);
void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters);
+ const char *tni_v = (const char *)&nvgre_v->tni;
char *gre_key_m;
char *gre_key_v;
int size;
@@ -794,7 +795,7 @@ flow_dv_translate_item_nvgre(void *matcher, void *key,
gre_key_v = MLX5_ADDR_OF(fte_match_set_misc, misc_v, gre_key_h);
memcpy(gre_key_m, nvgre_m->tni, size);
for (i = 0; i < size; ++i)
- gre_key_v[i] = gre_key_m[i] & ((const char *)(nvgre_v->tni))[i];
+ gre_key_v[i] = gre_key_m[i] & tni_v[i];
flow_dv_translate_item_gre(matcher, key, item, inner);
}