From: Gregory Etelson <getelson@nvidia.com>
To: <dev@dpdk.org>
Cc: <getelson@nvidia.com>, <mkashani@nvidia.com>,
<rasland@nvidia.com>, Rongwei Liu <rongweil@nvidia.com>,
Erez Shitrit <erezsh@nvidia.com>, Ori Kam <orika@nvidia.com>,
Matan Azrad <matan@nvidia.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
Suanming Mou <suanmingm@nvidia.com>
Subject: [PATCH 30/30] net/mlx5/hws: add stc reparse support for srv6 push pop
Date: Sun, 29 Oct 2023 18:32:02 +0200 [thread overview]
Message-ID: <20231029163202.216450-30-getelson@nvidia.com> (raw)
In-Reply-To: <20231029163202.216450-1-getelson@nvidia.com>
From: Rongwei Liu <rongweil@nvidia.com>
After pushing/popping srv6 into/from IPv6 packets, the checksum
needs to be correct.
In order to achieve this, there is a need to control each STE' reparse
behavior(CX7 and above). Add two more flags enumeration definitions to
allow external control of reparse property in stc.
1. Push
a. 1st STE, insert header action, reparse ignored(default reparse
always)
b. 2nd STE, modify IPv6 protocol, reparse always as default.
c. 3rd STE, modify header list, reparse always(default reparse
ignored)
2. Pop
a. 1st STE, modify header list, reparse always(default reparse
ignored)
b. 2nd STE, modify header list, reparse always(default reparse
ignored)
c. 3rd STE, modify IPv6 protocol, reparse ignored(default reparse
always); remove header action, reparse always as default.
For CX6Lx and CX6Dx, the reparse behavior is controlled by RTC as
always. Only pop action can work well.
Signed-off-by: Rongwei Liu <rongweil@nvidia.com>
Reviewed-by: Erez Shitrit <erezsh@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
---
drivers/net/mlx5/hws/mlx5dr_action.c | 115 +++++++++++++++++++--------
drivers/net/mlx5/hws/mlx5dr_action.h | 7 ++
2 files changed, 87 insertions(+), 35 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c
index 281b09a582..daeabead2a 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.c
+++ b/drivers/net/mlx5/hws/mlx5dr_action.c
@@ -640,6 +640,7 @@ static void mlx5dr_action_fill_stc_attr(struct mlx5dr_action *action,
case MLX5DR_ACTION_TYP_REFORMAT_TNL_L3_TO_L2:
case MLX5DR_ACTION_TYP_MODIFY_HDR:
attr->action_offset = MLX5DR_ACTION_OFFSET_DW6;
+ attr->reparse_mode = MLX5_IFC_STC_REPARSE_IGNORE;
if (action->modify_header.require_reparse)
attr->reparse_mode = MLX5_IFC_STC_REPARSE_ALWAYS;
@@ -678,9 +679,12 @@ static void mlx5dr_action_fill_stc_attr(struct mlx5dr_action *action,
case MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2:
case MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3:
case MLX5DR_ACTION_TYP_INSERT_HEADER:
+ attr->reparse_mode = MLX5_IFC_STC_REPARSE_ALWAYS;
+ if (!action->reformat.require_reparse)
+ attr->reparse_mode = MLX5_IFC_STC_REPARSE_IGNORE;
+
attr->action_type = MLX5_IFC_STC_ACTION_TYPE_HEADER_INSERT;
attr->action_offset = MLX5DR_ACTION_OFFSET_DW6;
- attr->reparse_mode = MLX5_IFC_STC_REPARSE_ALWAYS;
attr->insert_header.encap = action->reformat.encap;
attr->insert_header.insert_anchor = action->reformat.anchor;
attr->insert_header.arg_id = action->reformat.arg_obj->id;
@@ -1441,7 +1445,7 @@ static int
mlx5dr_action_handle_insert_with_ptr(struct mlx5dr_action *action,
uint8_t num_of_hdrs,
struct mlx5dr_action_reformat_header *hdrs,
- uint32_t log_bulk_sz)
+ uint32_t log_bulk_sz, uint32_t reparse)
{
struct mlx5dr_devx_obj *arg_obj;
size_t max_sz = 0;
@@ -1478,6 +1482,11 @@ mlx5dr_action_handle_insert_with_ptr(struct mlx5dr_action *action,
action[i].reformat.encap = 1;
}
+ if (likely(reparse == MLX5DR_ACTION_STC_REPARSE_DEFAULT))
+ action[i].reformat.require_reparse = true;
+ else if (reparse == MLX5DR_ACTION_STC_REPARSE_ON)
+ action[i].reformat.require_reparse = true;
+
ret = mlx5dr_action_create_stcs(&action[i], NULL);
if (ret) {
DR_LOG(ERR, "Failed to create stc for reformat");
@@ -1514,7 +1523,8 @@ mlx5dr_action_handle_l2_to_tunnel_l3(struct mlx5dr_action *action,
ret = mlx5dr_action_handle_insert_with_ptr(action,
num_of_hdrs,
hdrs,
- log_bulk_sz);
+ log_bulk_sz,
+ MLX5DR_ACTION_STC_REPARSE_DEFAULT);
if (ret)
goto put_shared_stc;
@@ -1657,7 +1667,8 @@ mlx5dr_action_create_reformat_hws(struct mlx5dr_action *action,
ret = mlx5dr_action_create_stcs(action, NULL);
break;
case MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2:
- ret = mlx5dr_action_handle_insert_with_ptr(action, num_of_hdrs, hdrs, bulk_size);
+ ret = mlx5dr_action_handle_insert_with_ptr(action, num_of_hdrs, hdrs, bulk_size,
+ MLX5DR_ACTION_STC_REPARSE_DEFAULT);
break;
case MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3:
ret = mlx5dr_action_handle_l2_to_tunnel_l3(action, num_of_hdrs, hdrs, bulk_size);
@@ -1765,7 +1776,8 @@ static int
mlx5dr_action_create_modify_header_hws(struct mlx5dr_action *action,
uint8_t num_of_patterns,
struct mlx5dr_action_mh_pattern *pattern,
- uint32_t log_bulk_size)
+ uint32_t log_bulk_size,
+ uint32_t reparse)
{
struct mlx5dr_devx_obj *pat_obj, *arg_obj = NULL;
struct mlx5dr_context *ctx = action->ctx;
@@ -1799,8 +1811,12 @@ mlx5dr_action_create_modify_header_hws(struct mlx5dr_action *action,
action[i].modify_header.num_of_patterns = num_of_patterns;
action[i].modify_header.max_num_of_actions = max_mh_actions;
action[i].modify_header.num_of_actions = num_actions;
- action[i].modify_header.require_reparse =
- mlx5dr_pat_require_reparse(pattern[i].data, num_actions);
+
+ if (likely(reparse == MLX5DR_ACTION_STC_REPARSE_DEFAULT))
+ action[i].modify_header.require_reparse =
+ mlx5dr_pat_require_reparse(pattern[i].data, num_actions);
+ else if (reparse == MLX5DR_ACTION_STC_REPARSE_ON)
+ action[i].modify_header.require_reparse = true;
if (num_actions == 1) {
pat_obj = NULL;
@@ -1843,12 +1859,12 @@ mlx5dr_action_create_modify_header_hws(struct mlx5dr_action *action,
return rte_errno;
}
-struct mlx5dr_action *
-mlx5dr_action_create_modify_header(struct mlx5dr_context *ctx,
- uint8_t num_of_patterns,
- struct mlx5dr_action_mh_pattern *patterns,
- uint32_t log_bulk_size,
- uint32_t flags)
+static struct mlx5dr_action *
+mlx5dr_action_create_modify_header_reparse(struct mlx5dr_context *ctx,
+ uint8_t num_of_patterns,
+ struct mlx5dr_action_mh_pattern *patterns,
+ uint32_t log_bulk_size,
+ uint32_t flags, uint32_t reparse)
{
struct mlx5dr_action *action;
int ret;
@@ -1896,7 +1912,8 @@ mlx5dr_action_create_modify_header(struct mlx5dr_context *ctx,
ret = mlx5dr_action_create_modify_header_hws(action,
num_of_patterns,
patterns,
- log_bulk_size);
+ log_bulk_size,
+ reparse);
if (ret)
goto free_action;
@@ -1907,6 +1924,17 @@ mlx5dr_action_create_modify_header(struct mlx5dr_context *ctx,
return NULL;
}
+struct mlx5dr_action *
+mlx5dr_action_create_modify_header(struct mlx5dr_context *ctx,
+ uint8_t num_of_patterns,
+ struct mlx5dr_action_mh_pattern *patterns,
+ uint32_t log_bulk_size,
+ uint32_t flags)
+{
+ return mlx5dr_action_create_modify_header_reparse(ctx, num_of_patterns, patterns,
+ log_bulk_size, flags,
+ MLX5DR_ACTION_STC_REPARSE_DEFAULT);
+}
static struct mlx5dr_devx_obj *
mlx5dr_action_dest_array_process_reformat(struct mlx5dr_context *ctx,
enum mlx5dr_action_type type,
@@ -2254,12 +2282,12 @@ mlx5dr_action_create_reformat_trailer(struct mlx5dr_context *ctx,
return action;
}
-struct mlx5dr_action *
-mlx5dr_action_create_insert_header(struct mlx5dr_context *ctx,
- uint8_t num_of_hdrs,
- struct mlx5dr_action_insert_header *hdrs,
- uint32_t log_bulk_size,
- uint32_t flags)
+static struct mlx5dr_action *
+mlx5dr_action_create_insert_header_reparse(struct mlx5dr_context *ctx,
+ uint8_t num_of_hdrs,
+ struct mlx5dr_action_insert_header *hdrs,
+ uint32_t log_bulk_size,
+ uint32_t flags, uint32_t reparse)
{
struct mlx5dr_action_reformat_header *reformat_hdrs;
struct mlx5dr_action *action;
@@ -2312,7 +2340,8 @@ mlx5dr_action_create_insert_header(struct mlx5dr_context *ctx,
}
ret = mlx5dr_action_handle_insert_with_ptr(action, num_of_hdrs,
- reformat_hdrs, log_bulk_size);
+ reformat_hdrs, log_bulk_size,
+ reparse);
if (ret) {
DR_LOG(ERR, "Failed to create HWS reformat action");
goto free_reformat_hdrs;
@@ -2329,6 +2358,18 @@ mlx5dr_action_create_insert_header(struct mlx5dr_context *ctx,
return NULL;
}
+struct mlx5dr_action *
+mlx5dr_action_create_insert_header(struct mlx5dr_context *ctx,
+ uint8_t num_of_hdrs,
+ struct mlx5dr_action_insert_header *hdrs,
+ uint32_t log_bulk_size,
+ uint32_t flags)
+{
+ return mlx5dr_action_create_insert_header_reparse(ctx, num_of_hdrs, hdrs,
+ log_bulk_size, flags,
+ MLX5DR_ACTION_STC_REPARSE_DEFAULT);
+}
+
struct mlx5dr_action *
mlx5dr_action_create_remove_header(struct mlx5dr_context *ctx,
struct mlx5dr_action_remove_header_attr *attr,
@@ -2422,8 +2463,9 @@ mlx5dr_action_create_pop_ipv6_route_ext_mhdr1(struct mlx5dr_action *action)
pattern.data = cmd;
pattern.sz = sizeof(cmd);
- return mlx5dr_action_create_modify_header(action->ctx, 1, &pattern,
- 0, action->flags);
+ return mlx5dr_action_create_modify_header_reparse(action->ctx, 1, &pattern, 0,
+ action->flags,
+ MLX5DR_ACTION_STC_REPARSE_ON);
}
static void *
@@ -2469,8 +2511,9 @@ mlx5dr_action_create_pop_ipv6_route_ext_mhdr2(struct mlx5dr_action *action)
pattern.data = cmd;
pattern.sz = sizeof(cmd);
- return mlx5dr_action_create_modify_header(action->ctx, 1, &pattern,
- 0, action->flags);
+ return mlx5dr_action_create_modify_header_reparse(action->ctx, 1, &pattern, 0,
+ action->flags,
+ MLX5DR_ACTION_STC_REPARSE_ON);
}
static void *
@@ -2496,8 +2539,9 @@ mlx5dr_action_create_pop_ipv6_route_ext_mhdr3(struct mlx5dr_action *action)
pattern.data = (__be64 *)cmd;
pattern.sz = sizeof(cmd);
- return mlx5dr_action_create_modify_header(action->ctx, 1, &pattern,
- 0, action->flags);
+ return mlx5dr_action_create_modify_header_reparse(action->ctx, 1, &pattern, 0,
+ action->flags,
+ MLX5DR_ACTION_STC_REPARSE_OFF);
}
static int
@@ -2644,8 +2688,9 @@ mlx5dr_action_create_push_ipv6_route_ext(struct mlx5dr_action *action,
insert_hdr.hdr.sz = hdr->sz;
insert_hdr.hdr.data = header;
action->ipv6_route_ext.action[0] =
- mlx5dr_action_create_insert_header(action->ctx, 1, &insert_hdr,
- bulk_size, action->flags);
+ mlx5dr_action_create_insert_header_reparse(action->ctx, 1, &insert_hdr,
+ bulk_size, action->flags,
+ MLX5DR_ACTION_STC_REPARSE_OFF);
action->ipv6_route_ext.action[1] =
mlx5dr_action_create_push_ipv6_route_ext_mhdr1(action);
action->ipv6_route_ext.action[2] =
@@ -2678,12 +2723,6 @@ mlx5dr_action_create_reformat_ipv6_ext(struct mlx5dr_context *ctx,
struct mlx5dr_action *action;
int ret;
- if (mlx5dr_context_cap_dynamic_reparse(ctx)) {
- DR_LOG(ERR, "IPv6 extension actions is not supported");
- rte_errno = ENOTSUP;
- return NULL;
- }
-
if (!mlx5dr_action_is_hws_flags(flags) ||
((flags & MLX5DR_ACTION_FLAG_SHARED) && log_bulk_size)) {
DR_LOG(ERR, "IPv6 extension flags don't fit HWS (flags: 0x%x)", flags);
@@ -2708,6 +2747,12 @@ mlx5dr_action_create_reformat_ipv6_ext(struct mlx5dr_context *ctx,
ret = mlx5dr_action_create_pop_ipv6_route_ext(action);
break;
case MLX5DR_ACTION_TYP_PUSH_IPV6_ROUTE_EXT:
+ if (!mlx5dr_context_cap_dynamic_reparse(ctx)) {
+ DR_LOG(ERR, "IPv6 routing extension push actions is not supported");
+ rte_errno = ENOTSUP;
+ goto free_action;
+ }
+
ret = mlx5dr_action_create_push_ipv6_route_ext(action, hdr, log_bulk_size);
break;
default:
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.h b/drivers/net/mlx5/hws/mlx5dr_action.h
index ce9091a336..ec6605bf7a 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.h
+++ b/drivers/net/mlx5/hws/mlx5dr_action.h
@@ -65,6 +65,12 @@ enum mlx5dr_action_setter_flag {
ASF_HIT = 1 << 7,
};
+enum mlx5dr_action_stc_reparse {
+ MLX5DR_ACTION_STC_REPARSE_DEFAULT,
+ MLX5DR_ACTION_STC_REPARSE_ON,
+ MLX5DR_ACTION_STC_REPARSE_OFF,
+};
+
struct mlx5dr_action_default_stc {
struct mlx5dr_pool_chunk nop_ctr;
struct mlx5dr_pool_chunk nop_dw5;
@@ -146,6 +152,7 @@ struct mlx5dr_action {
uint8_t anchor;
uint8_t offset;
bool encap;
+ uint8_t require_reparse;
} reformat;
struct {
struct mlx5dr_action
--
2.39.2
next prev parent reply other threads:[~2023-10-29 16:37 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-29 16:31 [PATCH 01/30] net/mlx5/hws: Definer, add mlx5dr context to definer_conv_data Gregory Etelson
2023-10-29 16:31 ` [PATCH 02/30] net/mlx5: add flow_hw_get_reg_id_from_ctx() Gregory Etelson
2023-10-29 16:31 ` [PATCH 03/30] net/mlx5/hws: Definer, use flow_hw_get_reg_id_from_ctx function call Gregory Etelson
2023-10-29 16:31 ` [PATCH 04/30] net/mlx5: add rte_device parameter to locate HWS registers Gregory Etelson
2023-11-05 20:27 ` Thomas Monjalon
2023-10-29 16:31 ` [PATCH 05/30] net/mlx5: separate port REG_C registers usage Gregory Etelson
2023-10-29 16:31 ` [PATCH 06/30] net/mlx5: merge REG_C aliases Gregory Etelson
2023-10-29 16:31 ` [PATCH 07/30] net/mlx5: initialize HWS flow tags registers in shared dev context Gregory Etelson
2023-10-29 16:31 ` [PATCH 08/30] net/mlx5/hws: adding method to query rule hash Gregory Etelson
2023-10-29 16:31 ` [PATCH 09/30] net/mlx5: add support for calc hash Gregory Etelson
2023-10-29 16:31 ` [PATCH 10/30] net/mlx5: fix insert by index Gregory Etelson
2023-10-29 16:31 ` [PATCH 11/30] net/mlx5: fix query for NIC flow cap Gregory Etelson
2023-10-29 16:31 ` [PATCH 12/30] net/mlx5: add support for more registers Gregory Etelson
2023-10-29 16:31 ` [PATCH 13/30] net/mlx5: add validation support for tags Gregory Etelson
2023-10-29 16:31 ` [PATCH 14/30] net/mlx5: reuse reformat and modify header actions in a table Gregory Etelson
2023-10-29 16:31 ` [PATCH 15/30] net/mlx5/hws: check the rule status on rule update Gregory Etelson
2023-10-29 16:31 ` [PATCH 16/30] net/mlx5/hws: support IPsec encryption/decryption action Gregory Etelson
2023-10-29 16:31 ` [PATCH 17/30] net/mlx5/hws: support ASO IPsec action Gregory Etelson
2023-10-29 16:31 ` [PATCH 18/30] net/mlx5/hws: support reformat trailer action Gregory Etelson
2023-10-29 16:31 ` [PATCH 19/30] net/mlx5/hws: support ASO first hit action Gregory Etelson
2023-10-29 16:31 ` [PATCH 20/30] net/mlx5/hws: support insert header action Gregory Etelson
2023-10-29 16:31 ` [PATCH 21/30] net/mlx5/hws: support remove " Gregory Etelson
2023-10-29 16:31 ` [PATCH 22/30] net/mlx5/hws: allow jump to TIR over FDB Gregory Etelson
2023-10-29 16:31 ` [PATCH 23/30] net/mlx5/hws: support dynamic re-parse Gregory Etelson
2023-10-29 16:31 ` [PATCH 24/30] net/mlx5/hws: dynamic re-parse for modify header Gregory Etelson
2023-10-29 16:31 ` [PATCH 25/30] net/mlx5: sample the srv6 last segment Gregory Etelson
2023-10-29 16:31 ` [PATCH 26/30] net/mlx5/hws: fix potential wrong errno value Gregory Etelson
2023-10-29 16:31 ` [PATCH 27/30] net/mlx5/hws: add IPv6 routing extension push remove actions Gregory Etelson
2023-10-29 16:32 ` [PATCH 28/30] net/mlx5/hws: add setter for IPv6 routing push remove Gregory Etelson
2023-10-29 16:32 ` [PATCH 29/30] net/mlx5: implement " Gregory Etelson
2023-10-29 16:32 ` Gregory Etelson [this message]
2023-11-05 18:49 ` [PATCH 01/30] net/mlx5/hws: Definer, add mlx5dr context to definer_conv_data Thomas Monjalon
2023-11-06 7:32 ` Etelson, Gregory
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=20231029163202.216450-30-getelson@nvidia.com \
--to=getelson@nvidia.com \
--cc=dev@dpdk.org \
--cc=erezsh@nvidia.com \
--cc=matan@nvidia.com \
--cc=mkashani@nvidia.com \
--cc=orika@nvidia.com \
--cc=rasland@nvidia.com \
--cc=rongweil@nvidia.com \
--cc=suanmingm@nvidia.com \
--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).