[dpdk-stable] patch 'net/mlx5: fix layer type in header modify action' has been queued to stable release 19.11.1
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Thu Feb 27 10:33:50 CET 2020
Hi,
FYI, your patch has been queued to stable release 19.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Thanks.
Luca Boccassi
---
>From 063e7d176d1b39241b780b33a79ce47515e3a730 Mon Sep 17 00:00:00 2001
From: Suanming Mou <suanmingm at mellanox.com>
Date: Wed, 19 Feb 2020 16:26:20 +0200
Subject: [PATCH] net/mlx5: fix layer type in header modify action
[ upstream commit 04233f36c712ea35fe0f1d02c5c6f323a28ec588 ]
Currently, for header modify actions after tunnel decapsulation, the
header modify actions will still select the old outermost layer type.
It will cause header modify actions get the wrong layer type.
Add the tunnel decap flag to indicate the layer type to get for header
modify actions.
Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct Verbs")
Signed-off-by: Suanming Mou <suanmingm at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
drivers/net/mlx5/mlx5_flow_dv.c | 68 +++++++++++++++++++++++++++------
1 file changed, 57 insertions(+), 11 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 9a79e6e7a4..e06892b530 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -82,19 +82,55 @@ union flow_dv_attr {
* Pointer to item specification.
* @param[out] attr
* Pointer to flow attributes structure.
+ * @param[in] tunnel_decap
+ * Whether action is after tunnel decapsulation.
*/
static void
-flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr)
+flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr,
+ bool tunnel_decap)
{
for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
+ uint8_t next_protocol = 0xff;
+
switch (item->type) {
+ case RTE_FLOW_ITEM_TYPE_GRE:
+ case RTE_FLOW_ITEM_TYPE_NVGRE:
+ case RTE_FLOW_ITEM_TYPE_VXLAN:
+ case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
+ case RTE_FLOW_ITEM_TYPE_GENEVE:
+ case RTE_FLOW_ITEM_TYPE_MPLS:
+ if (tunnel_decap)
+ attr->attr = 0;
+ break;
case RTE_FLOW_ITEM_TYPE_IPV4:
if (!attr->ipv6)
attr->ipv4 = 1;
+ if (item->mask != NULL &&
+ ((const struct rte_flow_item_ipv4 *)
+ item->mask)->hdr.next_proto_id)
+ next_protocol =
+ ((const struct rte_flow_item_ipv4 *)
+ (item->spec))->hdr.next_proto_id &
+ ((const struct rte_flow_item_ipv4 *)
+ (item->mask))->hdr.next_proto_id;
+ if ((next_protocol == IPPROTO_IPIP ||
+ next_protocol == IPPROTO_IPV6) && tunnel_decap)
+ attr->attr = 0;
break;
case RTE_FLOW_ITEM_TYPE_IPV6:
if (!attr->ipv4)
attr->ipv6 = 1;
+ if (item->mask != NULL &&
+ ((const struct rte_flow_item_ipv6 *)
+ item->mask)->hdr.proto)
+ next_protocol =
+ ((const struct rte_flow_item_ipv6 *)
+ (item->spec))->hdr.proto &
+ ((const struct rte_flow_item_ipv6 *)
+ (item->mask))->hdr.proto;
+ if ((next_protocol == IPPROTO_IPIP ||
+ next_protocol == IPPROTO_IPV6) && tunnel_decap)
+ attr->attr = 0;
break;
case RTE_FLOW_ITEM_TYPE_UDP:
if (!attr->tcp)
@@ -599,6 +635,8 @@ flow_dv_convert_action_modify_vlan_vid
* Pointer to rte_flow_item objects list.
* @param[in] attr
* Pointer to flow attributes structure.
+ * @param[in] tunnel_decap
+ * Whether action is after tunnel decapsulation.
* @param[out] error
* Pointer to the error structure.
*
@@ -610,7 +648,7 @@ flow_dv_convert_action_modify_tp
(struct mlx5_flow_dv_modify_hdr_resource *resource,
const struct rte_flow_action *action,
const struct rte_flow_item *items,
- union flow_dv_attr *attr,
+ union flow_dv_attr *attr, bool tunnel_decap,
struct rte_flow_error *error)
{
const struct rte_flow_action_set_tp *conf =
@@ -623,7 +661,7 @@ flow_dv_convert_action_modify_tp
struct field_modify_info *field;
if (!attr->valid)
- flow_dv_attr_init(items, attr);
+ flow_dv_attr_init(items, attr, tunnel_decap);
if (attr->udp) {
memset(&udp, 0, sizeof(udp));
memset(&udp_mask, 0, sizeof(udp_mask));
@@ -673,6 +711,8 @@ flow_dv_convert_action_modify_tp
* Pointer to rte_flow_item objects list.
* @param[in] attr
* Pointer to flow attributes structure.
+ * @param[in] tunnel_decap
+ * Whether action is after tunnel decapsulation.
* @param[out] error
* Pointer to the error structure.
*
@@ -684,7 +724,7 @@ flow_dv_convert_action_modify_ttl
(struct mlx5_flow_dv_modify_hdr_resource *resource,
const struct rte_flow_action *action,
const struct rte_flow_item *items,
- union flow_dv_attr *attr,
+ union flow_dv_attr *attr, bool tunnel_decap,
struct rte_flow_error *error)
{
const struct rte_flow_action_set_ttl *conf =
@@ -697,7 +737,7 @@ flow_dv_convert_action_modify_ttl
struct field_modify_info *field;
if (!attr->valid)
- flow_dv_attr_init(items, attr);
+ flow_dv_attr_init(items, attr, tunnel_decap);
if (attr->ipv4) {
memset(&ipv4, 0, sizeof(ipv4));
memset(&ipv4_mask, 0, sizeof(ipv4_mask));
@@ -733,6 +773,8 @@ flow_dv_convert_action_modify_ttl
* Pointer to rte_flow_item objects list.
* @param[in] attr
* Pointer to flow attributes structure.
+ * @param[in] tunnel_decap
+ * Whether action is after tunnel decapsulation.
* @param[out] error
* Pointer to the error structure.
*
@@ -743,7 +785,7 @@ static int
flow_dv_convert_action_modify_dec_ttl
(struct mlx5_flow_dv_modify_hdr_resource *resource,
const struct rte_flow_item *items,
- union flow_dv_attr *attr,
+ union flow_dv_attr *attr, bool tunnel_decap,
struct rte_flow_error *error)
{
struct rte_flow_item item;
@@ -754,7 +796,7 @@ flow_dv_convert_action_modify_dec_ttl
struct field_modify_info *field;
if (!attr->valid)
- flow_dv_attr_init(items, attr);
+ flow_dv_attr_init(items, attr, tunnel_decap);
if (attr->ipv4) {
memset(&ipv4, 0, sizeof(ipv4));
memset(&ipv4_mask, 0, sizeof(ipv4_mask));
@@ -7130,7 +7172,8 @@ cnt_err:
case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
if (flow_dv_convert_action_modify_tp
(mhdr_res, actions, items,
- &flow_attr, error))
+ &flow_attr, !!(action_flags &
+ MLX5_FLOW_ACTION_DECAP), error))
return -rte_errno;
action_flags |= actions->type ==
RTE_FLOW_ACTION_TYPE_SET_TP_SRC ?
@@ -7139,14 +7182,17 @@ cnt_err:
break;
case RTE_FLOW_ACTION_TYPE_DEC_TTL:
if (flow_dv_convert_action_modify_dec_ttl
- (mhdr_res, items, &flow_attr, error))
+ (mhdr_res, items, &flow_attr,
+ !!(action_flags &
+ MLX5_FLOW_ACTION_DECAP), error))
return -rte_errno;
action_flags |= MLX5_FLOW_ACTION_DEC_TTL;
break;
case RTE_FLOW_ACTION_TYPE_SET_TTL:
if (flow_dv_convert_action_modify_ttl
- (mhdr_res, actions, items,
- &flow_attr, error))
+ (mhdr_res, actions, items, &flow_attr,
+ !!(action_flags &
+ MLX5_FLOW_ACTION_DECAP), error))
return -rte_errno;
action_flags |= MLX5_FLOW_ACTION_SET_TTL;
break;
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-27 09:31:56.800429736 +0000
+++ 0030-net-mlx5-fix-layer-type-in-header-modify-action.patch 2020-02-27 09:31:55.795946313 +0000
@@ -1,8 +1,10 @@
-From 04233f36c712ea35fe0f1d02c5c6f323a28ec588 Mon Sep 17 00:00:00 2001
+From 063e7d176d1b39241b780b33a79ce47515e3a730 Mon Sep 17 00:00:00 2001
From: Suanming Mou <suanmingm at mellanox.com>
Date: Wed, 19 Feb 2020 16:26:20 +0200
Subject: [PATCH] net/mlx5: fix layer type in header modify action
+[ upstream commit 04233f36c712ea35fe0f1d02c5c6f323a28ec588 ]
+
Currently, for header modify actions after tunnel decapsulation, the
header modify actions will still select the old outermost layer type.
It will cause header modify actions get the wrong layer type.
@@ -11,7 +13,6 @@
modify actions.
Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct Verbs")
-Cc: stable at dpdk.org
Signed-off-by: Suanming Mou <suanmingm at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
@@ -20,10 +21,10 @@
1 file changed, 57 insertions(+), 11 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index caa0ff8bad..b6e50b14e1 100644
+index 9a79e6e7a4..e06892b530 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -85,19 +85,55 @@ union flow_dv_attr {
+@@ -82,19 +82,55 @@ union flow_dv_attr {
* Pointer to item specification.
* @param[out] attr
* Pointer to flow attributes structure.
@@ -80,7 +81,7 @@
break;
case RTE_FLOW_ITEM_TYPE_UDP:
if (!attr->tcp)
-@@ -604,6 +640,8 @@ flow_dv_convert_action_modify_vlan_vid
+@@ -599,6 +635,8 @@ flow_dv_convert_action_modify_vlan_vid
* Pointer to rte_flow_item objects list.
* @param[in] attr
* Pointer to flow attributes structure.
@@ -89,7 +90,7 @@
* @param[out] error
* Pointer to the error structure.
*
-@@ -615,7 +653,7 @@ flow_dv_convert_action_modify_tp
+@@ -610,7 +648,7 @@ flow_dv_convert_action_modify_tp
(struct mlx5_flow_dv_modify_hdr_resource *resource,
const struct rte_flow_action *action,
const struct rte_flow_item *items,
@@ -98,7 +99,7 @@
struct rte_flow_error *error)
{
const struct rte_flow_action_set_tp *conf =
-@@ -628,7 +666,7 @@ flow_dv_convert_action_modify_tp
+@@ -623,7 +661,7 @@ flow_dv_convert_action_modify_tp
struct field_modify_info *field;
if (!attr->valid)
@@ -107,7 +108,7 @@
if (attr->udp) {
memset(&udp, 0, sizeof(udp));
memset(&udp_mask, 0, sizeof(udp_mask));
-@@ -678,6 +716,8 @@ flow_dv_convert_action_modify_tp
+@@ -673,6 +711,8 @@ flow_dv_convert_action_modify_tp
* Pointer to rte_flow_item objects list.
* @param[in] attr
* Pointer to flow attributes structure.
@@ -116,7 +117,7 @@
* @param[out] error
* Pointer to the error structure.
*
-@@ -689,7 +729,7 @@ flow_dv_convert_action_modify_ttl
+@@ -684,7 +724,7 @@ flow_dv_convert_action_modify_ttl
(struct mlx5_flow_dv_modify_hdr_resource *resource,
const struct rte_flow_action *action,
const struct rte_flow_item *items,
@@ -125,7 +126,7 @@
struct rte_flow_error *error)
{
const struct rte_flow_action_set_ttl *conf =
-@@ -702,7 +742,7 @@ flow_dv_convert_action_modify_ttl
+@@ -697,7 +737,7 @@ flow_dv_convert_action_modify_ttl
struct field_modify_info *field;
if (!attr->valid)
@@ -134,7 +135,7 @@
if (attr->ipv4) {
memset(&ipv4, 0, sizeof(ipv4));
memset(&ipv4_mask, 0, sizeof(ipv4_mask));
-@@ -738,6 +778,8 @@ flow_dv_convert_action_modify_ttl
+@@ -733,6 +773,8 @@ flow_dv_convert_action_modify_ttl
* Pointer to rte_flow_item objects list.
* @param[in] attr
* Pointer to flow attributes structure.
@@ -143,7 +144,7 @@
* @param[out] error
* Pointer to the error structure.
*
-@@ -748,7 +790,7 @@ static int
+@@ -743,7 +785,7 @@ static int
flow_dv_convert_action_modify_dec_ttl
(struct mlx5_flow_dv_modify_hdr_resource *resource,
const struct rte_flow_item *items,
@@ -152,7 +153,7 @@
struct rte_flow_error *error)
{
struct rte_flow_item item;
-@@ -759,7 +801,7 @@ flow_dv_convert_action_modify_dec_ttl
+@@ -754,7 +796,7 @@ flow_dv_convert_action_modify_dec_ttl
struct field_modify_info *field;
if (!attr->valid)
@@ -161,7 +162,7 @@
if (attr->ipv4) {
memset(&ipv4, 0, sizeof(ipv4));
memset(&ipv4_mask, 0, sizeof(ipv4_mask));
-@@ -7463,7 +7505,8 @@ cnt_err:
+@@ -7130,7 +7172,8 @@ cnt_err:
case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
if (flow_dv_convert_action_modify_tp
(mhdr_res, actions, items,
@@ -171,7 +172,7 @@
return -rte_errno;
action_flags |= actions->type ==
RTE_FLOW_ACTION_TYPE_SET_TP_SRC ?
-@@ -7472,14 +7515,17 @@ cnt_err:
+@@ -7139,14 +7182,17 @@ cnt_err:
break;
case RTE_FLOW_ACTION_TYPE_DEC_TTL:
if (flow_dv_convert_action_modify_dec_ttl
More information about the stable
mailing list