From: Rongwei Liu <rongweil@nvidia.com>
To: <dev@dpdk.org>, <matan@nvidia.com>, <viacheslavo@nvidia.com>,
<orika@nvidia.com>, <suanmingm@nvidia.com>, <thomas@monjalon.net>
Cc: <michaelba@nvidia.com>, <stable@dpdk.org>,
Dariusz Sosnowski <dsosnowski@nvidia.com>
Subject: [PATCH v2 2/2] net/mlx5: fix modify flex item error
Date: Fri, 23 Feb 2024 05:21:55 +0200 [thread overview]
Message-ID: <20240223032155.182162-3-rongweil@nvidia.com> (raw)
In-Reply-To: <20240223032155.182162-1-rongweil@nvidia.com>
In the rte_flow_field_data structure, the flex item handle is part
of union with other members like level/tag_index.
If the user wants to modify the flex item as source or destination,
there should not be any checking against zero.
Signed-off-by: Rongwei Liu <rongweil@nvidia.com>
Fixes: c23626f27b09 ("ethdev: add MPLS header modification")
Cc: michaelba@nvidia.com
Cc: stable@dpdk.org
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
drivers/net/mlx5/mlx5_flow.c | 2 +-
drivers/net/mlx5/mlx5_flow_hw.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 2b2ae62618..d8ed1ed6f6 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2384,7 +2384,7 @@ int
flow_validate_modify_field_level(const struct rte_flow_field_data *data,
struct rte_flow_error *error)
{
- if (data->level == 0)
+ if (data->level == 0 || data->field == RTE_FLOW_FIELD_FLEX_ITEM)
return 0;
if (data->field != RTE_FLOW_FIELD_TAG &&
data->field != (enum rte_flow_field_id)MLX5_RTE_FLOW_FIELD_META_REG)
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index bcf43f5457..5b269b9c82 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -5036,7 +5036,8 @@ flow_hw_validate_action_modify_field(struct rte_eth_dev *dev,
ret = flow_validate_modify_field_level(&action_conf->dst, error);
if (ret)
return ret;
- if (!flow_hw_modify_field_is_geneve_opt(action_conf->dst.field)) {
+ if (action_conf->dst.field != RTE_FLOW_FIELD_FLEX_ITEM &&
+ !flow_hw_modify_field_is_geneve_opt(action_conf->dst.field)) {
if (action_conf->dst.tag_index &&
!flow_modify_field_support_tag_array(action_conf->dst.field))
return rte_flow_error_set(error, EINVAL,
@@ -5061,7 +5062,8 @@ flow_hw_validate_action_modify_field(struct rte_eth_dev *dev,
"destination field mask and template are not equal");
if (action_conf->src.field != RTE_FLOW_FIELD_POINTER &&
action_conf->src.field != RTE_FLOW_FIELD_VALUE) {
- if (!flow_hw_modify_field_is_geneve_opt(action_conf->src.field)) {
+ if (action_conf->src.field != RTE_FLOW_FIELD_FLEX_ITEM &&
+ !flow_hw_modify_field_is_geneve_opt(action_conf->src.field)) {
if (action_conf->src.tag_index &&
!flow_modify_field_support_tag_array(action_conf->src.field))
return rte_flow_error_set(error, EINVAL,
--
2.27.0
next prev parent reply other threads:[~2024-02-23 3:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-21 7:10 [PATCH v1 0/2] fix flex item modify error Rongwei Liu
2024-02-21 7:10 ` [PATCH v1 1/2] app/testpmd: fix modify tag typo Rongwei Liu
2024-02-21 16:33 ` Ferruh Yigit
2024-02-21 16:42 ` Ferruh Yigit
2024-02-22 3:06 ` rongwei liu
2024-02-21 7:10 ` [PATCH v1 2/2] net/mlx5: fix modify flex item error Rongwei Liu
2024-02-21 16:35 ` Ferruh Yigit
2024-02-23 3:21 ` [PATCH v2 0/2] Fix " Rongwei Liu
2024-02-23 3:21 ` [PATCH v2 1/2] app/testpmd: fix modify tag typo Rongwei Liu
2024-02-23 12:06 ` Ferruh Yigit
2024-02-23 3:21 ` Rongwei Liu [this message]
2024-02-23 12:06 ` [PATCH v2 0/2] Fix modify flex item error Ferruh Yigit
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=20240223032155.182162-3-rongweil@nvidia.com \
--to=rongweil@nvidia.com \
--cc=dev@dpdk.org \
--cc=dsosnowski@nvidia.com \
--cc=matan@nvidia.com \
--cc=michaelba@nvidia.com \
--cc=orika@nvidia.com \
--cc=stable@dpdk.org \
--cc=suanmingm@nvidia.com \
--cc=thomas@monjalon.net \
--cc=viacheslavo@nvidia.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).