@@ -51,6 +51,7 @@ enum mlx5dr_action_type {
MLX5DR_ACTION_TYP_CRYPTO_ENCRYPT,
MLX5DR_ACTION_TYP_CRYPTO_DECRYPT,
MLX5DR_ACTION_TYP_INSERT_HEADER,
+ MLX5DR_ACTION_TYP_REMOVE_HEADER,
MLX5DR_ACTION_TYP_DEST_ROOT,
MLX5DR_ACTION_TYP_DEST_ARRAY,
MLX5DR_ACTION_TYP_MAX,
@@ -189,6 +190,29 @@ struct mlx5dr_action_insert_header {
bool encap;
};
+enum mlx5dr_action_remove_header_type {
+ MLX5DR_ACTION_REMOVE_HEADER_TYPE_BY_OFFSET,
+ MLX5DR_ACTION_REMOVE_HEADER_TYPE_BY_HEADER,
+};
+
+struct mlx5dr_action_remove_header_attr {
+ enum mlx5dr_action_remove_header_type type;
+ union {
+ struct {
+ /* PRM start anchor from which header will be removed */
+ uint8_t start_anchor;
+ /* PRM end anchor till which header will be removed */
+ uint8_t end_anchor;
+ bool decap;
+ } by_anchor;
+ struct {
+ /* PRM start anchor from which header will be removed */
+ uint8_t start_anchor;
+ uint8_t size;
+ } by_offset;
+ };
+};
+
struct mlx5dr_action_mh_pattern {
/* Byte size of modify actions provided by "data" */
size_t sz;
@@ -849,6 +873,22 @@ mlx5dr_action_create_insert_header(struct mlx5dr_context *ctx,
uint32_t log_bulk_size,
uint32_t flags);
+/* Create remove header action.
+ *
+ * @param[in] ctx
+ * The context in which the new action will be created.
+ * @param[in] attr
+ * attributes: specifies the remove header type, PRM start anchor and
+ * the PRM end anchor or the PRM start anchor and remove size in bytes.
+ * @param[in] flags
+ * Action creation flags. (enum mlx5dr_action_flags)
+ * @return pointer to mlx5dr_action on success NULL otherwise.
+ */
+struct mlx5dr_action *
+mlx5dr_action_create_remove_header(struct mlx5dr_context *ctx,
+ struct mlx5dr_action_remove_header_attr *attr,
+ uint32_t flags);
+
/* Destroy direct rule action.
*
* @param[in] action
@@ -9,6 +9,9 @@
#define MLX5DR_ACTION_METER_INIT_COLOR_OFFSET 1
#define MLX5DR_ACTION_ASO_FIRST_HIT_SET_OFFSET 9
+/* Header removal size limited to 128B (64 words) */
+#define MLX5DR_ACTION_REMOVE_HEADER_MAX_SIZE 128
+
/* This is the maximum allowed action order for each table type:
* TX: POP_VLAN, CTR, ASO, PUSH_VLAN, MODIFY, ENCAP, TRAILER, ENCRYPT,
* Term
@@ -21,6 +24,7 @@ static const uint32_t action_order_arr[MLX5DR_TABLE_TYPE_MAX][MLX5DR_ACTION_TYP_
[MLX5DR_TABLE_TYPE_NIC_RX] = {
BIT(MLX5DR_ACTION_TYP_TAG),
BIT(MLX5DR_ACTION_TYP_REFORMAT_TRAILER),
+ BIT(MLX5DR_ACTION_TYP_REMOVE_HEADER) |
BIT(MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2) |
BIT(MLX5DR_ACTION_TYP_REFORMAT_TNL_L3_TO_L2),
BIT(MLX5DR_ACTION_TYP_POP_VLAN),
@@ -69,6 +73,7 @@ static const uint32_t action_order_arr[MLX5DR_TABLE_TYPE_MAX][MLX5DR_ACTION_TYP_
},
[MLX5DR_TABLE_TYPE_FDB] = {
BIT(MLX5DR_ACTION_TYP_REFORMAT_TRAILER),
+ BIT(MLX5DR_ACTION_TYP_REMOVE_HEADER) |
BIT(MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2) |
BIT(MLX5DR_ACTION_TYP_REFORMAT_TNL_L3_TO_L2),
BIT(MLX5DR_ACTION_TYP_POP_VLAN),
@@ -719,6 +724,19 @@ static void mlx5dr_action_fill_stc_attr(struct mlx5dr_action *action,
attr->reformat_trailer.op = action->reformat_trailer.op;
attr->reformat_trailer.size = action->reformat_trailer.size;
break;
+ case MLX5DR_ACTION_TYP_REMOVE_HEADER:
+ if (action->remove_header.type == MLX5DR_ACTION_REMOVE_HEADER_TYPE_BY_HEADER) {
+ attr->action_type = MLX5_IFC_STC_ACTION_TYPE_HEADER_REMOVE;
+ attr->remove_header.decap = action->remove_header.decap;
+ attr->remove_header.start_anchor = action->remove_header.start_anchor;
+ attr->remove_header.end_anchor = action->remove_header.end_anchor;
+ } else {
+ attr->action_type = MLX5_IFC_STC_ACTION_TYPE_REMOVE_WORDS;
+ attr->remove_words.start_anchor = action->remove_header.start_anchor;
+ attr->remove_words.num_of_words = action->remove_header.num_of_words;
+ }
+ attr->action_offset = MLX5DR_ACTION_OFFSET_DW5;
+ break;
default:
DR_LOG(ERR, "Invalid action type %d", action->type);
assert(false);
@@ -2266,6 +2284,64 @@ mlx5dr_action_create_insert_header(struct mlx5dr_context *ctx,
return NULL;
}
+struct mlx5dr_action *
+mlx5dr_action_create_remove_header(struct mlx5dr_context *ctx,
+ struct mlx5dr_action_remove_header_attr *attr,
+ uint32_t flags)
+{
+ struct mlx5dr_action *action;
+
+ if (mlx5dr_action_is_root_flags(flags)) {
+ DR_LOG(ERR, "Remove header action not supported over root");
+ rte_errno = ENOTSUP;
+ return NULL;
+ }
+
+ action = mlx5dr_action_create_generic(ctx, flags, MLX5DR_ACTION_TYP_REMOVE_HEADER);
+ if (!action)
+ return NULL;
+
+ switch (attr->type) {
+ case MLX5DR_ACTION_REMOVE_HEADER_TYPE_BY_HEADER:
+ action->remove_header.type = MLX5DR_ACTION_REMOVE_HEADER_TYPE_BY_HEADER;
+ action->remove_header.start_anchor = attr->by_anchor.start_anchor;
+ action->remove_header.end_anchor = attr->by_anchor.end_anchor;
+ action->remove_header.decap = attr->by_anchor.decap;
+ break;
+ case MLX5DR_ACTION_REMOVE_HEADER_TYPE_BY_OFFSET:
+ if (attr->by_offset.size % W_SIZE != 0) {
+ DR_LOG(ERR, "Invalid size, HW supports header remove in WORD granularity");
+ rte_errno = EINVAL;
+ goto free_action;
+ }
+
+ if (attr->by_offset.size > MLX5DR_ACTION_REMOVE_HEADER_MAX_SIZE) {
+ DR_LOG(ERR, "Header removal size limited to %u bytes",
+ MLX5DR_ACTION_REMOVE_HEADER_MAX_SIZE);
+ rte_errno = EINVAL;
+ goto free_action;
+ }
+
+ action->remove_header.type = MLX5DR_ACTION_REMOVE_HEADER_TYPE_BY_OFFSET;
+ action->remove_header.start_anchor = attr->by_offset.start_anchor;
+ action->remove_header.num_of_words = attr->by_offset.size / W_SIZE;
+ break;
+ default:
+ DR_LOG(ERR, "Unsupported remove header type %u", attr->type);
+ rte_errno = ENOTSUP;
+ goto free_action;
+ }
+
+ if (mlx5dr_action_create_stcs(action, NULL))
+ goto free_action;
+
+ return action;
+
+free_action:
+ simple_free(action);
+ return NULL;
+}
+
static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action)
{
struct mlx5dr_devx_obj *obj = NULL;
@@ -2291,6 +2367,7 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action)
case MLX5DR_ACTION_TYP_CRYPTO_ENCRYPT:
case MLX5DR_ACTION_TYP_CRYPTO_DECRYPT:
case MLX5DR_ACTION_TYP_REFORMAT_TRAILER:
+ case MLX5DR_ACTION_TYP_REMOVE_HEADER:
mlx5dr_action_destroy_stcs(action);
break;
case MLX5DR_ACTION_TYP_DEST_ROOT:
@@ -2923,6 +3000,7 @@ int mlx5dr_action_template_process(struct mlx5dr_action_template *at)
setter->idx_double = i;
break;
+ case MLX5DR_ACTION_TYP_REMOVE_HEADER:
case MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2:
/* Single remove header to header */
setter = mlx5dr_action_setter_find_first(last_setter, ASF_SINGLE1 | ASF_MODIFY);
@@ -161,6 +161,13 @@ struct mlx5dr_action {
uint8_t op;
uint8_t size;
} reformat_trailer;
+ struct {
+ uint8_t type;
+ uint8_t start_anchor;
+ uint8_t end_anchor;
+ uint8_t num_of_words;
+ bool decap;
+ } remove_header;
struct {
struct mlx5dr_devx_obj *devx_obj;
} devx_dest;
@@ -30,6 +30,7 @@ const char *mlx5dr_debug_action_type_str[] = {
[MLX5DR_ACTION_TYP_CRYPTO_ENCRYPT] = "CRYPTO_ENCRYPT",
[MLX5DR_ACTION_TYP_CRYPTO_DECRYPT] = "CRYPTO_DECRYPT",
[MLX5DR_ACTION_TYP_INSERT_HEADER] = "INSERT_HEADER",
+ [MLX5DR_ACTION_TYP_REMOVE_HEADER] = "REMOVE_HEADER",
};
static_assert(ARRAY_SIZE(mlx5dr_debug_action_type_str) == MLX5DR_ACTION_TYP_MAX,