Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41689/?format=api
{ "id": 41689, "url": "http://patches.dpdk.org/api/patches/41689/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/3d98905c5684a15c9cf96be6b65fc6d83d5443d8.1530111623.git.nelio.laranjeiro@6wind.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": "<3d98905c5684a15c9cf96be6b65fc6d83d5443d8.1530111623.git.nelio.laranjeiro@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/3d98905c5684a15c9cf96be6b65fc6d83d5443d8.1530111623.git.nelio.laranjeiro@6wind.com", "date": "2018-06-27T15:07:47", "name": "[v2,15/20] net/mlx5: support inner RSS computation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ae5c28c957d661494b9d1b3709e445f691af0abf", "submitter": { "id": 243, "url": "http://patches.dpdk.org/api/people/243/?format=api", "name": "Nélio Laranjeiro", "email": "nelio.laranjeiro@6wind.com" }, "delegate": { "id": 6624, "url": "http://patches.dpdk.org/api/users/6624/?format=api", "username": "shahafs", "first_name": "Shahaf", "last_name": "Shuler", "email": "shahafs@mellanox.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/3d98905c5684a15c9cf96be6b65fc6d83d5443d8.1530111623.git.nelio.laranjeiro@6wind.com/mbox/", "series": [ { "id": 268, "url": "http://patches.dpdk.org/api/series/268/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=268", "date": "2018-06-27T15:07:32", "name": "net/mlx5: flow rework", "version": 2, "mbox": "http://patches.dpdk.org/series/268/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/41689/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/41689/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 E832C1BFFF;\n\tWed, 27 Jun 2018 17:08:07 +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 105701BFC9\n\tfor <dev@dpdk.org>; Wed, 27 Jun 2018 17:07:48 +0200 (CEST)", "by mail-wr0-f194.google.com with SMTP id p1-v6so2404710wrs.9\n\tfor <dev@dpdk.org>; Wed, 27 Jun 2018 08:07:48 -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.46\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 27 Jun 2018 08:07:47 -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=jPfyD6CAN2aKYBZB50wtlhj7p+BVpkVkul6J4E3lU9k=;\n\tb=S88vsgJP5/cNV6tdekHlBCk1hEuaJBb0PdlIAF60l0nIEDOa8lNllEigenOwsGNP6U\n\t683HQ3y4kyq7fq/rj8fu939Dh4FdKyByX4E4Nt84wvtYyyJ8KtJiGjBU+ejb2dLuwxgP\n\tXYqEUcD4YvW3rF7quseeC5vjyfvVjMZHK8S3KpFniqNvuB4Qby4e+4FXOn+/C2ig7TXk\n\tBmOY6AFpOUqlKYPt0PgdOz9T0yOKIZDRODYgTCEmSbxu0NqnXOOChMygOSfeugxUcaIY\n\tEUReuV3l6bpptnL6xARWSEZaUwYUAO4bRW64mZpPGdCWje9uYPZkrGvmatT3XdpLfa84\n\tCxPw==", "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=jPfyD6CAN2aKYBZB50wtlhj7p+BVpkVkul6J4E3lU9k=;\n\tb=QlIgUEvvRmjWp0QmFPR/M7na6TN9dQhKuBNYZCwutxhHlvjAg3SASXdM/tSXYTLPQw\n\tHRZ0zStXY7gbpMrwmEtbMko4AT/PwwWdOlAwXHElf9lPBgLscd9UrtyxEwk0Dm3/g6lR\n\thKnZXzldkDtF8qEElVw7GrP6MlFziiuXn1zu+ACjZ60yS19TNNlqcmQORdTTdBF1/9ex\n\t1U5hwV+xLltXR2hB3nPoMdT0nPLkf73FcXWrb9fza0MoDEDh8+nfO4svipcyQCggNg3+\n\tU2YcZocSwtHauozgs++OyEPcAAAFV1KIDfGglqMqGryLpcrcVARC/LfBKt9/VkG8wHCh\n\th42Q==", "X-Gm-Message-State": "APt69E1BfMEpcKQxCANheB0W0UezXiAg4QQVkgOoc/6oJSnXFdM3CRoU\n\t+myYV1/Yr+ue1NljWOyDbRn1yPjssw==", "X-Google-Smtp-Source": "AAOMgpeEkjVTtUygdG3BGTK8M7MKQq14j9vG06nRVybNNVq4kCe3vzq8/0wEvHP9oRxdVfPMhKBPhQ==", "X-Received": "by 2002:adf:8227:: with SMTP id\n\t36-v6mr5429344wrb.144.1530112067482; \n\tWed, 27 Jun 2018 08:07:47 -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:47 +0200", "Message-Id": "<3d98905c5684a15c9cf96be6b65fc6d83d5443d8.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 15/20] net/mlx5: support inner RSS computation", "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 | 131 +++++++++++++++++++++++++----------\n drivers/net/mlx5/mlx5_rxtx.h | 1 -\n 2 files changed, 96 insertions(+), 36 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 7dda88641..eedf0c461 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -219,6 +219,8 @@ struct rte_flow {\n \tstruct mlx5_flow_verbs *cur_verbs;\n \t/**< Current Verbs flow structure being filled. */\n \tstruct rte_flow_action_rss rss;/**< RSS context. */\n+\tuint32_t ptype;\n+\t/**< Store tunnel packet type data to store in Rx queue. */\n \tuint8_t key[40]; /**< RSS hash key. */\n \tuint16_t (*queue)[]; /**< Destination queues to redirect traffic to. */\n };\n@@ -1320,13 +1322,15 @@ mlx5_flow_action_queue(struct rte_eth_dev *dev,\n * Pointer to flow structure.\n * @param types\n * RSS types for this flow (see ETH_RSS_*).\n+ * @param level\n+ * RSS level.\n *\n * @return\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n static int\n mlx5_flow_action_rss_verbs_attr(struct rte_eth_dev *dev, struct rte_flow *flow,\n-\t\t\t\tuint32_t types)\n+\t\t\t\tuint32_t types, uint32_t level)\n {\n \tconst uint32_t layers = mlx5_flow_layers(flow);\n \tuint64_t hash_fields;\n@@ -1374,6 +1378,8 @@ mlx5_flow_action_rss_verbs_attr(struct rte_eth_dev *dev, struct rte_flow *flow,\n \t\thash_fields = 0;\n \t\tpriority = 2;\n \t}\n+\tif (hash_fields && level == 2)\n+\t\thash_fields |= IBV_RX_HASH_INNER;\n \tflow->cur_verbs->hash_fields = hash_fields;\n \tflow->cur_verbs->attr->priority =\n \t\tmlx5_flow_priority(dev, flow->attributes.priority, priority);\n@@ -1416,7 +1422,7 @@ mlx5_flow_action_rss(struct rte_eth_dev *dev,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_CONF,\n \t\t\t\t\t &rss->func,\n \t\t\t\t\t \"RSS hash function not supported\");\n-\tif (rss->level > 1)\n+\tif (rss->level > 2)\n \t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_CONF,\n \t\t\t\t\t &rss->level,\n@@ -1456,6 +1462,7 @@ mlx5_flow_action_rss(struct rte_eth_dev *dev,\n \tflow->rss.queue_num = rss->queue_num;\n \tmemcpy(flow->key, rss->key, rss_hash_default_key_len);\n \tflow->rss.types = rss->types;\n+\tflow->rss.level = rss->level;\n \tflow->fate |= MLX5_FLOW_FATE_RSS;\n \treturn 0;\n }\n@@ -1814,7 +1821,8 @@ mlx5_flow_merge(struct rte_eth_dev *dev, struct rte_flow *flow,\n \t\t\tflow->cur_verbs->attr->priority =\n \t\t\t\tflow->attributes.priority;\n \t\t\tret = mlx5_flow_action_rss_verbs_attr(dev, flow,\n-\t\t\t\t\t\t\t flow->rss.types);\n+\t\t\t\t\t\t\t flow->rss.types,\n+\t\t\t\t\t\t\t flow->rss.level);\n \t\t\tif (ret < 0)\n \t\t\t\tgoto error;\n \t\t\tLIST_INSERT_HEAD(&flow->verbs, flow->cur_verbs, next);\n@@ -1828,27 +1836,6 @@ mlx5_flow_merge(struct rte_eth_dev *dev, struct rte_flow *flow,\n \treturn ret;\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-\tconst uint32_t mask = MLX5_FLOW_MOD_FLAG | MLX5_FLOW_MOD_MARK;\n-\tuint32_t i;\n-\n-\tif (!(flow->modifier & mask))\n-\t\treturn;\n-\tfor (i = 0; i != flow->rss.queue_num; ++i)\n-\t\t(*priv->rxqs)[(*flow->queue)[i]]->mark = 1;\n-}\n-\n /**\n * Validate a flow supported by the NIC.\n *\n@@ -1978,6 +1965,88 @@ mlx5_flow_fate_apply(struct rte_eth_dev *dev, struct rte_flow *flow,\n \treturn -rte_errno;\n }\n \n+/**\n+ * Set the Tunnel packet type and the Mark in the Rx queue.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device.\n+ * @param idx\n+ * Rx queue index.\n+ */\n+static void\n+mlx5_flow_rxq(struct rte_eth_dev *dev, uint16_t idx)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tstruct rte_flow *flow;\n+\tconst uint32_t mark_m = MLX5_FLOW_MOD_FLAG | MLX5_FLOW_MOD_MARK;\n+\tuint32_t ptype = 0;\n+\tuint32_t mark = 0;\n+\n+\tTAILQ_FOREACH(flow, &priv->flows, next) {\n+\t\tunsigned int i;\n+\n+\t\tfor (i = 0; i != flow->rss.queue_num; ++i) {\n+\t\t\tif ((*flow->queue)[i] == idx) {\n+\t\t\t\tmark |= !!(flow->modifier & mark_m);\n+\t\t\t\tif (ptype == 0)\n+\t\t\t\t\tptype = flow->ptype;\n+\t\t\t\telse if (ptype != flow->ptype)\n+\t\t\t\t\tptype = (uint32_t)-1;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t}\n+\tif (ptype == (uint32_t)-1)\n+\t\tptype = 0;\n+\t(*priv->rxqs)[idx]->tunnel = ptype;\n+\t(*priv->rxqs)[idx]->mark = mark;\n+}\n+\n+/**\n+ * Set the tunnel packet type and Mark in the Rx queues, if several packet\n+ * types are possible, the information in the Rx queue is just cleared.\n+ * Mark is not impacted by this case.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device.\n+ */\n+static void\n+mlx5_flow_rxqs(struct rte_eth_dev *dev)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tunsigned int idx;\n+\tunsigned int n;\n+\n+\tfor (idx = 0, n = 0; n != priv->rxqs_n; ++idx) {\n+\t\tif (!(*priv->rxqs)[idx])\n+\t\t\tcontinue;\n+\t\tmlx5_flow_rxq(dev, idx);\n+\t\tn++;\n+\t}\n+}\n+\n+/**\n+ * Clear tunnel ptypes and Mark in Rx queues.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device.\n+ */\n+static void\n+mlx5_flow_rxqs_clear(struct rte_eth_dev *dev)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tunsigned int idx;\n+\tunsigned int n;\n+\n+\tfor (idx = 0, n = 0; n != priv->rxqs_n; ++idx) {\n+\t\tif (!(*priv->rxqs)[idx])\n+\t\t\tcontinue;\n+\t\t(*priv->rxqs)[idx]->tunnel = 0;\n+\t\t(*priv->rxqs)[idx]->mark = 0;\n+\t\tn++;\n+\t}\n+}\n+\n /**\n * Create a flow.\n *\n@@ -2039,8 +2108,8 @@ mlx5_flow_list_create(struct rte_eth_dev *dev,\n \t\t\treturn NULL;\n \t\t}\n \t}\n-\tmlx5_flow_rxq_mark(dev, flow);\n \tTAILQ_INSERT_TAIL(list, flow, next);\n+\tmlx5_flow_rxqs(dev);\n \treturn flow;\n }\n \n@@ -2144,19 +2213,11 @@ 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+\tmlx5_flow_rxqs_clear(dev);\n }\n \n /**\n@@ -2181,8 +2242,8 @@ 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+\tmlx5_flow_rxqs(dev);\n \treturn 0;\n error:\n \tret = rte_errno; /* Save rte_errno before cleanup. */\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex bb67c32a6..57504ceb2 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -136,7 +136,6 @@ struct mlx5_rxq_ctrl {\n \tstruct priv *priv; /* Back pointer to private data. */\n \tstruct mlx5_rxq_data rxq; /* Data path structure. */\n \tunsigned int socket; /* CPU socket ID for allocations. */\n-\tuint32_t tunnel_types[16]; /* Tunnel type counter. */\n \tunsigned int irq:1; /* Whether IRQ is enabled. */\n \tuint16_t idx; /* Queue index. */\n };\n", "prefixes": [ "v2", "15/20" ] }