diff mbox series

[v2] net/mlx5: fix compilation issue on ARM SOC

Message ID 20181016060517.122247-1-shahafs@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Shahaf Shuler
Headers
Series [v2] net/mlx5: fix compilation issue on ARM SOC |

Checks

Context Check Description
ci/Intel-compilation fail Compilation issues
ci/checkpatch success coding style OK

Commit Message

Shahaf Shuler Oct. 16, 2018, 6:05 a.m. UTC 
  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>
---

On v2:
 - changed pointer names.
 - added pointer for the tni and flow id mask

---
 drivers/net/mlx5/mlx5_flow_dv.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Ori Kam Oct. 16, 2018, 6:51 a.m. UTC | #1 
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Shahaf Shuler
> Sent: Tuesday, October 16, 2018 9:05 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 v2] 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>
> ---
> 
> On v2:
>  - changed pointer names.
>  - added pointer for the tni and flow id mask
> 
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index a013201eab..becbc57b55 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -780,6 +780,8 @@ 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_flow_id_m = (const char *)nvgre_m->tni;
> +	const char *tni_flow_id_v = (const char *)nvgre_v->tni;
>  	char *gre_key_m;
>  	char *gre_key_v;
>  	int size;
> @@ -792,9 +794,9 @@ flow_dv_translate_item_nvgre(void *matcher, void
> *key,
>  	size = sizeof(nvgre_m->tni) + sizeof(nvgre_m->flow_id);
>  	gre_key_m = MLX5_ADDR_OF(fte_match_set_misc, misc_m,
> gre_key_h);
>  	gre_key_v = MLX5_ADDR_OF(fte_match_set_misc, misc_v,
> gre_key_h);
> -	memcpy(gre_key_m, nvgre_m->tni, size);
> +	memcpy(gre_key_m, tni_flow_id_m, 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_flow_id_v[i];
>  	flow_dv_translate_item_gre(matcher, key, item, inner);
>  }
> 
> --
> 2.12.0


Acked-by: Ori Kam <orika@mellanox.com>

Thanks,
Ori
Shahaf Shuler Oct. 16, 2018, 7:48 a.m. UTC | #2 
Tuesday, October 16, 2018 9:51 AM, Ori Kam:
> Subject: RE: [dpdk-dev] [PATCH v2] net/mlx5: fix compilation issue on ARM
> SOC
> 
> 
> 
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Shahaf Shuler
> > Sent: Tuesday, October 16, 2018 9:05 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 v2] 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>
> > ---
> >
> > On v2:
> >  - changed pointer names.
> >  - added pointer for the tni and flow id mask
> >
> > ---

[...]

> > 2.12.0
> 
> 
> Acked-by: Ori Kam <orika@mellanox.com>

Applied to next-net-mlx, thanks. 

> 
> Thanks,
> Ori
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index a013201eab..becbc57b55 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -780,6 +780,8 @@  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_flow_id_m = (const char *)nvgre_m->tni;
+	const char *tni_flow_id_v = (const char *)nvgre_v->tni;
 	char *gre_key_m;
 	char *gre_key_v;
 	int size;
@@ -792,9 +794,9 @@  flow_dv_translate_item_nvgre(void *matcher, void *key,
 	size = sizeof(nvgre_m->tni) + sizeof(nvgre_m->flow_id);
 	gre_key_m = MLX5_ADDR_OF(fte_match_set_misc, misc_m, gre_key_h);
 	gre_key_v = MLX5_ADDR_OF(fte_match_set_misc, misc_v, gre_key_h);
-	memcpy(gre_key_m, nvgre_m->tni, size);
+	memcpy(gre_key_m, tni_flow_id_m, 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_flow_id_v[i];
 	flow_dv_translate_item_gre(matcher, key, item, inner);
 }