Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62694/?format=api
{ "id": 62694, "url": "http://patches.dpdk.org/api/patches/62694/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1573146604-17803-15-git-send-email-viacheslavo@mellanox.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1573146604-17803-15-git-send-email-viacheslavo@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1573146604-17803-15-git-send-email-viacheslavo@mellanox.com", "date": "2019-11-07T17:09:59", "name": "[v3,14/19] net/mlx5: extend flow mark support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "653af190effdee126c22e11c141f5707bfb89a77", "submitter": { "id": 1102, "url": "http://patches.dpdk.org/api/people/1102/?format=api", "name": "Slava Ovsiienko", "email": "viacheslavo@mellanox.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1573146604-17803-15-git-send-email-viacheslavo@mellanox.com/mbox/", "series": [ { "id": 7336, "url": "http://patches.dpdk.org/api/series/7336/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7336", "date": "2019-11-07T17:09:46", "name": "net/mlx5: implement extensive metadata feature", "version": 3, "mbox": "http://patches.dpdk.org/series/7336/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62694/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/62694/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D4DCAA034E;\n\tThu, 7 Nov 2019 18:12:48 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7894B1C033;\n\tThu, 7 Nov 2019 18:10:48 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id 519D51BFD2\n for <dev@dpdk.org>; Thu, 7 Nov 2019 18:10:33 +0100 (CET)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n viacheslavo@mellanox.com)\n with ESMTPS (AES256-SHA encrypted); 7 Nov 2019 19:10:28 +0200", "from pegasus11.mtr.labs.mlnx (pegasus11.mtr.labs.mlnx\n [10.210.16.104])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id xA7HASvE024314;\n Thu, 7 Nov 2019 19:10:28 +0200", "from pegasus11.mtr.labs.mlnx (localhost [127.0.0.1])\n by pegasus11.mtr.labs.mlnx (8.14.7/8.14.7) with ESMTP id xA7HASqD017969;\n Thu, 7 Nov 2019 17:10:28 GMT", "(from viacheslavo@localhost)\n by pegasus11.mtr.labs.mlnx (8.14.7/8.14.7/Submit) id xA7HASCF017968;\n Thu, 7 Nov 2019 17:10:28 GMT" ], "X-Authentication-Warning": "pegasus11.mtr.labs.mlnx: viacheslavo set sender to\n viacheslavo@mellanox.com using -f", "From": "Viacheslav Ovsiienko <viacheslavo@mellanox.com>", "To": "dev@dpdk.org", "Cc": "matan@mellanox.com, rasland@mellanox.com, thomas@monjalon.net,\n orika@mellanox.com, Yongseok Koh <yskoh@mellanox.com>", "Date": "Thu, 7 Nov 2019 17:09:59 +0000", "Message-Id": "<1573146604-17803-15-git-send-email-viacheslavo@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1573146604-17803-1-git-send-email-viacheslavo@mellanox.com>", "References": "<1572940915-29416-1-git-send-email-viacheslavo@mellanox.com>\n <1573146604-17803-1-git-send-email-viacheslavo@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v3 14/19] net/mlx5: extend flow mark support", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Flow MARK item is newly supported along with MARK action. MARK\naction and item are supported on both Rx and Tx. It works on the\nmetadata reg_c[] only if extensive flow metadata register is\nsupported. Without the support, MARK action behaves same as\nbefore - valid only on Rx and no MARK item is valid.\n\nFLAG action is also modified accordingly. FLAG action is\nsupported on both Rx and Tx via reg_c[] if extensive flow\nmetadata register is supported.\n\nHowever, the new MARK/FLAG item and action are currently\ndisabled until register copy on loopback is supported by\nforthcoming patches.\n\nThe actual index of engaged metadata reg_c[] register to\nsupport FLAG/MARK actions depends on dv_xmeta_en devarg value.\n\nFor extensive metadata mode 1 the reg_c[1] is used and\ntransitive MARK data width is 24. For extensive metadata mode 2\nthe reg_c[0] is used and transitive MARK data width might be\nrestricted to 0 or 16 bits, depending on kernel usage of reg_c[0].\nThe actual supported width can be discovered by series of trials\nwith rte_flow_validate().\n\nSigned-off-by: Yongseok Koh <yskoh@mellanox.com>\nSigned-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>\nAcked-by: Matan Azrad <matan@mellanox.com>\n---\n drivers/net/mlx5/mlx5_flow.h | 5 +-\n drivers/net/mlx5/mlx5_flow_dv.c | 383 ++++++++++++++++++++++++++++++++++++++--\n 2 files changed, 370 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex 9371e11..d6209ff 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -102,6 +102,7 @@ enum mlx5_feature_name {\n #define MLX5_FLOW_ITEM_METADATA (1u << 16)\n #define MLX5_FLOW_ITEM_PORT_ID (1u << 17)\n #define MLX5_FLOW_ITEM_TAG (1u << 18)\n+#define MLX5_FLOW_ITEM_MARK (1u << 19)\n \n /* Pattern MISC bits. */\n #define MLX5_FLOW_LAYER_ICMP (1u << 19)\n@@ -194,6 +195,7 @@ enum mlx5_feature_name {\n #define MLX5_FLOW_ACTION_INC_TCP_ACK (1u << 30)\n #define MLX5_FLOW_ACTION_DEC_TCP_ACK (1u << 31)\n #define MLX5_FLOW_ACTION_SET_TAG (1ull << 32)\n+#define MLX5_FLOW_ACTION_MARK_EXT (1ull << 33)\n \n #define MLX5_FLOW_FATE_ACTIONS \\\n \t(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \\\n@@ -228,7 +230,8 @@ enum mlx5_feature_name {\n \t\t\t\t MLX5_FLOW_ACTION_INC_TCP_ACK | \\\n \t\t\t\t MLX5_FLOW_ACTION_DEC_TCP_ACK | \\\n \t\t\t\t MLX5_FLOW_ACTION_OF_SET_VLAN_VID | \\\n-\t\t\t\t MLX5_FLOW_ACTION_SET_TAG)\n+\t\t\t\t MLX5_FLOW_ACTION_SET_TAG | \\\n+\t\t\t\t MLX5_FLOW_ACTION_MARK_EXT)\n \n #define MLX5_FLOW_VLAN_ACTIONS (MLX5_FLOW_ACTION_OF_POP_VLAN | \\\n \t\t\t\tMLX5_FLOW_ACTION_OF_PUSH_VLAN)\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex fec2efe..ec13edc 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -1010,6 +1010,125 @@ struct field_modify_info modify_tcp[] = {\n }\n \n /**\n+ * Convert MARK action to DV specification. This routine is used\n+ * in extensive metadata only and requires metadata register to be\n+ * handled. In legacy mode hardware tag resource is engaged.\n+ *\n+ * @param[in] dev\n+ * Pointer to the rte_eth_dev structure.\n+ * @param[in] conf\n+ * Pointer to MARK action specification.\n+ * @param[in,out] resource\n+ * Pointer to the modify-header resource.\n+ * @param[out] error\n+ * Pointer to the error structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+flow_dv_convert_action_mark(struct rte_eth_dev *dev,\n+\t\t\t const struct rte_flow_action_mark *conf,\n+\t\t\t struct mlx5_flow_dv_modify_hdr_resource *resource,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\trte_be32_t mask = rte_cpu_to_be_32(MLX5_FLOW_MARK_MASK &\n+\t\t\t\t\t priv->sh->dv_mark_mask);\n+\trte_be32_t data = rte_cpu_to_be_32(conf->id) & mask;\n+\tstruct rte_flow_item item = {\n+\t\t.spec = &data,\n+\t\t.mask = &mask,\n+\t};\n+\tstruct field_modify_info reg_c_x[] = {\n+\t\t{4, 0, 0}, /* dynamic instead of MLX5_MODI_META_REG_C_1. */\n+\t\t{0, 0, 0},\n+\t};\n+\tenum modify_reg reg;\n+\n+\tif (!mask)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_CONF,\n+\t\t\t\t\t NULL, \"zero mark action mask\");\n+\treg = mlx5_flow_get_reg_id(dev, MLX5_FLOW_MARK, 0, error);\n+\tif (reg < 0)\n+\t\treturn reg;\n+\tassert(reg > 0);\n+\treg_c_x[0].id = reg_to_field[reg];\n+\treturn flow_dv_convert_modify_action(&item, reg_c_x, NULL, resource,\n+\t\t\t\t\t MLX5_MODIFICATION_TYPE_SET, error);\n+}\n+\n+/**\n+ * Validate MARK item.\n+ *\n+ * @param[in] dev\n+ * Pointer to the rte_eth_dev structure.\n+ * @param[in] item\n+ * Item specification.\n+ * @param[in] attr\n+ * Attributes of flow that includes this item.\n+ * @param[out] error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+flow_dv_validate_item_mark(struct rte_eth_dev *dev,\n+\t\t\t const struct rte_flow_item *item,\n+\t\t\t const struct rte_flow_attr *attr __rte_unused,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_dev_config *config = &priv->config;\n+\tconst struct rte_flow_item_mark *spec = item->spec;\n+\tconst struct rte_flow_item_mark *mask = item->mask;\n+\tconst struct rte_flow_item_mark nic_mask = {\n+\t\t.id = priv->sh->dv_mark_mask,\n+\t};\n+\tint ret;\n+\n+\tif (config->dv_xmeta_en == MLX5_XMETA_MODE_LEGACY)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM, item,\n+\t\t\t\t\t \"extended metadata feature\"\n+\t\t\t\t\t \" isn't enabled\");\n+\tif (!mlx5_flow_ext_mreg_supported(dev))\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM, item,\n+\t\t\t\t\t \"extended metadata register\"\n+\t\t\t\t\t \" isn't supported\");\n+\tif (!nic_mask.id)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM, item,\n+\t\t\t\t\t \"extended metadata register\"\n+\t\t\t\t\t \" isn't available\");\n+\tret = mlx5_flow_get_reg_id(dev, MLX5_FLOW_MARK, 0, error);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tif (!spec)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM_SPEC,\n+\t\t\t\t\t item->spec,\n+\t\t\t\t\t \"data cannot be empty\");\n+\tif (spec->id >= (MLX5_FLOW_MARK_MAX & nic_mask.id))\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_CONF,\n+\t\t\t\t\t &spec->id,\n+\t\t\t\t\t \"mark id exceeds the limit\");\n+\tif (!mask)\n+\t\tmask = &nic_mask;\n+\tret = mlx5_flow_item_acceptable(item, (const uint8_t *)mask,\n+\t\t\t\t\t(const uint8_t *)&nic_mask,\n+\t\t\t\t\tsizeof(struct rte_flow_item_mark),\n+\t\t\t\t\terror);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\treturn 0;\n+}\n+\n+/**\n * Validate META item.\n *\n * @param[in] dev\n@@ -1482,6 +1601,139 @@ struct field_modify_info modify_tcp[] = {\n \treturn 0;\n }\n \n+/*\n+ * Validate the FLAG action.\n+ *\n+ * @param[in] dev\n+ * Pointer to the rte_eth_dev structure.\n+ * @param[in] action_flags\n+ * Holds the actions detected until now.\n+ * @param[in] attr\n+ * Pointer to flow attributes\n+ * @param[out] error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+flow_dv_validate_action_flag(struct rte_eth_dev *dev,\n+\t\t\t uint64_t action_flags,\n+\t\t\t const struct rte_flow_attr *attr,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_dev_config *config = &priv->config;\n+\tint ret;\n+\n+\t/* Fall back if no extended metadata register support. */\n+\tif (config->dv_xmeta_en == MLX5_XMETA_MODE_LEGACY)\n+\t\treturn mlx5_flow_validate_action_flag(action_flags, attr,\n+\t\t\t\t\t\t error);\n+\t/* Extensive metadata mode requires registers. */\n+\tif (!mlx5_flow_ext_mreg_supported(dev))\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"no metadata registers \"\n+\t\t\t\t\t \"to support flag action\");\n+\tif (!(priv->sh->dv_mark_mask & MLX5_FLOW_MARK_DEFAULT))\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"extended metadata register\"\n+\t\t\t\t\t \" isn't available\");\n+\tret = mlx5_flow_get_reg_id(dev, MLX5_FLOW_MARK, 0, error);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tassert(ret > 0);\n+\tif (action_flags & MLX5_FLOW_ACTION_DROP)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"can't drop and flag in same flow\");\n+\tif (action_flags & MLX5_FLOW_ACTION_MARK)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"can't mark and flag in same flow\");\n+\tif (action_flags & MLX5_FLOW_ACTION_FLAG)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"can't have 2 flag\"\n+\t\t\t\t\t \" actions in same flow\");\n+\treturn 0;\n+}\n+\n+/**\n+ * Validate MARK action.\n+ *\n+ * @param[in] dev\n+ * Pointer to the rte_eth_dev structure.\n+ * @param[in] action\n+ * Pointer to action.\n+ * @param[in] action_flags\n+ * Holds the actions detected until now.\n+ * @param[in] attr\n+ * Pointer to flow attributes\n+ * @param[out] error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+flow_dv_validate_action_mark(struct rte_eth_dev *dev,\n+\t\t\t const struct rte_flow_action *action,\n+\t\t\t uint64_t action_flags,\n+\t\t\t const struct rte_flow_attr *attr,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_dev_config *config = &priv->config;\n+\tconst struct rte_flow_action_mark *mark = action->conf;\n+\tint ret;\n+\n+\t/* Fall back if no extended metadata register support. */\n+\tif (config->dv_xmeta_en == MLX5_XMETA_MODE_LEGACY)\n+\t\treturn mlx5_flow_validate_action_mark(action, action_flags,\n+\t\t\t\t\t\t attr, error);\n+\t/* Extensive metadata mode requires registers. */\n+\tif (!mlx5_flow_ext_mreg_supported(dev))\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"no metadata registers \"\n+\t\t\t\t\t \"to support mark action\");\n+\tif (!priv->sh->dv_mark_mask)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"extended metadata register\"\n+\t\t\t\t\t \" isn't available\");\n+\tret = mlx5_flow_get_reg_id(dev, MLX5_FLOW_MARK, 0, error);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tassert(ret > 0);\n+\tif (!mark)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, action,\n+\t\t\t\t\t \"configuration cannot be null\");\n+\tif (mark->id >= (MLX5_FLOW_MARK_MAX & priv->sh->dv_mark_mask))\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_CONF,\n+\t\t\t\t\t &mark->id,\n+\t\t\t\t\t \"mark id exceeds the limit\");\n+\tif (action_flags & MLX5_FLOW_ACTION_DROP)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"can't drop and mark in same flow\");\n+\tif (action_flags & MLX5_FLOW_ACTION_FLAG)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"can't flag and mark in same flow\");\n+\tif (action_flags & MLX5_FLOW_ACTION_MARK)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"can't have 2 mark actions in same\"\n+\t\t\t\t\t \" flow\");\n+\treturn 0;\n+}\n+\n /**\n * Validate SET_TAG action.\n *\n@@ -3749,6 +4001,8 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t.dst_port = RTE_BE16(UINT16_MAX),\n \t\t}\n \t};\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_dev_config *dev_conf = &priv->config;\n \n \tif (items == NULL)\n \t\treturn -1;\n@@ -3905,6 +4159,14 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\treturn ret;\n \t\t\tlast_item = MLX5_FLOW_LAYER_MPLS;\n \t\t\tbreak;\n+\n+\t\tcase RTE_FLOW_ITEM_TYPE_MARK:\n+\t\t\tret = flow_dv_validate_item_mark(dev, items, attr,\n+\t\t\t\t\t\t\t error);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn ret;\n+\t\t\tlast_item = MLX5_FLOW_ITEM_MARK;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_META:\n \t\t\tret = flow_dv_validate_item_meta(dev, items, attr,\n \t\t\t\t\t\t\t error);\n@@ -3966,21 +4228,39 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t++actions_n;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_FLAG:\n-\t\t\tret = mlx5_flow_validate_action_flag(action_flags,\n-\t\t\t\t\t\t\t attr, error);\n+\t\t\tret = flow_dv_validate_action_flag(dev, action_flags,\n+\t\t\t\t\t\t\t attr, error);\n \t\t\tif (ret < 0)\n \t\t\t\treturn ret;\n-\t\t\taction_flags |= MLX5_FLOW_ACTION_FLAG;\n-\t\t\t++actions_n;\n+\t\t\tif (dev_conf->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {\n+\t\t\t\t/* Count all modify-header actions as one. */\n+\t\t\t\tif (!(action_flags &\n+\t\t\t\t MLX5_FLOW_MODIFY_HDR_ACTIONS))\n+\t\t\t\t\t++actions_n;\n+\t\t\t\taction_flags |= MLX5_FLOW_ACTION_FLAG |\n+\t\t\t\t\t\tMLX5_FLOW_ACTION_MARK_EXT;\n+\t\t\t} else {\n+\t\t\t\taction_flags |= MLX5_FLOW_ACTION_FLAG;\n+\t\t\t\t++actions_n;\n+\t\t\t}\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_MARK:\n-\t\t\tret = mlx5_flow_validate_action_mark(actions,\n-\t\t\t\t\t\t\t action_flags,\n-\t\t\t\t\t\t\t attr, error);\n+\t\t\tret = flow_dv_validate_action_mark(dev, actions,\n+\t\t\t\t\t\t\t action_flags,\n+\t\t\t\t\t\t\t attr, error);\n \t\t\tif (ret < 0)\n \t\t\t\treturn ret;\n-\t\t\taction_flags |= MLX5_FLOW_ACTION_MARK;\n-\t\t\t++actions_n;\n+\t\t\tif (dev_conf->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {\n+\t\t\t\t/* Count all modify-header actions as one. */\n+\t\t\t\tif (!(action_flags &\n+\t\t\t\t MLX5_FLOW_MODIFY_HDR_ACTIONS))\n+\t\t\t\t\t++actions_n;\n+\t\t\t\taction_flags |= MLX5_FLOW_ACTION_MARK |\n+\t\t\t\t\t\tMLX5_FLOW_ACTION_MARK_EXT;\n+\t\t\t} else {\n+\t\t\t\taction_flags |= MLX5_FLOW_ACTION_MARK;\n+\t\t\t\t++actions_n;\n+\t\t\t}\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_SET_TAG:\n \t\t\tret = flow_dv_validate_action_set_tag(dev, actions,\n@@ -4251,12 +4531,14 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\t\t \" actions in the same rule\");\n \t/* Eswitch has few restrictions on using items and actions */\n \tif (attr->transfer) {\n-\t\tif (action_flags & MLX5_FLOW_ACTION_FLAG)\n+\t\tif (!mlx5_flow_ext_mreg_supported(dev) &&\n+\t\t action_flags & MLX5_FLOW_ACTION_FLAG)\n \t\t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n \t\t\t\t\t\t NULL,\n \t\t\t\t\t\t \"unsupported action FLAG\");\n-\t\tif (action_flags & MLX5_FLOW_ACTION_MARK)\n+\t\tif (!mlx5_flow_ext_mreg_supported(dev) &&\n+\t\t action_flags & MLX5_FLOW_ACTION_MARK)\n \t\t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n \t\t\t\t\t\t NULL,\n@@ -5219,6 +5501,44 @@ struct field_modify_info modify_tcp[] = {\n }\n \n /**\n+ * Add MARK item to matcher\n+ *\n+ * @param[in] dev\n+ * The device to configure through.\n+ * @param[in, out] matcher\n+ * Flow matcher.\n+ * @param[in, out] key\n+ * Flow matcher value.\n+ * @param[in] item\n+ * Flow pattern to translate.\n+ */\n+static void\n+flow_dv_translate_item_mark(struct rte_eth_dev *dev,\n+\t\t\t void *matcher, void *key,\n+\t\t\t const struct rte_flow_item *item)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tconst struct rte_flow_item_mark *mark;\n+\tuint32_t value;\n+\tuint32_t mask;\n+\n+\tmark = item->mask ? (const void *)item->mask :\n+\t\t\t &rte_flow_item_mark_mask;\n+\tmask = mark->id & priv->sh->dv_mark_mask;\n+\tmark = (const void *)item->spec;\n+\tassert(mark);\n+\tvalue = mark->id & priv->sh->dv_mark_mask & mask;\n+\tif (mask) {\n+\t\tenum modify_reg reg;\n+\n+\t\t/* Get the metadata register index for the mark. */\n+\t\treg = mlx5_flow_get_reg_id(dev, MLX5_FLOW_MARK, 0, NULL);\n+\t\tassert(reg > 0);\n+\t\tflow_dv_match_meta_reg(matcher, key, reg, value, mask);\n+\t}\n+}\n+\n+/**\n * Add META item to matcher\n *\n * @param[in, out] matcher\n@@ -5227,8 +5547,6 @@ struct field_modify_info modify_tcp[] = {\n * Flow matcher value.\n * @param[in] item\n * Flow pattern to translate.\n- * @param[in] inner\n- * Item is inner pattern.\n */\n static void\n flow_dv_translate_item_meta(void *matcher, void *key,\n@@ -5899,6 +6217,7 @@ struct field_modify_info modify_tcp[] = {\n \t\t struct rte_flow_error *error)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_dev_config *dev_conf = &priv->config;\n \tstruct rte_flow *flow = dev_flow->flow;\n \tuint64_t item_flags = 0;\n \tuint64_t last_item = 0;\n@@ -5933,7 +6252,7 @@ struct field_modify_info modify_tcp[] = {\n \tif (attr->transfer)\n \t\tmhdr_res.ft_type = MLX5DV_FLOW_TABLE_TYPE_FDB;\n \tif (priority == MLX5_FLOW_PRIO_RSVD)\n-\t\tpriority = priv->config.flow_prio - 1;\n+\t\tpriority = dev_conf->flow_prio - 1;\n \tfor (; !actions_end ; actions++) {\n \t\tconst struct rte_flow_action_queue *queue;\n \t\tconst struct rte_flow_action_rss *rss;\n@@ -5964,6 +6283,19 @@ struct field_modify_info modify_tcp[] = {\n \t\t\taction_flags |= MLX5_FLOW_ACTION_PORT_ID;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_FLAG:\n+\t\t\taction_flags |= MLX5_FLOW_ACTION_FLAG;\n+\t\t\tif (dev_conf->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {\n+\t\t\t\tstruct rte_flow_action_mark mark = {\n+\t\t\t\t\t.id = MLX5_FLOW_MARK_DEFAULT,\n+\t\t\t\t};\n+\n+\t\t\t\tif (flow_dv_convert_action_mark(dev, &mark,\n+\t\t\t\t\t\t\t\t&mhdr_res,\n+\t\t\t\t\t\t\t\terror))\n+\t\t\t\t\treturn -rte_errno;\n+\t\t\t\taction_flags |= MLX5_FLOW_ACTION_MARK_EXT;\n+\t\t\t\tbreak;\n+\t\t\t}\n \t\t\ttag_resource.tag =\n \t\t\t\tmlx5_flow_mark_set(MLX5_FLOW_MARK_DEFAULT);\n \t\t\tif (!dev_flow->dv.tag_resource)\n@@ -5972,9 +6304,22 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\t\treturn errno;\n \t\t\tdev_flow->dv.actions[actions_n++] =\n \t\t\t\tdev_flow->dv.tag_resource->action;\n-\t\t\taction_flags |= MLX5_FLOW_ACTION_FLAG;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_MARK:\n+\t\t\taction_flags |= MLX5_FLOW_ACTION_MARK;\n+\t\t\tif (dev_conf->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {\n+\t\t\t\tconst struct rte_flow_action_mark *mark =\n+\t\t\t\t\t(const struct rte_flow_action_mark *)\n+\t\t\t\t\t\tactions->conf;\n+\n+\t\t\t\tif (flow_dv_convert_action_mark(dev, mark,\n+\t\t\t\t\t\t\t\t&mhdr_res,\n+\t\t\t\t\t\t\t\terror))\n+\t\t\t\t\treturn -rte_errno;\n+\t\t\t\taction_flags |= MLX5_FLOW_ACTION_MARK_EXT;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\t/* Legacy (non-extensive) MARK action. */\n \t\t\ttag_resource.tag = mlx5_flow_mark_set\n \t\t\t (((const struct rte_flow_action_mark *)\n \t\t\t (actions->conf))->id);\n@@ -5984,7 +6329,6 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\t\treturn errno;\n \t\t\tdev_flow->dv.actions[actions_n++] =\n \t\t\t\tdev_flow->dv.tag_resource->action;\n-\t\t\taction_flags |= MLX5_FLOW_ACTION_MARK;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_SET_TAG:\n \t\t\tif (flow_dv_convert_action_set_tag\n@@ -6021,7 +6365,7 @@ struct field_modify_info modify_tcp[] = {\n \t\t\taction_flags |= MLX5_FLOW_ACTION_RSS;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_COUNT:\n-\t\t\tif (!priv->config.devx) {\n+\t\t\tif (!dev_conf->devx) {\n \t\t\t\trte_errno = ENOTSUP;\n \t\t\t\tgoto cnt_err;\n \t\t\t}\n@@ -6434,6 +6778,11 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\t\t\t items, last_item, tunnel);\n \t\t\tlast_item = MLX5_FLOW_LAYER_MPLS;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_MARK:\n+\t\t\tflow_dv_translate_item_mark(dev, match_mask,\n+\t\t\t\t\t\t match_value, items);\n+\t\t\tlast_item = MLX5_FLOW_ITEM_MARK;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_META:\n \t\t\tflow_dv_translate_item_meta(match_mask, match_value,\n \t\t\t\t\t\t items);\n", "prefixes": [ "v3", "14/19" ] }