Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/65490/?format=api
{ "id": 65490, "url": "http://patches.dpdk.org/api/patches/65490/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1580736735-19472-6-git-send-email-bingz@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": "<1580736735-19472-6-git-send-email-bingz@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1580736735-19472-6-git-send-email-bingz@mellanox.com", "date": "2020-02-03T13:32:14", "name": "[5/6] net/mlx5: remove the DV support macro checking", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "99fd51b6057d3c04da5fd2cedb6261d05e7d32db", "submitter": { "id": 1357, "url": "http://patches.dpdk.org/api/people/1357/?format=api", "name": "Bing Zhao", "email": "bingz@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/1580736735-19472-6-git-send-email-bingz@mellanox.com/mbox/", "series": [ { "id": 8396, "url": "http://patches.dpdk.org/api/series/8396/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8396", "date": "2020-02-03T13:32:09", "name": "net/mlx5: move to non-cached mode for flow rules", "version": 1, "mbox": "http://patches.dpdk.org/series/8396/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/65490/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/65490/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 3827DA052E;\n\tMon, 3 Feb 2020 14:33:19 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 5FB4B1C0B5;\n\tMon, 3 Feb 2020 14:32:42 +0100 (CET)", "from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130])\n by dpdk.org (Postfix) with ESMTP id 04A1F1C014\n for <dev@dpdk.org>; Mon, 3 Feb 2020 14:32:40 +0100 (CET)" ], "From": "Bing Zhao <bingz@mellanox.com>", "To": "orika@mellanox.com, viacheslavo@mellanox.com, rasland@mellanox.com,\n matan@mellanox.com", "Cc": "dev@dpdk.org", "Date": "Mon, 3 Feb 2020 15:32:14 +0200", "Message-Id": "<1580736735-19472-6-git-send-email-bingz@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1580736735-19472-1-git-send-email-bingz@mellanox.com>", "References": "<1580736735-19472-1-git-send-email-bingz@mellanox.com>", "Subject": "[dpdk-dev] [PATCH 5/6] net/mlx5: remove the DV support macro\n\tchecking", "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": "Some structures are defined in the mlx5_flow header file and only\nused for flows with DV driver type. When using inbox driver, the DV\nmode is not supported. But the code is unique and there is no need\nto use pre-processing macro since all code could be compiled.\n\nSigned-off-by: Bing Zhao <bingz@mellanox.com>\n---\n drivers/net/mlx5/mlx5_flow.c | 42 ++++++++----------------------------------\n drivers/net/mlx5/mlx5_flow.h | 2 --\n 2 files changed, 8 insertions(+), 36 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 1121904..2b2ba20 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -716,7 +716,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n */\n static void\n flow_drv_rxq_flags_set(struct rte_eth_dev *dev,\n-\t\t enum mlx5_flow_drv_type type __rte_unused,\n+\t\t enum mlx5_flow_drv_type type,\n \t\t void *sub_flow)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n@@ -726,7 +726,6 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \tuint64_t layers;\n \tunsigned int i;\n \n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \tif (type == MLX5_FLOW_TYPE_DV) {\n \t\tstruct mlx5_flow_dv_handle *handle = sub_flow;\n \t\tmark = !!(handle->action_flags &\n@@ -735,16 +734,13 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\ttunnel = !!(layers & MLX5_FLOW_LAYER_TUNNEL);\n \t\tflow = handle->m_flow;\n \t} else {\n-#endif\n \t\tstruct mlx5_flow *dev_flow = sub_flow;\n \t\tmark = !!(dev_flow->actions &\n \t\t\t (MLX5_FLOW_ACTION_FLAG | MLX5_FLOW_ACTION_MARK));\n \t\tlayers = dev_flow->layers;\n \t\ttunnel = !!(dev_flow->layers & MLX5_FLOW_LAYER_TUNNEL);\n \t\tflow = dev_flow->flow;\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t}\n-#endif\n \tfor (i = 0; i != flow->rss.queue_num; ++i) {\n \t\tint idx = (*flow->rss.queue)[i];\n \t\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n@@ -793,15 +789,13 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n flow_rxq_flags_set(struct rte_eth_dev *dev, struct rte_flow *flow)\n {\n \tstruct mlx5_flow *dev_flow;\n+\tstruct mlx5_flow_dv_handle *handle;\n \tenum mlx5_flow_drv_type type = flow->drv_type;\n \n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-\tstruct mlx5_flow_dv_handle *handle;\n \tif (type == MLX5_FLOW_TYPE_DV)\n \t\tSLIST_FOREACH(handle, &flow->handles, next)\n \t\t\tflow_drv_rxq_flags_set(dev, type, (void *)handle);\n \telse\n-#endif\n \t\tLIST_FOREACH(dev_flow, &flow->dev_flows, next)\n \t\t\tflow_drv_rxq_flags_set(dev, type, (void *)dev_flow);\n }\n@@ -820,7 +814,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n */\n static void\n flow_drv_rxq_flags_trim(struct rte_eth_dev *dev,\n-\t\t\tenum mlx5_flow_drv_type type __rte_unused,\n+\t\t\tenum mlx5_flow_drv_type type,\n \t\t\tvoid *sub_flow)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n@@ -831,7 +825,6 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \tunsigned int i;\n \n \tMLX5_ASSERT(dev->data->dev_started);\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \tif (type == MLX5_FLOW_TYPE_DV) {\n \t\tstruct mlx5_flow_dv_handle *handle = sub_flow;\n \t\tmark = !!(handle->action_flags &\n@@ -840,16 +833,13 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\ttunnel = !!(layers & MLX5_FLOW_LAYER_TUNNEL);\n \t\tflow = handle->m_flow;\n \t} else {\n-#endif\n \t\tstruct mlx5_flow *dev_flow = sub_flow;\n \t\tmark = !!(dev_flow->actions &\n \t\t\t (MLX5_FLOW_ACTION_FLAG | MLX5_FLOW_ACTION_MARK));\n \t\tlayers = dev_flow->layers;\n \t\ttunnel = !!(layers & MLX5_FLOW_LAYER_TUNNEL);\n \t\tflow = dev_flow->flow;\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t}\n-#endif\n \tfor (i = 0; i != flow->rss.queue_num; ++i) {\n \t\tint idx = (*flow->rss.queue)[i];\n \t\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n@@ -894,15 +884,13 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n flow_rxq_flags_trim(struct rte_eth_dev *dev, struct rte_flow *flow)\n {\n \tstruct mlx5_flow *dev_flow;\n+\tstruct mlx5_flow_dv_handle *handle;\n \tenum mlx5_flow_drv_type type = flow->drv_type;\n \n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n-\tstruct mlx5_flow_dv_handle *handle;\n \tif (type == MLX5_FLOW_TYPE_DV)\n \t\tSLIST_FOREACH(handle, &flow->handles, next)\n \t\t\tflow_drv_rxq_flags_trim(dev, type, (void *)handle);\n \telse\n-#endif\n \t\tLIST_FOREACH(dev_flow, &flow->dev_flows, next)\n \t\t\tflow_drv_rxq_flags_trim(dev, type, (void *)dev_flow);\n }\n@@ -2402,7 +2390,6 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t\t struct rte_flow *flow)\n {\n \tstruct mlx5_flow *dev_flow;\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \tstruct mlx5_flow_dv_handle *handle;\n \tenum mlx5_flow_drv_type type = flow->drv_type;\n \n@@ -2411,13 +2398,10 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t\tif (handle->qrss_id)\n \t\t\t\tflow_qrss_free_id(dev, handle->qrss_id);\n \t} else {\n-#endif\n \t\tLIST_FOREACH(dev_flow, &flow->dev_flows, next)\n \t\t\tif (dev_flow->qrss_id)\n \t\t\t\tflow_qrss_free_id(dev, dev_flow->qrss_id);\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t}\n-#endif\n }\n \n static int\n@@ -3509,18 +3493,14 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\treturn -rte_errno;\n \tdev_flow->external = external;\n \tdev_flow->flow = flow;\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \tif (flow->drv_type == MLX5_FLOW_TYPE_DV) {\n \t\tSLIST_INSERT_HEAD(&flow->handles, dev_flow->dv_handle, next);\n \t\tdev_flow->dv_handle->sidx = flow->sub_flows++;\n \t\tdev_flow->dv_handle->m_flow = flow;\n \t} else {\n-#endif\n \t\t/* Subflow obj was created, we must include one in the list. */\n \t\tLIST_INSERT_HEAD(&flow->dev_flows, dev_flow, next);\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t}\n-#endif\n \tif (sub_flow)\n \t\t*sub_flow = dev_flow;\n \treturn flow_drv_translate(dev, dev_flow, attr, items, actions, error);\n@@ -3982,11 +3962,10 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t\t * reallocation becomes possible (for example, for\n \t\t\t * other flows in other threads).\n \t\t\t */\n-\t\t\tdev_flow->qrss_id = qrss_id;\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t\t\tif (flow->drv_type == MLX5_FLOW_TYPE_DV)\n \t\t\t\tdev_flow->dv_handle->qrss_id = qrss_id;\n-#endif\n+\t\t\telse\n+\t\t\t\tdev_flow->qrss_id = qrss_id;\n \t\t\tqrss_id = 0;\n \t\t\tret = mlx5_flow_get_reg_id(dev, MLX5_COPY_MARK, 0,\n \t\t\t\t\t\t error);\n@@ -4098,11 +4077,10 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t\tret = -rte_errno;\n \t\t\tgoto exit;\n \t\t}\n-\t\tdev_flow->mtr_flow_id = mtr_tag_id;\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t\tif (flow->drv_type == MLX5_FLOW_TYPE_DV)\n \t\t\tdev_flow->dv_handle->mtr_flow_id = mtr_tag_id;\n-#endif\n+\t\telse\n+\t\t\tdev_flow->mtr_flow_id = mtr_tag_id;\n \t\t/* Prepare the suffix flow match pattern. */\n \t\tsfx_items = (struct rte_flow_item *)((char *)sfx_actions +\n \t\t\t act_size);\n@@ -4337,19 +4315,15 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t\t\t\t actions_hairpin_tx.actions, error);\n \t\tif (!dev_flow)\n \t\t\tgoto error;\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t\tif (flow->drv_type == MLX5_FLOW_TYPE_DV) {\n \t\t\tSLIST_INSERT_HEAD(&flow->handles,\n \t\t\t\t\t dev_flow->dv_handle, next);\n \t\t\tdev_flow->dv_handle->sidx = flow->sub_flows++;\n \t\t\tdev_flow->dv_handle->m_flow = flow;\n \t\t} else {\n-#endif\n \t\t\tdev_flow->flow = flow;\n \t\t\tLIST_INSERT_HEAD(&flow->dev_flows, dev_flow, next);\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t\t}\n-#endif\n \t\tdev_flow->external = 0;\n \t\tret = flow_drv_translate(dev, dev_flow, &attr_tx,\n \t\t\t\t\t items_tx.items,\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex 10ac9c3..5e517c3 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -579,9 +579,7 @@ struct mlx5_flow {\n \tuint32_t group; /**< The group index. */\n \tuint8_t transfer; /**< 1 if the flow is E-Switch flow. */\n \tunion {\n-#ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t\tstruct mlx5_flow_dv_handle *dv_handle;\n-#endif\n \t\tstruct mlx5_flow_verbs verbs;\n \t};\n \tunion {\n", "prefixes": [ "5/6" ] }