Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62430/?format=api
{ "id": 62430, "url": "http://patches.dpdk.org/api/patches/62430/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1572940915-29416-14-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": "<1572940915-29416-14-git-send-email-viacheslavo@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1572940915-29416-14-git-send-email-viacheslavo@mellanox.com", "date": "2019-11-05T08:01:48", "name": "[13/20] net/mlx5: add flow tag support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "824e24fce81f0b6d178736ac7270e9dc9fca8c11", "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/1572940915-29416-14-git-send-email-viacheslavo@mellanox.com/mbox/", "series": [ { "id": 7242, "url": "http://patches.dpdk.org/api/series/7242/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7242", "date": "2019-11-05T08:01:35", "name": "net/mlx5: implement extensive metadata feature", "version": 1, "mbox": "http://patches.dpdk.org/series/7242/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62430/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/62430/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 B323AA0352;\n\tTue, 5 Nov 2019 09:04:20 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 2D21D1BEC2;\n\tTue, 5 Nov 2019 09:02:25 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id B2AF21BE91\n for <dev@dpdk.org>; Tue, 5 Nov 2019 09:02:13 +0100 (CET)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n viacheslavo@mellanox.com)\n with ESMTPS (AES256-SHA encrypted); 5 Nov 2019 10:02:12 +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 xA582Cjr026515;\n Tue, 5 Nov 2019 10:02:12 +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 xA582CSd030781;\n Tue, 5 Nov 2019 08:02:12 GMT", "(from viacheslavo@localhost)\n by pegasus11.mtr.labs.mlnx (8.14.7/8.14.7/Submit) id xA582CiT030780;\n Tue, 5 Nov 2019 08:02:12 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": "Tue, 5 Nov 2019 08:01:48 +0000", "Message-Id": "<1572940915-29416-14-git-send-email-viacheslavo@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1572940915-29416-1-git-send-email-viacheslavo@mellanox.com>", "References": "<1572940915-29416-1-git-send-email-viacheslavo@mellanox.com>", "Subject": "[dpdk-dev] [PATCH 13/20] net/mlx5: add flow tag 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": "Add support of new rte_flow item and action - TAG and SET_TAG. TAG is\na transient value which can be kept during flow matching.\n\nThis is supported through device metadata register reg_c[]. Although\nthere are 8 registers are available on the current mlx5 device,\nsome of them can be reserved for firmware or kernel purposes.\nThe availability should be queried by iterative trial-and-error\nmlx5_flow_discover_mreg_c() routine.\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_dv.c | 232 +++++++++++++++++++++++++++++++++++++++-\n 1 file changed, 228 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex f83c6ff..08e78b0 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -870,10 +870,12 @@ struct field_modify_info modify_tcp[] = {\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 \"too many items to modify\");\n+\tassert(conf->id != REG_NONE);\n+\tassert(conf->id < RTE_DIM(reg_to_field));\n \tactions[i].action_type = MLX5_MODIFICATION_TYPE_SET;\n \tactions[i].field = reg_to_field[conf->id];\n \tactions[i].data0 = rte_cpu_to_be_32(actions[i].data0);\n-\tactions[i].data1 = conf->data;\n+\tactions[i].data1 = rte_cpu_to_be_32(conf->data);\n \t++i;\n \tresource->actions_num = i;\n \tif (!resource->actions_num)\n@@ -884,6 +886,52 @@ struct field_modify_info modify_tcp[] = {\n }\n \n /**\n+ * Convert SET_TAG action to DV specification.\n+ *\n+ * @param[in] dev\n+ * Pointer to the rte_eth_dev structure.\n+ * @param[in,out] resource\n+ * Pointer to the modify-header resource.\n+ * @param[in] conf\n+ * Pointer to action specification.\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_set_tag\n+\t\t\t(struct rte_eth_dev *dev,\n+\t\t\t struct mlx5_flow_dv_modify_hdr_resource *resource,\n+\t\t\t const struct rte_flow_action_set_tag *conf,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\trte_be32_t data = rte_cpu_to_be_32(conf->data);\n+\trte_be32_t mask = rte_cpu_to_be_32(conf->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[1] = {0, 0, 0},\n+\t};\n+\tenum mlx5_modification_field reg_type;\n+\tint ret;\n+\n+\tret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, conf->index, error);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tassert(ret != REG_NONE);\n+\tassert((unsigned int)ret < RTE_DIM(reg_to_field));\n+\treg_type = reg_to_field[ret];\n+\tassert(reg_type > 0);\n+\treg_c_x[0] = (struct field_modify_info){4, 0, reg_type};\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 * Convert internal COPY_REG action to DV specification.\n *\n * @param[in] dev\n@@ -999,6 +1047,65 @@ struct field_modify_info modify_tcp[] = {\n }\n \n /**\n+ * Validate TAG 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_tag(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+\tconst struct rte_flow_item_tag *spec = item->spec;\n+\tconst struct rte_flow_item_tag *mask = item->mask;\n+\tconst struct rte_flow_item_tag nic_mask = {\n+\t\t.data = RTE_BE32(UINT32_MAX),\n+\t\t.index = 0xff,\n+\t};\n+\tint ret;\n+\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 \"extensive metadata register\"\n+\t\t\t\t\t \" isn't supported\");\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 (!mask)\n+\t\tmask = &rte_flow_item_tag_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_tag),\n+\t\t\t\t\terror);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tif (mask->index != 0xff)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM_SPEC, NULL,\n+\t\t\t\t\t \"partial mask for tag index\"\n+\t\t\t\t\t \" is not supported\");\n+\tret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, spec->index, error);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tassert(ret != REG_NONE);\n+\treturn 0;\n+}\n+\n+/**\n * Validate vport item.\n *\n * @param[in] dev\n@@ -1359,6 +1466,62 @@ struct field_modify_info modify_tcp[] = {\n }\n \n /**\n+ * Validate SET_TAG action.\n+ *\n+ * @param[in] dev\n+ * Pointer to the rte_eth_dev structure.\n+ * @param[in] action\n+ * Pointer to the encap 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_set_tag(struct rte_eth_dev *dev,\n+\t\t\t\tconst struct rte_flow_action *action,\n+\t\t\t\tuint64_t action_flags,\n+\t\t\t\tconst struct rte_flow_attr *attr,\n+\t\t\t\tstruct rte_flow_error *error)\n+{\n+\tconst struct rte_flow_action_set_tag *conf;\n+\tconst uint64_t terminal_action_flags =\n+\t\tMLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE |\n+\t\tMLX5_FLOW_ACTION_RSS;\n+\tint ret;\n+\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, action,\n+\t\t\t\t\t \"extensive metadata register\"\n+\t\t\t\t\t \" isn't supported\");\n+\tif (!(action->conf))\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+\tconf = (const struct rte_flow_action_set_tag *)action->conf;\n+\tif (!conf->mask)\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 \"zero mask doesn't have any effect\");\n+\tret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, conf->index, error);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tif (!attr->transfer && attr->ingress &&\n+\t (action_flags & terminal_action_flags))\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 \"set_tag has no effect\"\n+\t\t\t\t\t \" with terminal actions\");\n+\treturn 0;\n+}\n+\n+/**\n * Validate count action.\n *\n * @param[in] dev\n@@ -3748,6 +3911,13 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\treturn ret;\n \t\t\tlast_item = MLX5_FLOW_LAYER_ICMP6;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_TAG:\n+\t\t\tret = flow_dv_validate_item_tag(dev, items,\n+\t\t\t\t\t\t\tattr, error);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn ret;\n+\t\t\tlast_item = MLX5_FLOW_ITEM_TAG;\n+\t\t\tbreak;\n \t\tcase MLX5_RTE_FLOW_ITEM_TYPE_TAG:\n \t\tcase MLX5_RTE_FLOW_ITEM_TYPE_TX_QUEUE:\n \t\t\tbreak;\n@@ -3795,6 +3965,17 @@ struct field_modify_info modify_tcp[] = {\n \t\t\taction_flags |= MLX5_FLOW_ACTION_MARK;\n \t\t\t++actions_n;\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+\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\t/* Count all modify-header actions as one action. */\n+\t\t\tif (!(action_flags & MLX5_FLOW_MODIFY_HDR_ACTIONS))\n+\t\t\t\t++actions_n;\n+\t\t\taction_flags |= MLX5_FLOW_ACTION_SET_TAG;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_DROP:\n \t\t\tret = mlx5_flow_validate_action_drop(action_flags,\n \t\t\t\t\t\t\t attr, error);\n@@ -5082,8 +5263,38 @@ struct field_modify_info modify_tcp[] = {\n {\n \tconst struct mlx5_rte_flow_item_tag *tag_v = item->spec;\n \tconst struct mlx5_rte_flow_item_tag *tag_m = item->mask;\n-\tenum modify_reg reg = tag_v->id;\n \n+\tassert(tag_v);\n+\tflow_dv_match_meta_reg(matcher, key, tag_v->id, tag_v->data,\n+\t\t\t tag_m ? tag_m->data : UINT32_MAX);\n+}\n+\n+/**\n+ * Add TAG item to matcher\n+ *\n+ * @param[in] dev\n+ * The devich 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_tag(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+\tconst struct rte_flow_item_tag *tag_v = item->spec;\n+\tconst struct rte_flow_item_tag *tag_m = item->mask;\n+\tenum modify_reg reg;\n+\n+\tassert(tag_v);\n+\ttag_m = tag_m ? tag_m : &rte_flow_item_tag_mask;\n+\t/* Get the metadata register index for the tag. */\n+\treg = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, tag_v->index, NULL);\n+\tassert(reg > 0);\n \tflow_dv_match_meta_reg(matcher, key, reg, tag_v->data, tag_m->data);\n }\n \n@@ -5758,6 +5969,14 @@ struct field_modify_info modify_tcp[] = {\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+\t\t\t\t(dev, &mhdr_res,\n+\t\t\t\t (const struct rte_flow_action_set_tag *)\n+\t\t\t\t actions->conf, error))\n+\t\t\t\treturn -rte_errno;\n+\t\t\taction_flags |= MLX5_FLOW_ACTION_SET_TAG;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_DROP:\n \t\t\taction_flags |= MLX5_FLOW_ACTION_DROP;\n \t\t\tbreak;\n@@ -6038,7 +6257,7 @@ struct field_modify_info modify_tcp[] = {\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_END:\n \t\t\tactions_end = true;\n-\t\t\tif (action_flags & MLX5_FLOW_MODIFY_HDR_ACTIONS) {\n+\t\t\tif (mhdr_res.actions_num) {\n \t\t\t\t/* create modify action if needed. */\n \t\t\t\tif (flow_dv_modify_hdr_resource_register\n \t\t\t\t\t(dev, &mhdr_res, dev_flow, error))\n@@ -6050,7 +6269,7 @@ struct field_modify_info modify_tcp[] = {\n \t\tdefault:\n \t\t\tbreak;\n \t\t}\n-\t\tif ((action_flags & MLX5_FLOW_MODIFY_HDR_ACTIONS) &&\n+\t\tif (mhdr_res.actions_num &&\n \t\t modify_action_position == UINT32_MAX)\n \t\t\tmodify_action_position = actions_n++;\n \t}\n@@ -6213,6 +6432,11 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\t\t\t items, tunnel);\n \t\t\tlast_item = MLX5_FLOW_LAYER_ICMP6;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_TAG:\n+\t\t\tflow_dv_translate_item_tag(dev, match_mask,\n+\t\t\t\t\t\t match_value, items);\n+\t\t\tlast_item = MLX5_FLOW_ITEM_TAG;\n+\t\t\tbreak;\n \t\tcase MLX5_RTE_FLOW_ITEM_TYPE_TAG:\n \t\t\tflow_dv_translate_mlx5_item_tag(match_mask,\n \t\t\t\t\t\t\tmatch_value, items);\n", "prefixes": [ "13/20" ] }