From: Dekel Peled <dekelp@mellanox.com>
To: matan@mellanox.com, viacheslavo@mellanox.com
Cc: rasland@mellanox.com, orika@mellanox.com, dev@dpdk.org, stable@dpdk.org
Subject: [dpdk-dev] [PATCH 04/11] net/mlx5: fix allow push VLAN without VID value
Date: Wed, 22 Jan 2020 16:27:16 +0200 [thread overview]
Message-ID: <dcc91827e7ef417a1c0e5a2a7b793233d36f6ca1.1579703134.git.dekelp@mellanox.com> (raw)
In-Reply-To: <cover.1579703134.git.dekelp@mellanox.com>
Currently the push VLAN action requires a VID value, either from
existing VLAN item, or from following 'set VLAN vid' action.
This patch removes this limitation, allowing a push VLAN action with
vid value 0.
Fixes: b8c0372bc5ac ("net/mlx5: fix set VLAN ID/PCP in new header")
Cc: stable@dpdk.org
Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Ori Kam <orika@mellanox.com>
---
drivers/net/mlx5/mlx5_flow_dv.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index d7176c8..59ece01 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1734,7 +1734,7 @@ struct field_modify_info modify_tcp[] = {
*/
static int
flow_dv_validate_action_push_vlan(uint64_t action_flags,
- uint64_t item_flags,
+ uint64_t item_flags __rte_unused,
const struct rte_flow_action *action,
const struct rte_flow_attr *attr,
struct rte_flow_error *error)
@@ -1751,14 +1751,6 @@ struct field_modify_info modify_tcp[] = {
RTE_FLOW_ERROR_TYPE_ACTION, action,
"no support for multiple VLAN "
"actions");
- if (!mlx5_flow_find_action
- (action + 1, RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID) &&
- !(item_flags & MLX5_FLOW_LAYER_OUTER_VLAN))
- return rte_flow_error_set(error, ENOTSUP,
- RTE_FLOW_ERROR_TYPE_ACTION, action,
- "push VLAN needs to match on VLAN in order to "
- "get VLAN VID information because there is "
- "no followed set VLAN VID action");
if (action_flags & MLX5_FLOW_ACTION_PORT_ID)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, action,
--
1.8.3.1
next prev parent reply other threads:[~2020-01-22 14:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 14:27 [dpdk-dev] [PATCH 00/11] net/mlx5: vlan actions validation fixes Dekel Peled
2020-01-22 14:27 ` [dpdk-dev] [PATCH 01/11] net/mlx5: fix masks of encap and decap actions Dekel Peled
2020-01-23 7:56 ` Slava Ovsiienko
2020-01-22 14:27 ` [dpdk-dev] [PATCH 02/11] net/mlx5: fix invalid check for VLAN actions Dekel Peled
2020-01-23 7:56 ` Slava Ovsiienko
2020-01-22 14:27 ` [dpdk-dev] [PATCH 03/11] net/mlx5: fix bit mask used for push VLAN validate Dekel Peled
2020-01-23 7:56 ` Slava Ovsiienko
2020-01-22 14:27 ` Dekel Peled [this message]
2020-01-23 7:57 ` [dpdk-dev] [PATCH 04/11] net/mlx5: fix allow push VLAN without VID value Slava Ovsiienko
2020-01-22 14:27 ` [dpdk-dev] [PATCH 05/11] net/mlx5: unify validation of drop action Dekel Peled
2020-01-23 7:57 ` Slava Ovsiienko
2020-01-22 14:27 ` [dpdk-dev] [PATCH 06/11] net/mlx5: fix block push VLAN action on Rx Dekel Peled
2020-01-23 7:57 ` Slava Ovsiienko
2020-01-22 14:27 ` [dpdk-dev] [PATCH 07/11] net/mlx5: fix block pop VLAN action on Tx Dekel Peled
2020-01-23 7:57 ` Slava Ovsiienko
2020-01-22 14:27 ` [dpdk-dev] [PATCH 08/11] net/mlx5: fix pop VLAN action validation function Dekel Peled
2020-01-23 7:57 ` Slava Ovsiienko
2020-01-22 14:27 ` [dpdk-dev] [PATCH 09/11] net/mlx5: fix the set VLAN VID action validation Dekel Peled
2020-01-23 7:58 ` Slava Ovsiienko
2020-01-22 14:27 ` [dpdk-dev] [PATCH 10/11] net/mlx5: update description of validation funcs Dekel Peled
2020-01-23 7:58 ` Slava Ovsiienko
2020-01-22 14:27 ` [dpdk-dev] [PATCH 11/11] doc: update MLX5 supported hardware offloads table Dekel Peled
2020-01-23 7:58 ` Slava Ovsiienko
2020-01-26 15:48 ` [dpdk-dev] [PATCH 00/11] net/mlx5: vlan actions validation fixes Raslan Darawsheh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dcc91827e7ef417a1c0e5a2a7b793233d36f6ca1.1579703134.git.dekelp@mellanox.com \
--to=dekelp@mellanox.com \
--cc=dev@dpdk.org \
--cc=matan@mellanox.com \
--cc=orika@mellanox.com \
--cc=rasland@mellanox.com \
--cc=stable@dpdk.org \
--cc=viacheslavo@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).