Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62431/?format=api
{ "id": 62431, "url": "http://patches.dpdk.org/api/patches/62431/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1572940915-29416-13-git-send-email-viacheslavo@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": "<1572940915-29416-13-git-send-email-viacheslavo@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1572940915-29416-13-git-send-email-viacheslavo@mellanox.com", "date": "2019-11-05T08:01:47", "name": "[12/20] net/mlx5: update metadata register id query", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "8ddc9a729f2c3e58dbc6e9dc4363cbb5699d7cf9", "submitter": { "id": 1102, "url": "http://patches.dpdk.org/api/people/1102/?format=api", "name": "Slava Ovsiienko", "email": "viacheslavo@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/1572940915-29416-13-git-send-email-viacheslavo@mellanox.com/mbox/", "series": [ { "id": 7242, "url": "http://patches.dpdk.org/api/series/7242/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7242", "date": "2019-11-05T08:01:35", "name": "net/mlx5: implement extensive metadata feature", "version": 1, "mbox": "http://patches.dpdk.org/series/7242/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62431/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/62431/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 0CE9DA0352;\n\tTue, 5 Nov 2019 09:04:35 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D18841BEC9;\n\tTue, 5 Nov 2019 09:02:26 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id ACD845B3E\n for <dev@dpdk.org>; Tue, 5 Nov 2019 09:02:13 +0100 (CET)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n viacheslavo@mellanox.com)\n with ESMTPS (AES256-SHA encrypted); 5 Nov 2019 10:02:12 +0200", "from pegasus11.mtr.labs.mlnx (pegasus11.mtr.labs.mlnx\n [10.210.16.104])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id xA582Bwr026506;\n Tue, 5 Nov 2019 10:02:11 +0200", "from pegasus11.mtr.labs.mlnx (localhost [127.0.0.1])\n by pegasus11.mtr.labs.mlnx (8.14.7/8.14.7) with ESMTP id xA582BSm030779;\n Tue, 5 Nov 2019 08:02:11 GMT", "(from viacheslavo@localhost)\n by pegasus11.mtr.labs.mlnx (8.14.7/8.14.7/Submit) id xA582B0r030778;\n Tue, 5 Nov 2019 08:02:11 GMT" ], "X-Authentication-Warning": "pegasus11.mtr.labs.mlnx: viacheslavo set sender to\n viacheslavo@mellanox.com using -f", "From": "Viacheslav Ovsiienko <viacheslavo@mellanox.com>", "To": "dev@dpdk.org", "Cc": "matan@mellanox.com, rasland@mellanox.com, thomas@monjalon.net,\n orika@mellanox.com", "Date": "Tue, 5 Nov 2019 08:01:47 +0000", "Message-Id": "<1572940915-29416-13-git-send-email-viacheslavo@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1572940915-29416-1-git-send-email-viacheslavo@mellanox.com>", "References": "<1572940915-29416-1-git-send-email-viacheslavo@mellanox.com>", "Subject": "[dpdk-dev] [PATCH 12/20] net/mlx5: update metadata register id query", "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": "The NIC might support up to 8 extensive metadata registers.\nThese registers are supposed to be used by multiple features.\nThere is register id query routine to allow determine which\nregister is actually used by specified feature.\n\nSigned-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>\nAcked-by: Matan Azrad <matan@mellanox.com>\n---\n drivers/net/mlx5/mlx5_flow.c | 76 +++++++++++++++++++++++++++++---------------\n drivers/net/mlx5/mlx5_flow.h | 17 ++++++++++\n 2 files changed, 67 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex f32ea8d..c38208c 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -316,12 +316,6 @@ struct mlx5_flow_tunnel_info {\n \t},\n };\n \n-enum mlx5_feature_name {\n-\tMLX5_HAIRPIN_RX,\n-\tMLX5_HAIRPIN_TX,\n-\tMLX5_APPLICATION,\n-};\n-\n /**\n * Translate tag ID to register.\n *\n@@ -338,37 +332,66 @@ enum mlx5_feature_name {\n * The request register on success, a negative errno\n * value otherwise and rte_errno is set.\n */\n-__rte_unused\n-static enum modify_reg flow_get_reg_id(struct rte_eth_dev *dev,\n-\t\t\t\t enum mlx5_feature_name feature,\n-\t\t\t\t uint32_t id,\n-\t\t\t\t struct rte_flow_error *error)\n+enum modify_reg\n+mlx5_flow_get_reg_id(struct rte_eth_dev *dev,\n+\t\t enum mlx5_feature_name feature,\n+\t\t uint32_t id,\n+\t\t struct rte_flow_error *error)\n {\n-\tstatic enum modify_reg id2reg[] = {\n-\t\t[0] = REG_A,\n-\t\t[1] = REG_C_2,\n-\t\t[2] = REG_C_3,\n-\t\t[3] = REG_C_4,\n-\t\t[4] = REG_B,};\n-\n-\tdev = (void *)dev;\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_dev_config *config = &priv->config;\n+\n \tswitch (feature) {\n \tcase MLX5_HAIRPIN_RX:\n \t\treturn REG_B;\n \tcase MLX5_HAIRPIN_TX:\n \t\treturn REG_A;\n-\tcase MLX5_APPLICATION:\n-\t\tif (id > 4)\n+\tcase MLX5_METADATA_RX:\n+\t\tswitch (config->dv_xmeta_en) {\n+\t\tcase MLX5_XMETA_MODE_LEGACY:\n+\t\t\treturn REG_B;\n+\t\tcase MLX5_XMETA_MODE_META16:\n+\t\t\treturn REG_C_0;\n+\t\tcase MLX5_XMETA_MODE_META32:\n+\t\t\treturn REG_C_1;\n+\t\t}\n+\t\tbreak;\n+\tcase MLX5_METADATA_TX:\n+\t\treturn REG_A;\n+\tcase MLX5_METADATA_FDB:\n+\t\treturn REG_C_0;\n+\tcase MLX5_FLOW_MARK:\n+\t\tswitch (config->dv_xmeta_en) {\n+\t\tcase MLX5_XMETA_MODE_LEGACY:\n+\t\t\treturn REG_NONE;\n+\t\tcase MLX5_XMETA_MODE_META16:\n+\t\t\treturn REG_C_1;\n+\t\tcase MLX5_XMETA_MODE_META32:\n+\t\t\treturn REG_C_0;\n+\t\t}\n+\t\tbreak;\n+\tcase MLX5_COPY_MARK:\n+\t\treturn REG_C_2;\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 */\n+\t\tif (id > (REG_C_7 - REG_C_3))\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\treturn id2reg[id];\n+\t\tif (config->flow_mreg_c[id + REG_C_3 - 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\treturn config->flow_mreg_c[id + REG_C_3 - REG_C_0];\n \t}\n+\tassert(false);\n \treturn rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,\n \t\t\t\t NULL, \"invalid feature name\");\n }\n \n-\n /**\n * Check extensive flow metadata register support.\n *\n@@ -2667,7 +2690,6 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \tstruct mlx5_rte_flow_item_tag *tag_item;\n \tstruct rte_flow_item *item;\n \tchar *addr;\n-\tstruct rte_flow_error error;\n \tint encap = 0;\n \n \tmlx5_flow_id_get(priv->sh->flow_id_pool, flow_id);\n@@ -2733,7 +2755,8 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \trte_memcpy(actions_rx, actions, sizeof(struct rte_flow_action));\n \tactions_rx++;\n \tset_tag = (void *)actions_rx;\n-\tset_tag->id = flow_get_reg_id(dev, MLX5_HAIRPIN_RX, 0, &error);\n+\tset_tag->id = mlx5_flow_get_reg_id(dev, MLX5_HAIRPIN_RX, 0, NULL);\n+\tassert(set_tag->id > REG_NONE);\n \tset_tag->data = *flow_id;\n \ttag_action->conf = set_tag;\n \t/* Create Tx item list. */\n@@ -2743,7 +2766,8 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \titem->type = MLX5_RTE_FLOW_ITEM_TYPE_TAG;\n \ttag_item = (void *)addr;\n \ttag_item->data = *flow_id;\n-\ttag_item->id = flow_get_reg_id(dev, MLX5_HAIRPIN_TX, 0, NULL);\n+\ttag_item->id = mlx5_flow_get_reg_id(dev, MLX5_HAIRPIN_TX, 0, NULL);\n+\tassert(set_tag->id > REG_NONE);\n \titem->spec = tag_item;\n \taddr += sizeof(struct mlx5_rte_flow_item_tag);\n \ttag_item = (void *)addr;\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex c1d0a65..9371e11 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -63,6 +63,18 @@ struct mlx5_rte_flow_item_tx_queue {\n \tuint32_t queue;\n };\n \n+/* Feature name to allocate metadata register. */\n+enum mlx5_feature_name {\n+\tMLX5_HAIRPIN_RX,\n+\tMLX5_HAIRPIN_TX,\n+\tMLX5_METADATA_RX,\n+\tMLX5_METADATA_TX,\n+\tMLX5_METADATA_FDB,\n+\tMLX5_FLOW_MARK,\n+\tMLX5_APP_TAG,\n+\tMLX5_COPY_MARK,\n+};\n+\n /* Pattern outer Layer bits. */\n #define MLX5_FLOW_LAYER_OUTER_L2 (1u << 0)\n #define MLX5_FLOW_LAYER_OUTER_L3_IPV4 (1u << 1)\n@@ -534,6 +546,7 @@ struct mlx5_flow_driver_ops {\n \tmlx5_flow_query_t query;\n };\n \n+\n #define MLX5_CNT_CONTAINER(sh, batch, thread) (&(sh)->cmng.ccont \\\n \t[(((sh)->cmng.mhi[batch] >> (thread)) & 0x1) * 2 + (batch)])\n #define MLX5_CNT_CONTAINER_UNUSED(sh, batch, thread) (&(sh)->cmng.ccont \\\n@@ -554,6 +567,10 @@ uint64_t mlx5_flow_hashfields_adjust(struct mlx5_flow *dev_flow, int tunnel,\n \t\t\t\t uint64_t hash_fields);\n uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t\t\t uint32_t subpriority);\n+enum modify_reg mlx5_flow_get_reg_id(struct rte_eth_dev *dev,\n+\t\t\t\t enum mlx5_feature_name feature,\n+\t\t\t\t uint32_t id,\n+\t\t\t\t struct rte_flow_error *error);\n const struct rte_flow_action *mlx5_flow_find_action\n \t\t\t\t\t(const struct rte_flow_action *actions,\n \t\t\t\t\t enum rte_flow_action_type action);\n", "prefixes": [ "12/20" ] }