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>,
Alex Vesker <valex@nvidia.com>, Ori Kam <orika@nvidia.com>,
Matan Azrad <matan@nvidia.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
Suanming Mou <suanmingm@nvidia.com>
Subject: [PATCH 28/30] net/mlx5/hws: add setter for IPv6 routing push remove
Date: Sun, 29 Oct 2023 18:32:00 +0200 [thread overview]
Message-ID: <20231029163202.216450-28-getelson@nvidia.com> (raw)
In-Reply-To: <20231029163202.216450-1-getelson@nvidia.com>
From: Rongwei Liu <rongweil@nvidia.com>
The rte action will be translated to multiple dr_actions which need
different setters to program them.
In order to leverage the existing setter logic, there is a new callback
introduce which called fetch_opt with unique parameter.
For each setter, it may have different reparsing properties.
Setter which requires no reparse can't share the same one with
the one has reparse enabled even if there is spare space.
Signed-off-by: Rongwei Liu <rongweil@nvidia.com>
Reviewed-by: Alex Vesker <valex@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
---
drivers/net/mlx5/hws/mlx5dr_action.c | 174 +++++++++++++++++++++++++++
drivers/net/mlx5/hws/mlx5dr_action.h | 3 +-
2 files changed, 176 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c
index 6ac3c2f782..281b09a582 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.c
+++ b/drivers/net/mlx5/hws/mlx5dr_action.c
@@ -3311,6 +3311,121 @@ mlx5dr_action_setter_reformat_trailer(struct mlx5dr_actions_apply_data *apply,
apply->wqe_data[MLX5DR_ACTION_OFFSET_DW7] = 0;
}
+static void
+mlx5dr_action_setter_ipv6_route_ext_gen_push_mhdr(uint8_t *data, void *mh_data)
+{
+ uint8_t *action_ptr = mh_data;
+ uint32_t *ipv6_dst_addr;
+ uint8_t seg_left;
+ uint32_t i;
+
+ /* Fetch the last IPv6 address in the segment list which is the next hop */
+ seg_left = MLX5_GET(header_ipv6_routing_ext, data, segments_left) - 1;
+ ipv6_dst_addr = (uint32_t *)data + MLX5_ST_SZ_DW(header_ipv6_routing_ext)
+ + seg_left * MLX5_ST_SZ_DW(definer_hl_ipv6_addr);
+
+ /* Load next hop IPv6 address in reverse order to ipv6.dst_address */
+ for (i = 0; i < MLX5_ST_SZ_DW(definer_hl_ipv6_addr); i++) {
+ MLX5_SET(set_action_in, action_ptr, data, be32toh(*ipv6_dst_addr++));
+ action_ptr += MLX5DR_MODIFY_ACTION_SIZE;
+ }
+
+ /* Set ipv6_route_ext.next_hdr per user input */
+ MLX5_SET(set_action_in, action_ptr, data, *data);
+}
+
+static void
+mlx5dr_action_setter_ipv6_route_ext_mhdr(struct mlx5dr_actions_apply_data *apply,
+ struct mlx5dr_actions_wqe_setter *setter)
+{
+ struct mlx5dr_rule_action *rule_action = apply->rule_action;
+ struct mlx5dr_actions_wqe_setter tmp_setter = {0};
+ struct mlx5dr_rule_action tmp_rule_action;
+ __be64 cmd[MLX5_SRV6_SAMPLE_NUM] = {0};
+ struct mlx5dr_action *ipv6_ext_action;
+ uint8_t *header;
+
+ header = rule_action[setter->idx_double].ipv6_ext.header;
+ ipv6_ext_action = rule_action[setter->idx_double].action;
+ tmp_rule_action.action = ipv6_ext_action->ipv6_route_ext.action[setter->extra_data];
+
+ if (tmp_rule_action.action->flags & MLX5DR_ACTION_FLAG_SHARED) {
+ tmp_rule_action.modify_header.offset = 0;
+ tmp_rule_action.modify_header.pattern_idx = 0;
+ tmp_rule_action.modify_header.data = NULL;
+ } else {
+ /*
+ * Copy ipv6_dst from ipv6_route_ext.last_seg.
+ * Set ipv6_route_ext.next_hdr.
+ */
+ mlx5dr_action_setter_ipv6_route_ext_gen_push_mhdr(header, cmd);
+ tmp_rule_action.modify_header.data = (uint8_t *)cmd;
+ tmp_rule_action.modify_header.pattern_idx = 0;
+ tmp_rule_action.modify_header.offset =
+ rule_action[setter->idx_double].ipv6_ext.offset;
+ }
+
+ apply->rule_action = &tmp_rule_action;
+
+ /* Reuse regular */
+ mlx5dr_action_setter_modify_header(apply, &tmp_setter);
+
+ /* Swap rule actions from backup */
+ apply->rule_action = rule_action;
+}
+
+static void
+mlx5dr_action_setter_ipv6_route_ext_insert_ptr(struct mlx5dr_actions_apply_data *apply,
+ struct mlx5dr_actions_wqe_setter *setter)
+{
+ struct mlx5dr_rule_action *rule_action = apply->rule_action;
+ struct mlx5dr_actions_wqe_setter tmp_setter = {0};
+ struct mlx5dr_rule_action tmp_rule_action;
+ struct mlx5dr_action *ipv6_ext_action;
+ uint8_t header[MLX5_PUSH_MAX_LEN];
+
+ ipv6_ext_action = rule_action[setter->idx_double].action;
+ tmp_rule_action.action = ipv6_ext_action->ipv6_route_ext.action[setter->extra_data];
+
+ if (tmp_rule_action.action->flags & MLX5DR_ACTION_FLAG_SHARED) {
+ tmp_rule_action.reformat.offset = 0;
+ tmp_rule_action.reformat.hdr_idx = 0;
+ tmp_rule_action.reformat.data = NULL;
+ } else {
+ memcpy(header, rule_action[setter->idx_double].ipv6_ext.header,
+ tmp_rule_action.action->reformat.header_size);
+ /* Clear ipv6_route_ext.next_hdr for right checksum */
+ MLX5_SET(header_ipv6_routing_ext, header, next_hdr, 0);
+ tmp_rule_action.reformat.data = header;
+ tmp_rule_action.reformat.hdr_idx = 0;
+ tmp_rule_action.reformat.offset =
+ rule_action[setter->idx_double].ipv6_ext.offset;
+ }
+
+ apply->rule_action = &tmp_rule_action;
+
+ /* Reuse regular */
+ mlx5dr_action_setter_insert_ptr(apply, &tmp_setter);
+
+ /* Swap rule actions from backup */
+ apply->rule_action = rule_action;
+}
+
+static void
+mlx5dr_action_setter_ipv6_route_ext_pop(struct mlx5dr_actions_apply_data *apply,
+ struct mlx5dr_actions_wqe_setter *setter)
+{
+ struct mlx5dr_rule_action *rule_action = &apply->rule_action[setter->idx_single];
+ uint8_t idx = MLX5DR_ACTION_IPV6_EXT_MAX_SA - 1;
+ struct mlx5dr_action *action;
+
+ /* Pop the ipv6_route_ext as set_single logic */
+ action = rule_action->action->ipv6_route_ext.action[idx];
+ apply->wqe_data[MLX5DR_ACTION_OFFSET_DW5] = 0;
+ apply->wqe_ctrl->stc_ix[MLX5DR_ACTION_STC_IDX_DW5] =
+ htobe32(action->stc[apply->tbl_type].offset);
+}
+
int mlx5dr_action_template_process(struct mlx5dr_action_template *at)
{
struct mlx5dr_actions_wqe_setter *start_setter = at->setters + 1;
@@ -3374,6 +3489,65 @@ int mlx5dr_action_template_process(struct mlx5dr_action_template *at)
setter->idx_double = i;
break;
+ case MLX5DR_ACTION_TYP_POP_IPV6_ROUTE_EXT:
+ /*
+ * Backup ipv6_route_ext.next_hdr to ipv6_route_ext.seg_left.
+ * Set ipv6_route_ext.next_hdr to 0 for checksum bug.
+ */
+ setter = mlx5dr_action_setter_find_first(last_setter, ASF_DOUBLE | ASF_REMOVE);
+ setter->flags |= ASF_DOUBLE | ASF_MODIFY;
+ setter->set_double = &mlx5dr_action_setter_ipv6_route_ext_mhdr;
+ setter->idx_double = i;
+ setter->extra_data = 0;
+ setter++;
+
+ /*
+ * Restore ipv6_route_ext.next_hdr from ipv6_route_ext.seg_left.
+ * Load the final destination address from flex parser sample 1->4.
+ */
+ setter->flags |= ASF_DOUBLE | ASF_MODIFY;
+ setter->set_double = &mlx5dr_action_setter_ipv6_route_ext_mhdr;
+ setter->idx_double = i;
+ setter->extra_data = 1;
+ setter++;
+
+ /* Set the ipv6.protocol per ipv6_route_ext.next_hdr */
+ setter->flags |= ASF_DOUBLE | ASF_MODIFY;
+ setter->set_double = &mlx5dr_action_setter_ipv6_route_ext_mhdr;
+ setter->idx_double = i;
+ setter->extra_data = 2;
+ /* Pop ipv6_route_ext */
+ setter->flags |= ASF_SINGLE1 | ASF_REMOVE;
+ setter->set_single = &mlx5dr_action_setter_ipv6_route_ext_pop;
+ setter->idx_single = i;
+ break;
+
+ case MLX5DR_ACTION_TYP_PUSH_IPV6_ROUTE_EXT:
+ /* Insert ipv6_route_ext with next_hdr as 0 due to checksum bug */
+ setter = mlx5dr_action_setter_find_first(last_setter, ASF_DOUBLE | ASF_REMOVE);
+ setter->flags |= ASF_DOUBLE | ASF_INSERT;
+ setter->set_double = &mlx5dr_action_setter_ipv6_route_ext_insert_ptr;
+ setter->idx_double = i;
+ setter->extra_data = 0;
+ setter++;
+
+ /* Set ipv6.protocol as IPPROTO_ROUTING: 0x2b */
+ setter->flags |= ASF_DOUBLE | ASF_MODIFY;
+ setter->set_double = &mlx5dr_action_setter_ipv6_route_ext_mhdr;
+ setter->idx_double = i;
+ setter->extra_data = 1;
+ setter++;
+
+ /*
+ * Load the right ipv6_route_ext.next_hdr per user input buffer.
+ * Load the next dest_addr from the ipv6_route_ext.seg_list[last].
+ */
+ setter->flags |= ASF_DOUBLE | ASF_MODIFY;
+ setter->set_double = &mlx5dr_action_setter_ipv6_route_ext_mhdr;
+ setter->idx_double = i;
+ setter->extra_data = 2;
+ break;
+
case MLX5DR_ACTION_TYP_MODIFY_HDR:
/* Double modify header list */
setter = mlx5dr_action_setter_find_first(last_setter, ASF_DOUBLE | ASF_REMOVE);
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.h b/drivers/net/mlx5/hws/mlx5dr_action.h
index d0152dde3b..ce9091a336 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.h
+++ b/drivers/net/mlx5/hws/mlx5dr_action.h
@@ -6,7 +6,7 @@
#define MLX5DR_ACTION_H_
/* Max number of STEs needed for a rule (including match) */
-#define MLX5DR_ACTION_MAX_STE 10
+#define MLX5DR_ACTION_MAX_STE 20
/* Max number of internal subactions of ipv6_ext */
#define MLX5DR_ACTION_IPV6_EXT_MAX_SA 4
@@ -109,6 +109,7 @@ struct mlx5dr_actions_wqe_setter {
uint8_t idx_ctr;
uint8_t idx_hit;
uint8_t flags;
+ uint8_t extra_data;
};
struct mlx5dr_action_template {
--
2.39.2
next prev parent reply other threads:[~2023-10-29 16:36 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 ` Gregory Etelson [this message]
2023-10-29 16:32 ` [PATCH 29/30] net/mlx5: implement IPv6 routing push remove Gregory Etelson
2023-10-29 16:32 ` [PATCH 30/30] net/mlx5/hws: add stc reparse support for srv6 push pop Gregory Etelson
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-28-getelson@nvidia.com \
--to=getelson@nvidia.com \
--cc=dev@dpdk.org \
--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=valex@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).