Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41686/?format=api
{ "id": 41686, "url": "http://patchwork.dpdk.org/api/patches/41686/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/90a73b5f33e147ffa3a668f5d19410de17f96045.1530111623.git.nelio.laranjeiro@6wind.com/", "project": { "id": 1, "url": "http://patchwork.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": "<90a73b5f33e147ffa3a668f5d19410de17f96045.1530111623.git.nelio.laranjeiro@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/90a73b5f33e147ffa3a668f5d19410de17f96045.1530111623.git.nelio.laranjeiro@6wind.com", "date": "2018-06-27T15:07:44", "name": "[v2,12/20] net/mlx5: add mark/flag flow action", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "31170f2c723f6d243fd3a19943b1e04efdca2c02", "submitter": { "id": 243, "url": "http://patchwork.dpdk.org/api/people/243/?format=api", "name": "Nélio Laranjeiro", "email": "nelio.laranjeiro@6wind.com" }, "delegate": { "id": 6624, "url": "http://patchwork.dpdk.org/api/users/6624/?format=api", "username": "shahafs", "first_name": "Shahaf", "last_name": "Shuler", "email": "shahafs@mellanox.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/90a73b5f33e147ffa3a668f5d19410de17f96045.1530111623.git.nelio.laranjeiro@6wind.com/mbox/", "series": [ { "id": 268, "url": "http://patchwork.dpdk.org/api/series/268/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=268", "date": "2018-06-27T15:07:32", "name": "net/mlx5: flow rework", "version": 2, "mbox": "http://patchwork.dpdk.org/series/268/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/41686/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/41686/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 330531BFF1;\n\tWed, 27 Jun 2018 17:08:01 +0200 (CEST)", "from mail-wr0-f194.google.com (mail-wr0-f194.google.com\n\t[209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 9DC6D1BFBF\n\tfor <dev@dpdk.org>; Wed, 27 Jun 2018 17:07:45 +0200 (CEST)", "by mail-wr0-f194.google.com with SMTP id k16-v6so2412324wro.0\n\tfor <dev@dpdk.org>; Wed, 27 Jun 2018 08:07:45 -0700 (PDT)", "from laranjeiro-vm.dev.6wind.com\n\t(host.78.145.23.62.rev.coltfrance.com. [62.23.145.78])\n\tby smtp.gmail.com with ESMTPSA id\n\tk17-v6sm4872513wrp.19.2018.06.27.08.07.44\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 27 Jun 2018 08:07:44 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:subject:date:message-id:in-reply-to:references;\n\tbh=PqKDnXhwtZPMfywHazvZ9gKvn+hH1CQYQA5s61neoXs=;\n\tb=Zb9rcoZb+AqLkaGcgEcFK2Xg3WslnLZ+eSXDCk1APzOg+P1Rx6xwLRwyTBRZmQvjlx\n\tlkv55rSpmCbc3qMGSqbmQTNBYaMir1QH7IswtVDplqlqbTmw7EyQXIqN1/suQxrwnoTH\n\t0wvp5Brr0LAbyucQb48ml44icMMV6ohBH74sOydli0u+uLdAim3f9WWZPCtmqNjXlLtG\n\tsCk6s2r7NSRvd0sVqqnSBxYY6V35OhPOoyFVhJchUxGCU3CwYzwpvhMxXSf8V7oXtvFc\n\tRgU/A0KNq7E+3JHHCjtovJhnnW7XOWs1DBEAEimQBC9VGCgWFZOxPjgp1EjHO/AKg7gd\n\tlxMg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=PqKDnXhwtZPMfywHazvZ9gKvn+hH1CQYQA5s61neoXs=;\n\tb=AEF6eZUFbJePeBE0og/qyRuSFt96MGbXoIAk5eJH35Z0vYurMVkqKEy4nVKIqkqCx2\n\tpABfCXEAmdAGd575MboZgkxA+cEkieNzg5QnTG4koxlWoSdXCDQ18jLPg0yew3oeEXgK\n\tTaIIxaHFi21xOuXCc2FKn8LvRm5KbETiTjBuD5+JEHhBZXZ/goguplTHnacGB90EML1g\n\tz/RYzUtHI7IwT8VSIZRIV0bWhS2y0SVs/Jwj4NrCJhzbAuQZPR9Lzwa2MrubPMnfL3d+\n\tjJyq+dt7JDApjXLkzG358XV4oi+05L3RBikvK1PA4qxSeepsAEOfRcBZpAQKifI0YP1X\n\tV2DQ==", "X-Gm-Message-State": "APt69E1HBnQvvVEfZZR3Ce9Ab1iwLm6KmbpJXDTcC7N3jNuntcFunyFj\n\tXt9w9oU1MmmlL2zP4neBX9fxFTkRqg==", "X-Google-Smtp-Source": "AAOMgpf1BiNv3ImEA1G2AGjC1muDBR5jzJHvp+3XrB7HEb3Oc9NB2jpTSxBhbsllNarVTCPdBwXqlA==", "X-Received": "by 2002:adf:99ea:: with SMTP id\n\ty97-v6mr5414013wrb.215.1530112065047; \n\tWed, 27 Jun 2018 08:07:45 -0700 (PDT)", "From": "Nelio Laranjeiro <nelio.laranjeiro@6wind.com>", "To": "dev@dpdk.org, Adrien Mazarguil <adrien.mazarguil@6wind.com>,\n\tYongseok Koh <yskoh@mellanox.com>", "Date": "Wed, 27 Jun 2018 17:07:44 +0200", "Message-Id": "<90a73b5f33e147ffa3a668f5d19410de17f96045.1530111623.git.nelio.laranjeiro@6wind.com>", "X-Mailer": "git-send-email 2.18.0", "In-Reply-To": "<cover.1530111623.git.nelio.laranjeiro@6wind.com>", "References": "<cover.1527506071.git.nelio.laranjeiro@6wind.com>\n\t<cover.1530111623.git.nelio.laranjeiro@6wind.com>", "Subject": "[dpdk-dev] [PATCH v2 12/20] net/mlx5: add mark/flag 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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\n---\n drivers/net/mlx5/mlx5_flow.c | 209 +++++++++++++++++++++++++++++++++++\n 1 file changed, 209 insertions(+)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 57f072c03..a39157533 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -52,6 +52,10 @@ extern const struct eth_dev_ops mlx5_dev_ops_isolate;\n #define MLX5_FLOW_FATE_DROP (1u << 0)\n #define MLX5_FLOW_FATE_QUEUE (1u << 1)\n \n+/* Modify a packet. */\n+#define MLX5_FLOW_MOD_FLAG (1u << 0)\n+#define MLX5_FLOW_MOD_MARK (1u << 1)\n+\n /** Handles information leading to a drop fate. */\n struct mlx5_flow_verbs {\n \tunsigned int size; /**< Size of the attribute. */\n@@ -70,6 +74,8 @@ struct rte_flow {\n \tstruct rte_flow_attr attributes; /**< User flow attribute. */\n \tuint32_t layers;\n \t/**< Bit-fields of present layers see MLX5_FLOW_ITEMS_*. */\n+\tuint32_t modifier;\n+\t/**< Bit-fields of present modifier see MLX5_FLOW_MOD_*. */\n \tuint32_t fate;\n \t/**< Bit-fields of present fate see MLX5_FLOW_FATE_*. */\n \tstruct mlx5_flow_verbs verbs; /* Verbs flow. */\n@@ -954,6 +960,12 @@ mlx5_flow_action_drop(const struct rte_flow_action *actions,\n \t\t\t\t\t actions,\n \t\t\t\t\t \"multiple fate actions are not\"\n \t\t\t\t\t \" supported\");\n+\tif (flow->modifier & (MLX5_FLOW_MOD_FLAG | MLX5_FLOW_MOD_MARK))\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t actions,\n+\t\t\t\t\t \"drop is not compatible with\"\n+\t\t\t\t\t \" flag/mark action\");\n \tif (size < flow_size)\n \t\tmlx5_flow_spec_verbs_add(flow, &drop, size);\n \tflow->fate |= MLX5_FLOW_FATE_DROP;\n@@ -1007,6 +1019,144 @@ mlx5_flow_action_queue(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+/**\n+ * Validate action flag provided by the user.\n+ *\n+ * @param actions\n+ * Pointer to flow actions array.\n+ * @param flow\n+ * Pointer to the rte_flow structure.\n+ * @param flow_size\n+ * Size in bytes of the available space for to store the flow information.\n+ * @param error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * size in bytes necessary for the conversion, a negative errno value\n+ * otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_flow_action_flag(const struct rte_flow_action *actions,\n+\t\t struct rte_flow *flow, const size_t flow_size,\n+\t\t struct rte_flow_error *error)\n+{\n+\tunsigned int size = sizeof(struct ibv_flow_spec_action_tag);\n+\tstruct ibv_flow_spec_action_tag tag = {\n+\t\t.type = IBV_FLOW_SPEC_ACTION_TAG,\n+\t\t.size = size,\n+\t\t.tag_id = mlx5_flow_mark_set(MLX5_FLOW_MARK_DEFAULT),\n+\t};\n+\n+\tif (flow->modifier & MLX5_FLOW_MOD_FLAG)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t actions,\n+\t\t\t\t\t \"flag action already present\");\n+\tif (flow->fate & MLX5_FLOW_FATE_DROP)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t actions,\n+\t\t\t\t\t \"flag is not compatible with drop\"\n+\t\t\t\t\t \" action\");\n+\tif (flow->modifier & MLX5_FLOW_MOD_MARK)\n+\t\treturn 0;\n+\tflow->modifier |= MLX5_FLOW_MOD_FLAG;\n+\tif (size <= flow_size)\n+\t\tmlx5_flow_spec_verbs_add(flow, &tag, size);\n+\treturn size;\n+}\n+\n+/**\n+ * Update verbs specification to modify the flag to mark.\n+ *\n+ * @param flow\n+ * Pointer to the rte_flow structure.\n+ * @param mark_id\n+ * Mark identifier to replace the flag.\n+ */\n+static void\n+mlx5_flow_verbs_mark_update(struct rte_flow *flow, uint32_t mark_id)\n+{\n+\tstruct ibv_spec_header *hdr;\n+\tint i;\n+\n+\t/* Update Verbs specification. */\n+\thdr = (struct ibv_spec_header *)flow->verbs.specs;\n+\tfor (i = 0; i != flow->verbs.attr->num_of_specs; ++i) {\n+\t\tif (hdr->type == IBV_FLOW_SPEC_ACTION_TAG) {\n+\t\t\tstruct ibv_flow_spec_action_tag *t =\n+\t\t\t\t(struct ibv_flow_spec_action_tag *)hdr;\n+\n+\t\t\tt->tag_id = mlx5_flow_mark_set(mark_id);\n+\t\t}\n+\t\thdr = (struct ibv_spec_header *)((uintptr_t)hdr + hdr->size);\n+\t}\n+}\n+\n+/**\n+ * Validate action mark provided by the user.\n+ *\n+ * @param actions\n+ * Pointer to flow actions array.\n+ * @param flow\n+ * Pointer to the rte_flow structure.\n+ * @param flow_size[in]\n+ * Size in bytes of the available space for to store the flow information.\n+ * @param error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * size in bytes necessary for the conversion, a negative errno value\n+ * otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_flow_action_mark(const struct rte_flow_action *actions,\n+\t\t struct rte_flow *flow, const size_t flow_size,\n+\t\t struct rte_flow_error *error)\n+{\n+\tconst struct rte_flow_action_mark *mark = actions->conf;\n+\tunsigned int size = sizeof(struct ibv_flow_spec_action_tag);\n+\tstruct ibv_flow_spec_action_tag tag = {\n+\t\t.type = IBV_FLOW_SPEC_ACTION_TAG,\n+\t\t.size = size,\n+\t};\n+\n+\tif (!mark)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t actions,\n+\t\t\t\t\t \"configuration cannot be null\");\n+\tif (mark->id >= MLX5_FLOW_MARK_MAX)\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 must be between 0 and\"\n+\t\t\t\t\t \" 16777199\");\n+\tif (flow->modifier & MLX5_FLOW_MOD_MARK)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t actions,\n+\t\t\t\t\t \"mark action already present\");\n+\tif (flow->fate & MLX5_FLOW_FATE_DROP)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t actions,\n+\t\t\t\t\t \"mark is not compatible with drop\"\n+\t\t\t\t\t \" action\");\n+\tif (flow->modifier & MLX5_FLOW_MOD_FLAG) {\n+\t\tmlx5_flow_verbs_mark_update(flow, mark->id);\n+\t\tsize = 0; /**< Only an update is done in the specification. */\n+\t} else {\n+\t\ttag.tag_id = mlx5_flow_mark_set(mark->id);\n+\t\tif (size <= flow_size) {\n+\t\t\ttag.tag_id = mlx5_flow_mark_set(mark->id);\n+\t\t\tmlx5_flow_spec_verbs_add(flow, &tag, size);\n+\t\t}\n+\t}\n+\tflow->modifier |= MLX5_FLOW_MOD_MARK;\n+\treturn size;\n+}\n+\n /**\n * Validate actions provided by the user.\n *\n@@ -1039,6 +1189,14 @@ mlx5_flow_actions(struct rte_eth_dev *dev,\n \t\tswitch (actions->type) {\n \t\tcase RTE_FLOW_ACTION_TYPE_VOID:\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_FLAG:\n+\t\t\tret = mlx5_flow_action_flag(actions, flow, remain,\n+\t\t\t\t\t\t error);\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_MARK:\n+\t\t\tret = mlx5_flow_action_mark(actions, flow, remain,\n+\t\t\t\t\t\t error);\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_DROP:\n \t\t\tret = mlx5_flow_action_drop(actions, flow, remain,\n \t\t\t\t\t\t error);\n@@ -1122,6 +1280,23 @@ mlx5_flow_merge(struct rte_eth_dev *dev, struct rte_flow *flow,\n \treturn size;\n }\n \n+/**\n+ * Mark the Rx queues mark flag if the flow has a mark or flag modifier.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device.\n+ * @param flow\n+ * Pointer to flow structure.\n+ */\n+static void\n+mlx5_flow_rxq_mark(struct rte_eth_dev *dev, struct rte_flow *flow)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\n+\t(*priv->rxqs)[flow->queue]->mark |=\n+\t\tflow->modifier & (MLX5_FLOW_MOD_FLAG | MLX5_FLOW_MOD_MARK);\n+}\n+\n /**\n * Validate a flow supported by the NIC.\n *\n@@ -1281,6 +1456,7 @@ mlx5_flow_list_create(struct rte_eth_dev *dev,\n \t\tif (ret < 0)\n \t\t\tgoto error;\n \t}\n+\tmlx5_flow_rxq_mark(dev, flow);\n \tTAILQ_INSERT_TAIL(list, flow, next);\n \treturn flow;\n error:\n@@ -1323,8 +1499,31 @@ static void\n mlx5_flow_list_destroy(struct rte_eth_dev *dev, struct mlx5_flows *list,\n \t\t struct rte_flow *flow)\n {\n+\tstruct priv *priv = dev->data->dev_private;\n+\tstruct rte_flow *rflow;\n+\tconst uint32_t mask = MLX5_FLOW_MOD_FLAG & MLX5_FLOW_MOD_MARK;\n+\tint mark = 0;\n+\n \tmlx5_flow_fate_remove(dev, flow);\n \tTAILQ_REMOVE(list, flow, next);\n+\tif (!(flow->modifier & mask)) {\n+\t\trte_free(flow);\n+\t\treturn;\n+\t}\n+\t/*\n+\t * When a flow is removed and this flow has a flag/mark modifier, all\n+\t * flows needs to be parse to verify if the Rx queue use by the flow\n+\t * still need to track the flag/mark request.\n+\t */\n+\tTAILQ_FOREACH(rflow, &priv->flows, next) {\n+\t\tif (!(rflow->modifier & mask))\n+\t\t\tcontinue;\n+\t\tif (flow->queue == rflow->queue) {\n+\t\t\tmark = 1;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\t(*priv->rxqs)[flow->queue]->mark = !!mark;\n \trte_free(flow);\n }\n \n@@ -1358,10 +1557,19 @@ mlx5_flow_list_flush(struct rte_eth_dev *dev, struct mlx5_flows *list)\n void\n mlx5_flow_stop(struct rte_eth_dev *dev, struct mlx5_flows *list)\n {\n+\tstruct priv *priv = dev->data->dev_private;\n \tstruct rte_flow *flow;\n+\tunsigned int i;\n+\tunsigned int idx;\n \n \tTAILQ_FOREACH_REVERSE(flow, list, mlx5_flows, next)\n \t\tmlx5_flow_fate_remove(dev, flow);\n+\tfor (idx = 0, i = 0; idx != priv->rxqs_n; ++i) {\n+\t\tif (!(*priv->rxqs)[idx])\n+\t\t\tcontinue;\n+\t\t(*priv->rxqs)[idx]->mark = 0;\n+\t\t++idx;\n+\t}\n }\n \n /**\n@@ -1386,6 +1594,7 @@ mlx5_flow_start(struct rte_eth_dev *dev, struct mlx5_flows *list)\n \t\tret = mlx5_flow_fate_apply(dev, flow, &error);\n \t\tif (ret < 0)\n \t\t\tgoto error;\n+\t\tmlx5_flow_rxq_mark(dev, flow);\n \t}\n \treturn 0;\n error:\n", "prefixes": [ "v2", "12/20" ] }