* [dpdk-dev] [PATCH] net/mlx5: fix setting of item flags bitmap
@ 2019-07-18 19:42 Dekel Peled
2019-07-19 4:29 ` Slava Ovsiienko
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Dekel Peled @ 2019-07-18 19:42 UTC (permalink / raw)
To: yskoh, viacheslavo, shahafs; +Cc: jackmin, orika, dev
In functions flow_dv_translate() and flow_dv_validate(), the flow
items are scanned and each item is marked in item_flags bitmap.
The code handling some of the items was ported from another project,
where items are marked in a slightley different manner.
This patch fixes the setting of items in bitmap, adapting it to the
required manner.
Fixes: d53aa89aea91 ("net/mlx5: support matching on ICMP/ICMP6")
Fixes: 1242041c5601 ("net/mlx5: match GRE key and present bits")
Fixes: 2e4c987aad91 ("net/mlx5: validate Direct Rule E-Switch")
Signed-off-by: Dekel Peled <dekelp@mellanox.com>
---
drivers/net/mlx5/mlx5_flow_dv.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 45cd140..7240d3b 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -2883,7 +2883,7 @@ struct field_modify_info modify_tcp[] = {
(dev, items, attr, item_flags, error);
if (ret < 0)
return ret;
- last_item |= MLX5_FLOW_ITEM_PORT_ID;
+ last_item = MLX5_FLOW_ITEM_PORT_ID;
break;
case RTE_FLOW_ITEM_TYPE_ETH:
ret = mlx5_flow_validate_item_eth(items, item_flags,
@@ -2979,7 +2979,7 @@ struct field_modify_info modify_tcp[] = {
(items, item_flags, gre_item, error);
if (ret < 0)
return ret;
- item_flags |= MLX5_FLOW_LAYER_GRE_KEY;
+ last_item = MLX5_FLOW_LAYER_GRE_KEY;
break;
case RTE_FLOW_ITEM_TYPE_VXLAN:
ret = mlx5_flow_validate_item_vxlan(items, item_flags,
@@ -3017,7 +3017,7 @@ struct field_modify_info modify_tcp[] = {
error);
if (ret < 0)
return ret;
- item_flags |= MLX5_FLOW_LAYER_ICMP;
+ last_item = MLX5_FLOW_LAYER_ICMP;
break;
case RTE_FLOW_ITEM_TYPE_ICMP6:
ret = mlx5_flow_validate_item_icmp6(items, item_flags,
@@ -3025,7 +3025,7 @@ struct field_modify_info modify_tcp[] = {
error);
if (ret < 0)
return ret;
- item_flags |= MLX5_FLOW_LAYER_ICMP6;
+ last_item = MLX5_FLOW_LAYER_ICMP6;
break;
default:
return rte_flow_error_set(error, ENOTSUP,
@@ -5043,7 +5043,7 @@ struct field_modify_info modify_tcp[] = {
case RTE_FLOW_ITEM_TYPE_GRE_KEY:
flow_dv_translate_item_gre_key(match_mask,
match_value, items);
- item_flags |= MLX5_FLOW_LAYER_GRE_KEY;
+ last_item = MLX5_FLOW_LAYER_GRE_KEY;
break;
case RTE_FLOW_ITEM_TYPE_NVGRE:
flow_dv_translate_item_nvgre(match_mask, match_value,
@@ -5073,12 +5073,12 @@ struct field_modify_info modify_tcp[] = {
case RTE_FLOW_ITEM_TYPE_ICMP:
flow_dv_translate_item_icmp(match_mask, match_value,
items, tunnel);
- item_flags |= MLX5_FLOW_LAYER_ICMP;
+ last_item = MLX5_FLOW_LAYER_ICMP;
break;
case RTE_FLOW_ITEM_TYPE_ICMP6:
flow_dv_translate_item_icmp6(match_mask, match_value,
items, tunnel);
- item_flags |= MLX5_FLOW_LAYER_ICMP6;
+ last_item = MLX5_FLOW_LAYER_ICMP6;
break;
default:
break;
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH] net/mlx5: fix setting of item flags bitmap
2019-07-18 19:42 [dpdk-dev] [PATCH] net/mlx5: fix setting of item flags bitmap Dekel Peled
@ 2019-07-19 4:29 ` Slava Ovsiienko
2019-07-19 5:35 ` Jack Min
2019-07-21 7:53 ` Raslan Darawsheh
2 siblings, 0 replies; 4+ messages in thread
From: Slava Ovsiienko @ 2019-07-19 4:29 UTC (permalink / raw)
To: Dekel Peled, Yongseok Koh, Shahaf Shuler; +Cc: Jack Min, Ori Kam, dev
> -----Original Message-----
> From: Dekel Peled <dekelp@mellanox.com>
> Sent: Thursday, July 18, 2019 22:42
> To: Yongseok Koh <yskoh@mellanox.com>; Slava Ovsiienko
> <viacheslavo@mellanox.com>; Shahaf Shuler <shahafs@mellanox.com>
> Cc: Jack Min <jackmin@mellanox.com>; Ori Kam <orika@mellanox.com>;
> dev@dpdk.org
> Subject: [PATCH] net/mlx5: fix setting of item flags bitmap
>
> In functions flow_dv_translate() and flow_dv_validate(), the flow items are
> scanned and each item is marked in item_flags bitmap.
> The code handling some of the items was ported from another project,
> where items are marked in a slightley different manner.
>
> This patch fixes the setting of items in bitmap, adapting it to the required
> manner.
>
> Fixes: d53aa89aea91 ("net/mlx5: support matching on ICMP/ICMP6")
> Fixes: 1242041c5601 ("net/mlx5: match GRE key and present bits")
> Fixes: 2e4c987aad91 ("net/mlx5: validate Direct Rule E-Switch")
>
> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> ---
> drivers/net/mlx5/mlx5_flow_dv.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c index 45cd140..7240d3b 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -2883,7 +2883,7 @@ struct field_modify_info modify_tcp[] = {
> (dev, items, attr, item_flags, error);
> if (ret < 0)
> return ret;
> - last_item |= MLX5_FLOW_ITEM_PORT_ID;
> + last_item = MLX5_FLOW_ITEM_PORT_ID;
> break;
> case RTE_FLOW_ITEM_TYPE_ETH:
> ret = mlx5_flow_validate_item_eth(items,
> item_flags, @@ -2979,7 +2979,7 @@ struct field_modify_info modify_tcp[]
> = {
> (items, item_flags, gre_item, error);
> if (ret < 0)
> return ret;
> - item_flags |= MLX5_FLOW_LAYER_GRE_KEY;
> + last_item = MLX5_FLOW_LAYER_GRE_KEY;
> break;
> case RTE_FLOW_ITEM_TYPE_VXLAN:
> ret = mlx5_flow_validate_item_vxlan(items,
> item_flags, @@ -3017,7 +3017,7 @@ struct field_modify_info modify_tcp[]
> = {
> error);
> if (ret < 0)
> return ret;
> - item_flags |= MLX5_FLOW_LAYER_ICMP;
> + last_item = MLX5_FLOW_LAYER_ICMP;
> break;
> case RTE_FLOW_ITEM_TYPE_ICMP6:
> ret = mlx5_flow_validate_item_icmp6(items,
> item_flags, @@ -3025,7 +3025,7 @@ struct field_modify_info modify_tcp[]
> = {
> error);
> if (ret < 0)
> return ret;
> - item_flags |= MLX5_FLOW_LAYER_ICMP6;
> + last_item = MLX5_FLOW_LAYER_ICMP6;
> break;
> default:
> return rte_flow_error_set(error, ENOTSUP, @@ -
> 5043,7 +5043,7 @@ struct field_modify_info modify_tcp[] = {
> case RTE_FLOW_ITEM_TYPE_GRE_KEY:
> flow_dv_translate_item_gre_key(match_mask,
> match_value, items);
> - item_flags |= MLX5_FLOW_LAYER_GRE_KEY;
> + last_item = MLX5_FLOW_LAYER_GRE_KEY;
> break;
> case RTE_FLOW_ITEM_TYPE_NVGRE:
> flow_dv_translate_item_nvgre(match_mask,
> match_value, @@ -5073,12 +5073,12 @@ struct field_modify_info
> modify_tcp[] = {
> case RTE_FLOW_ITEM_TYPE_ICMP:
> flow_dv_translate_item_icmp(match_mask,
> match_value,
> items, tunnel);
> - item_flags |= MLX5_FLOW_LAYER_ICMP;
> + last_item = MLX5_FLOW_LAYER_ICMP;
> break;
> case RTE_FLOW_ITEM_TYPE_ICMP6:
> flow_dv_translate_item_icmp6(match_mask,
> match_value,
> items, tunnel);
> - item_flags |= MLX5_FLOW_LAYER_ICMP6;
> + last_item = MLX5_FLOW_LAYER_ICMP6;
> break;
> default:
> break;
> --
> 1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH] net/mlx5: fix setting of item flags bitmap
2019-07-18 19:42 [dpdk-dev] [PATCH] net/mlx5: fix setting of item flags bitmap Dekel Peled
2019-07-19 4:29 ` Slava Ovsiienko
@ 2019-07-19 5:35 ` Jack Min
2019-07-21 7:53 ` Raslan Darawsheh
2 siblings, 0 replies; 4+ messages in thread
From: Jack Min @ 2019-07-19 5:35 UTC (permalink / raw)
To: Dekel Peled; +Cc: Yongseok Koh, Slava Ovsiienko, Shahaf Shuler, Ori Kam, dev
On Thu, 19-07-18, 22:42, Dekel Peled wrote:
> In functions flow_dv_translate() and flow_dv_validate(), the flow
> items are scanned and each item is marked in item_flags bitmap.
> The code handling some of the items was ported from another project,
> where items are marked in a slightley different manner.
>
> This patch fixes the setting of items in bitmap, adapting it to the
> required manner.
>
> Fixes: d53aa89aea91 ("net/mlx5: support matching on ICMP/ICMP6")
> Fixes: 1242041c5601 ("net/mlx5: match GRE key and present bits")
> Fixes: 2e4c987aad91 ("net/mlx5: validate Direct Rule E-Switch")
>
> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Xiaoyu Min <jackmin@mellanox.com>
> ---
> drivers/net/mlx5/mlx5_flow_dv.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
> index 45cd140..7240d3b 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -2883,7 +2883,7 @@ struct field_modify_info modify_tcp[] = {
> (dev, items, attr, item_flags, error);
> if (ret < 0)
> return ret;
> - last_item |= MLX5_FLOW_ITEM_PORT_ID;
> + last_item = MLX5_FLOW_ITEM_PORT_ID;
> break;
> case RTE_FLOW_ITEM_TYPE_ETH:
> ret = mlx5_flow_validate_item_eth(items, item_flags,
> @@ -2979,7 +2979,7 @@ struct field_modify_info modify_tcp[] = {
> (items, item_flags, gre_item, error);
> if (ret < 0)
> return ret;
> - item_flags |= MLX5_FLOW_LAYER_GRE_KEY;
> + last_item = MLX5_FLOW_LAYER_GRE_KEY;
> break;
> case RTE_FLOW_ITEM_TYPE_VXLAN:
> ret = mlx5_flow_validate_item_vxlan(items, item_flags,
> @@ -3017,7 +3017,7 @@ struct field_modify_info modify_tcp[] = {
> error);
> if (ret < 0)
> return ret;
> - item_flags |= MLX5_FLOW_LAYER_ICMP;
> + last_item = MLX5_FLOW_LAYER_ICMP;
> break;
> case RTE_FLOW_ITEM_TYPE_ICMP6:
> ret = mlx5_flow_validate_item_icmp6(items, item_flags,
> @@ -3025,7 +3025,7 @@ struct field_modify_info modify_tcp[] = {
> error);
> if (ret < 0)
> return ret;
> - item_flags |= MLX5_FLOW_LAYER_ICMP6;
> + last_item = MLX5_FLOW_LAYER_ICMP6;
> break;
> default:
> return rte_flow_error_set(error, ENOTSUP,
> @@ -5043,7 +5043,7 @@ struct field_modify_info modify_tcp[] = {
> case RTE_FLOW_ITEM_TYPE_GRE_KEY:
> flow_dv_translate_item_gre_key(match_mask,
> match_value, items);
> - item_flags |= MLX5_FLOW_LAYER_GRE_KEY;
> + last_item = MLX5_FLOW_LAYER_GRE_KEY;
> break;
> case RTE_FLOW_ITEM_TYPE_NVGRE:
> flow_dv_translate_item_nvgre(match_mask, match_value,
> @@ -5073,12 +5073,12 @@ struct field_modify_info modify_tcp[] = {
> case RTE_FLOW_ITEM_TYPE_ICMP:
> flow_dv_translate_item_icmp(match_mask, match_value,
> items, tunnel);
> - item_flags |= MLX5_FLOW_LAYER_ICMP;
> + last_item = MLX5_FLOW_LAYER_ICMP;
> break;
> case RTE_FLOW_ITEM_TYPE_ICMP6:
> flow_dv_translate_item_icmp6(match_mask, match_value,
> items, tunnel);
> - item_flags |= MLX5_FLOW_LAYER_ICMP6;
> + last_item = MLX5_FLOW_LAYER_ICMP6;
> break;
> default:
> break;
> --
> 1.8.3.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH] net/mlx5: fix setting of item flags bitmap
2019-07-18 19:42 [dpdk-dev] [PATCH] net/mlx5: fix setting of item flags bitmap Dekel Peled
2019-07-19 4:29 ` Slava Ovsiienko
2019-07-19 5:35 ` Jack Min
@ 2019-07-21 7:53 ` Raslan Darawsheh
2 siblings, 0 replies; 4+ messages in thread
From: Raslan Darawsheh @ 2019-07-21 7:53 UTC (permalink / raw)
To: Dekel Peled, Yongseok Koh, Slava Ovsiienko, Shahaf Shuler
Cc: Jack Min, Ori Kam, dev
Hi,
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Dekel Peled
> Sent: Thursday, July 18, 2019 10:42 PM
> To: Yongseok Koh <yskoh@mellanox.com>; Slava Ovsiienko
> <viacheslavo@mellanox.com>; Shahaf Shuler <shahafs@mellanox.com>
> Cc: Jack Min <jackmin@mellanox.com>; Ori Kam <orika@mellanox.com>;
> dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/mlx5: fix setting of item flags bitmap
>
> In functions flow_dv_translate() and flow_dv_validate(), the flow
> items are scanned and each item is marked in item_flags bitmap.
> The code handling some of the items was ported from another project,
> where items are marked in a slightley different manner.
>
> This patch fixes the setting of items in bitmap, adapting it to the
> required manner.
>
> Fixes: d53aa89aea91 ("net/mlx5: support matching on ICMP/ICMP6")
> Fixes: 1242041c5601 ("net/mlx5: match GRE key and present bits")
> Fixes: 2e4c987aad91 ("net/mlx5: validate Direct Rule E-Switch")
>
> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> ---
> drivers/net/mlx5/mlx5_flow_dv.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
Applied to next-net-mlx,
Kindest regards
Raslan Darawsheh
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-21 7:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-18 19:42 [dpdk-dev] [PATCH] net/mlx5: fix setting of item flags bitmap Dekel Peled
2019-07-19 4:29 ` Slava Ovsiienko
2019-07-19 5:35 ` Jack Min
2019-07-21 7:53 ` Raslan Darawsheh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).