Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62715/?format=api
{ "id": 62715, "url": "http://patches.dpdk.org/api/patches/62715/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1573184965-49691-4-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": "<1573184965-49691-4-git-send-email-suanmingm@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1573184965-49691-4-git-send-email-suanmingm@mellanox.com", "date": "2019-11-08T03:49:09", "name": "[v2,03/19] net/mlx5: allocate flow meter registers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "555baa7b7e1703aed44eb26b6ced7a712a47999f", "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/1573184965-49691-4-git-send-email-suanmingm@mellanox.com/mbox/", "series": [ { "id": 7343, "url": "http://patches.dpdk.org/api/series/7343/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7343", "date": "2019-11-08T03:49:07", "name": "net/mlx5: support meter", "version": 2, "mbox": "http://patches.dpdk.org/series/7343/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62715/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/62715/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 B781FA04AB;\n\tFri, 8 Nov 2019 04:50:05 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 3C1411BF90;\n\tFri, 8 Nov 2019 04:49:43 +0100 (CET)", "from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130])\n by dpdk.org (Postfix) with ESMTP id AE9081BF4F\n for <dev@dpdk.org>; Fri, 8 Nov 2019 04:49:32 +0100 (CET)" ], "From": "Suanming Mou <suanmingm@mellanox.com>", "To": "viacheslavo@mellanox.com,\n\tmatan@mellanox.com", "Cc": "orika@mellanox.com,\n\trasland@mellanox.com,\n\tdev@dpdk.org", "Date": "Fri, 8 Nov 2019 05:49:09 +0200", "Message-Id": "<1573184965-49691-4-git-send-email-suanmingm@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1573184965-49691-1-git-send-email-suanmingm@mellanox.com>", "References": "<1573053090-179521-1-git-send-email-suanmingm@mellanox.com>\n <1573184965-49691-1-git-send-email-suanmingm@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v2 03/19] net/mlx5: allocate flow meter registers", "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": "Meter need the metadata REG_C to have the color match between the prefix\nflow and the meter flow.\n\nAs the user define or metadata feature will both use the REG_C in the\nsuffix flow, the color match register meter uses will not impact the\nregister use in the later sub flow.\n\nAnother case is that tag is add before meter flow. In this case, meter\nshould not touch the register the tag action is using. To avoid that\ncase, meter should reserve the REG_C's used by user defined MLX5_APP_TAG.\n\nSigned-off-by: Suanming Mou <suanmingm@mellanox.com>\n---\n drivers/net/mlx5/mlx5.c | 20 ++++++++++++++-\n drivers/net/mlx5/mlx5.h | 2 ++\n drivers/net/mlx5/mlx5_flow.c | 60 +++++++++++++++++++++++++++++++++-----------\n drivers/net/mlx5/mlx5_flow.h | 2 ++\n 4 files changed, 68 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 1adef85..3b30169 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -2293,7 +2293,25 @@ struct mlx5_flow_id_pool *\n #if defined(HAVE_MLX5DV_DR) && defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER)\n \t\tif (config.hca_attr.qos.sup && config.hca_attr.qos.srtcm_sup &&\n \t\t config.dv_flow_en) {\n-\t\t\tpriv->mtr_en = 1;\n+\t\t\tuint8_t reg_c_mask =\n+\t\t\t\tconfig.hca_attr.qos.flow_meter_reg_c_ids;\n+\t\t\t/*\n+\t\t\t * Meter needs two REG_C's for color match and pre-sfx\n+\t\t\t * flow match. Here get the REG_C for color match.\n+\t\t\t * REG_C_0 and REG_C_1 is reserved for metadata feature.\n+\t\t\t */\n+\t\t\treg_c_mask &= 0xfc;\n+\t\t\tif (__builtin_popcount(reg_c_mask) < 1) {\n+\t\t\t\tpriv->mtr_en = 0;\n+\t\t\t\tDRV_LOG(WARNING, \"No available register for\"\n+\t\t\t\t\t\" meter.\");\n+\t\t\t} else {\n+\t\t\t\tpriv->mtr_color_reg = ffs(reg_c_mask) - 1 +\n+\t\t\t\t\t\t REG_C_0;\n+\t\t\t\tpriv->mtr_en = 1;\n+\t\t\t\tDRV_LOG(DEBUG, \"The REG_C meter uses is %d\",\n+\t\t\t\t\tpriv->mtr_color_reg);\n+\t\t\t}\n \t\t}\n #endif\n \t}\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex be2f23d..f19ea23 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -752,6 +752,8 @@ struct mlx5_priv {\n \tstruct mlx5_flow_id_pool *qrss_id_pool;\n \tstruct mlx5_hlist *mreg_cp_tbl;\n \t/* Hash table of Rx metadata register copy table. */\n+\tuint8_t mtr_sfx_reg; /* Meter prefix-suffix flow match REG_C. */\n+\tuint8_t mtr_color_reg; /* Meter color match REG_C. */\n #ifndef RTE_ARCH_64\n \trte_spinlock_t uar_lock_cq; /* CQs share a common distinct UAR */\n \trte_spinlock_t uar_lock[MLX5_UAR_PAGE_NUM_MAX];\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 61afc48..b8abe6a 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -344,6 +344,7 @@ enum modify_reg\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_dev_config *config = &priv->config;\n+\tenum modify_reg start_reg;\n \n \tswitch (feature) {\n \tcase MLX5_HAIRPIN_RX:\n@@ -375,24 +376,53 @@ enum modify_reg\n \t\t}\n \t\tbreak;\n \tcase MLX5_COPY_MARK:\n-\t\treturn REG_C_3;\n+\tcase MLX5_MTR_SFX:\n+\t\t/*\n+\t\t * Metadata COPY_MARK register using is in meter suffix sub\n+\t\t * flow while with meter. It's safe to share the same register.\n+\t\t */\n+\t\treturn priv->mtr_color_reg != REG_C_2 ? REG_C_2 : REG_C_3;\n+\tcase MLX5_MTR_COLOR:\n+\t\tRTE_ASSERT(priv->mtr_color_reg != REG_NONE);\n+\t\treturn priv->mtr_color_reg;\n \tcase MLX5_APP_TAG:\n \t\t/*\n-\t\t * Suppose engaging reg_c_2 .. reg_c_7 registers.\n-\t\t * reg_c_2 is reserved for coloring by meters.\n-\t\t * reg_c_3 is reserved for split flows TAG.\n+\t\t * If meter is enable, it will engage two registers for color\n+\t\t * match and flow match. If meter color match is not using the\n+\t\t * REG_C_2, need to skip the REG_C_x be used by meter color\n+\t\t * match.\n+\t\t * If meter is disable, free to use all available registers.\n \t\t */\n-\t\tif (id > (REG_C_7 - REG_C_4))\n-\t\t\treturn rte_flow_error_set\n-\t\t\t\t\t(error, EINVAL,\n-\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n-\t\t\t\t\t NULL, \"invalid tag id\");\n-\t\tif (config->flow_mreg_c[id + REG_C_4 - REG_C_0] == REG_NONE)\n-\t\t\treturn rte_flow_error_set\n-\t\t\t\t\t(error, ENOTSUP,\n-\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n-\t\t\t\t\t NULL, \"unsupported tag id\");\n-\t\treturn config->flow_mreg_c[id + REG_C_4 - REG_C_0];\n+\t\tif (priv->mtr_color_reg != REG_NONE)\n+\t\t\tstart_reg = priv->mtr_color_reg != REG_C_2 ? REG_C_3 :\n+\t\t\t\t REG_C_4;\n+\t\telse\n+\t\t\tstart_reg = REG_C_2;\n+\t\tif (id > (REG_C_7 - start_reg))\n+\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t\t NULL, \"invalid tag id\");\n+\t\tif (config->flow_mreg_c[id + start_reg - REG_C_0] == REG_NONE)\n+\t\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t\t NULL, \"unsupported tag id\");\n+\t\t/*\n+\t\t * This case means meter is using the REG_C_x great than 2.\n+\t\t * Take care not to conflict with meter color REG_C_x.\n+\t\t * If the available index REG_C_y >= REG_C_x, skip the\n+\t\t * color register.\n+\t\t */\n+\t\tif (start_reg == REG_C_3 && config->flow_mreg_c\n+\t\t [id + REG_C_3 - REG_C_0] >= priv->mtr_color_reg) {\n+\t\t\tif (config->flow_mreg_c[id + 1 + REG_C_3 - REG_C_0] !=\n+\t\t\t REG_NONE)\n+\t\t\t\treturn config->flow_mreg_c\n+\t\t\t\t\t\t[id + 1 + REG_C_3 - REG_C_0];\n+\t\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t\t NULL, \"unsupported tag id\");\n+\t\t}\n+\t\treturn config->flow_mreg_c[id + start_reg - REG_C_0];\n \t}\n \tassert(false);\n \treturn rte_flow_error_set(error, EINVAL,\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex f84ea9d..ac1675456 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -74,6 +74,8 @@ enum mlx5_feature_name {\n \tMLX5_FLOW_MARK,\n \tMLX5_APP_TAG,\n \tMLX5_COPY_MARK,\n+\tMLX5_MTR_COLOR,\n+\tMLX5_MTR_SFX,\n };\n \n /* Pattern outer Layer bits. */\n", "prefixes": [ "v2", "03/19" ] }