Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62564/?format=api
{ "id": 62564, "url": "http://patches.dpdk.org/api/patches/62564/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1573053090-179521-17-git-send-email-suanmingm@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": "<1573053090-179521-17-git-send-email-suanmingm@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1573053090-179521-17-git-send-email-suanmingm@mellanox.com", "date": "2019-11-06T15:11:25", "name": "[16/19] net/mlx5: support meter flow action", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "985a246dc04a39383b228696c54ee5228a546e94", "submitter": { "id": 1358, "url": "http://patches.dpdk.org/api/people/1358/?format=api", "name": "Suanming Mou", "email": "suanmingm@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/1573053090-179521-17-git-send-email-suanmingm@mellanox.com/mbox/", "series": [ { "id": 7297, "url": "http://patches.dpdk.org/api/series/7297/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7297", "date": "2019-11-06T15:11:09", "name": "net/mlx5: support meter", "version": 1, "mbox": "http://patches.dpdk.org/series/7297/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62564/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/62564/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 AB358A04AB;\n\tWed, 6 Nov 2019 16:14:18 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CD6311C2EE;\n\tWed, 6 Nov 2019 16:12:26 +0100 (CET)", "from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130])\n by dpdk.org (Postfix) with ESMTP id 22D781C1C9\n for <dev@dpdk.org>; Wed, 6 Nov 2019 16:12:01 +0100 (CET)" ], "From": "Suanming Mou <suanmingm@mellanox.com>", "To": "Matan Azrad <matan@mellanox.com>, Shahaf Shuler <shahafs@mellanox.com>,\n Viacheslav Ovsiienko <viacheslavo@mellanox.com>", "Cc": "dev@dpdk.org", "Date": "Wed, 6 Nov 2019 17:11:25 +0200", "Message-Id": "<1573053090-179521-17-git-send-email-suanmingm@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1573053090-179521-1-git-send-email-suanmingm@mellanox.com>", "References": "<1573053090-179521-1-git-send-email-suanmingm@mellanox.com>", "Subject": "[dpdk-dev] [PATCH 16/19] net/mlx5: support meter flow action", "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 meter flow action support in flow validate and translate.\n\nSigned-off-by: Suanming Mou <suanmingm@mellanox.com>\n---\n drivers/net/mlx5/mlx5_flow_dv.c | 95 +++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 95 insertions(+)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex ded492d..b553787 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -3244,6 +3244,10 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n \t\t\t\t\t \"can't have 2 fate actions in\"\n \t\t\t\t\t \" same flow\");\n+\tif (action_flags & MLX5_FLOW_ACTION_METER)\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 \"jump with meter not support\");\n \tif (!action->conf)\n \t\treturn rte_flow_error_set(error, EINVAL,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_CONF,\n@@ -3357,6 +3361,63 @@ struct field_modify_info modify_tcp[] = {\n \treturn mlx5_flow_ext_mreg_supported(dev) ? MLX5_MODIFY_NUM :\n \t\t\t\t\t\t MLX5_MODIFY_NUM_NO_MREG;\n }\n+\n+/**\n+ * Validate the meter action.\n+ *\n+ * @param[in] dev\n+ * Pointer to rte_eth_dev structure.\n+ * @param[in] action_flags\n+ * Bit-fields that holds the actions detected until now.\n+ * @param[in] action\n+ * Pointer to the meter action.\n+ * @param[in] attr\n+ * Attributes of flow that includes this action.\n+ * @param[out] error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_ernno is set.\n+ */\n+static int\n+mlx5_flow_validate_action_meter(struct rte_eth_dev *dev,\n+\t\t\t\tuint64_t action_flags,\n+\t\t\t\tconst struct rte_flow_action *action,\n+\t\t\t\tconst struct rte_flow_attr *attr,\n+\t\t\t\tstruct rte_flow_error *error)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tconst struct rte_flow_action_meter *am = action->conf;\n+\tstruct mlx5_flow_meter *fm = mlx5_flow_meter_find(priv, am->mtr_id);\n+\n+\tif (action_flags & MLX5_FLOW_ACTION_METER)\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 \"meter chaining not support\");\n+\tif (action_flags & MLX5_FLOW_ACTION_JUMP)\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 \"meter with jump not support\");\n+\tif (!priv->mtr_en)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t NULL,\n+\t\t\t\t\t \"meter action not supported\");\n+\tif (!fm)\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 \"Meter not found\");\n+\tif (fm->ref_cnt && (!(fm->attr.transfer == attr->transfer ||\n+\t (!fm->attr.ingress && !attr->ingress && attr->egress) ||\n+\t (!fm->attr.egress && !attr->egress && attr->ingress))))\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 \"Flow attributes are either invalid \"\n+\t\t\t\t\t \"or have a conflict with current \"\n+\t\t\t\t\t \"meter attributes\");\n+\treturn 0;\n+}\n+\n /**\n * Find existing modify-header resource or create and register a new one.\n *\n@@ -4703,6 +4764,16 @@ struct field_modify_info modify_tcp[] = {\n \t\tcase MLX5_RTE_FLOW_ACTION_TYPE_MARK:\n \t\tcase MLX5_RTE_FLOW_ACTION_TYPE_COPY_MREG:\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_METER:\n+\t\t\tret = mlx5_flow_validate_action_meter(dev,\n+\t\t\t\t\t\t\t action_flags,\n+\t\t\t\t\t\t\t actions, 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\taction_flags |= MLX5_FLOW_ACTION_METER;\n+\t\t\t++actions_n;\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n@@ -6478,6 +6549,7 @@ struct field_modify_info modify_tcp[] = {\n \t\tconst struct rte_flow_action_count *count = action->conf;\n \t\tconst uint8_t *rss_key;\n \t\tconst struct rte_flow_action_jump *jump_data;\n+\t\tconst struct rte_flow_action_meter *mtr;\n \t\tstruct mlx5_flow_dv_jump_tbl_resource jump_tbl_resource;\n \t\tstruct mlx5_flow_tbl_resource *tbl;\n \t\tuint32_t port_id = 0;\n@@ -6844,6 +6916,25 @@ struct field_modify_info modify_tcp[] = {\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_METER:\n+\t\t\tmtr = actions->conf;\n+\t\t\tif (!flow->meter) {\n+\t\t\t\tflow->meter = mlx5_flow_meter_attach(priv,\n+\t\t\t\t\t\t\tmtr->mtr_id, attr,\n+\t\t\t\t\t\t\terror);\n+\t\t\t\tif (!flow->meter)\n+\t\t\t\t\treturn rte_flow_error_set(error,\n+\t\t\t\t\t\trte_errno,\n+\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t\tNULL,\n+\t\t\t\t\t\t\"meter not found \"\n+\t\t\t\t\t\t\"or invalid parameters\");\n+\t\t\t}\n+\t\t\t/* Set the meter action. */\n+\t\t\tdev_flow->dv.actions[actions_n++] =\n+\t\t\t\tflow->meter->mfts->meter_action;\n+\t\t\taction_flags |= MLX5_FLOW_ACTION_METER;\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_END:\n \t\t\tactions_end = true;\n \t\t\tif (mhdr_res.actions_num) {\n@@ -7445,6 +7536,10 @@ struct field_modify_info modify_tcp[] = {\n \t\tflow_dv_counter_release(dev, flow->counter);\n \t\tflow->counter = NULL;\n \t}\n+\tif (flow->meter) {\n+\t\tmlx5_flow_meter_detach(flow->meter);\n+\t\tflow->meter = NULL;\n+\t}\n \twhile (!LIST_EMPTY(&flow->dev_flows)) {\n \t\tdev_flow = LIST_FIRST(&flow->dev_flows);\n \t\tLIST_REMOVE(dev_flow, next);\n", "prefixes": [ "16/19" ] }