Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/68478/?format=api
{ "id": 68478, "url": "http://patchwork.dpdk.org/api/patches/68478/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1586932797-99533-9-git-send-email-suanmingm@mellanox.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": "<1586932797-99533-9-git-send-email-suanmingm@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1586932797-99533-9-git-send-email-suanmingm@mellanox.com", "date": "2020-04-15T06:39:55", "name": "[08/10] net/mlx5: allocate metadata object from indexed pool", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e669c95bd55f9a5bbe4d89862860837e6c9d86fa", "submitter": { "id": 1358, "url": "http://patchwork.dpdk.org/api/people/1358/?format=api", "name": "Suanming Mou", "email": "suanmingm@mellanox.com" }, "delegate": { "id": 3268, "url": "http://patchwork.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1586932797-99533-9-git-send-email-suanmingm@mellanox.com/mbox/", "series": [ { "id": 9383, "url": "http://patchwork.dpdk.org/api/series/9383/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=9383", "date": "2020-04-15T06:39:47", "name": "net/mlx5: optimize flow structure", "version": 1, "mbox": "http://patchwork.dpdk.org/series/9383/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/68478/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/68478/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 11B9AA0577;\n\tWed, 15 Apr 2020 08:41:27 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CB8701D444;\n\tWed, 15 Apr 2020 08:40:21 +0200 (CEST)", "from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130])\n by dpdk.org (Postfix) with ESMTP id 6B5FC1D428\n for <dev@dpdk.org>; Wed, 15 Apr 2020 08:40:19 +0200 (CEST)" ], "From": "Suanming Mou <suanmingm@mellanox.com>", "To": "Matan Azrad <matan@mellanox.com>, Shahaf Shuler <shahafs@mellanox.com>,\n Viacheslav Ovsiienko <viacheslavo@mellanox.com>", "Cc": "wentaoc@mellanox.com,\n\trasland@mellanox.com,\n\tdev@dpdk.org", "Date": "Wed, 15 Apr 2020 14:39:55 +0800", "Message-Id": "<1586932797-99533-9-git-send-email-suanmingm@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1586932797-99533-1-git-send-email-suanmingm@mellanox.com>", "References": "<1586932797-99533-1-git-send-email-suanmingm@mellanox.com>", "Subject": "[dpdk-dev] [PATCH 08/10] net/mlx5: allocate metadata object from\n\tindexed pool", "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": "Allocate metadata object from indexed pool helps rte flow saves the 4\nbytes index instead of 8 bytes pointer. For metadata object itself, it\nhelps save MALLOC_ELEM_OVERHEAD bytes from rte_malloc().\n\nSigned-off-by: Suanming Mou <suanmingm@mellanox.com>\n---\n drivers/net/mlx5/mlx5.c | 11 +++++++++++\n drivers/net/mlx5/mlx5.h | 1 +\n drivers/net/mlx5/mlx5_flow.c | 40 ++++++++++++++++++++++++++++------------\n drivers/net/mlx5/mlx5_flow.h | 5 +++--\n 4 files changed, 43 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 81a2e94..767fd9c 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -267,6 +267,17 @@ struct mlx5_dev_spawn_data {\n \t\t.type = \"mlx5_meter_ipool\",\n \t},\n \t{\n+\t\t.size = sizeof(struct mlx5_flow_meter),\n+\t\t.trunk_size = 64,\n+\t\t.grow_trunk = 3,\n+\t\t.grow_shift = 2,\n+\t\t.need_lock = 0,\n+\t\t.release_mem_en = 1,\n+\t\t.malloc = rte_malloc_socket,\n+\t\t.free = rte_free,\n+\t\t.type = \"mlx5_mcp_ipool\",\n+\t},\n+\t{\n \t\t.size = (sizeof(struct mlx5_hrxq) + MLX5_RSS_HASH_KEY_LEN),\n \t\t.trunk_size = 64,\n \t\t.grow_trunk = 3,\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex cf785f5..1141935 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -60,6 +60,7 @@ enum mlx5_ipool_index {\n \tMLX5_IPOOL_JUMP, /* Pool for jump resource. */\n #endif\n \tMLX5_IPOOL_MTR, /* Pool for meter resource. */\n+\tMLX5_IPOOL_MCP, /* Pool for metadata resource. */\n \tMLX5_IPOOL_HRXQ, /* Pool for hrxq resource. */\n \tMLX5_IPOOL_MLX5_FLOW, /* Pool for mlx5 flow handle. */\n \tMLX5_IPOOL_RTE_FLOW, /* Pool for rte_flow. */\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex cc2b207..0d2e3df 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -2961,6 +2961,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t[3] = { .type = RTE_FLOW_ACTION_TYPE_END, },\n \t};\n \tstruct mlx5_flow_mreg_copy_resource *mcp_res;\n+\tuint32_t idx = 0;\n \tint ret;\n \n \t/* Fill the register fileds in the flow. */\n@@ -3029,11 +3030,12 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t};\n \t}\n \t/* Build a new entry. */\n-\tmcp_res = rte_zmalloc(__func__, sizeof(*mcp_res), 0);\n+\tmcp_res = mlx5_ipool_zmalloc(priv->sh->ipool[MLX5_IPOOL_MCP], &idx);\n \tif (!mcp_res) {\n \t\trte_errno = ENOMEM;\n \t\treturn NULL;\n \t}\n+\tmcp_res->idx = idx;\n \t/*\n \t * The copy Flows are not included in any list. There\n \t * ones are referenced from other Flows and can not\n@@ -3055,7 +3057,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n error:\n \tif (mcp_res->flow)\n \t\tflow_list_destroy(dev, NULL, mcp_res->flow);\n-\trte_free(mcp_res);\n+\tmlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MCP], mcp_res->idx);\n \treturn NULL;\n }\n \n@@ -3071,9 +3073,13 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n flow_mreg_del_copy_action(struct rte_eth_dev *dev,\n \t\t\t struct rte_flow *flow)\n {\n-\tstruct mlx5_flow_mreg_copy_resource *mcp_res = flow->mreg_copy;\n+\tstruct mlx5_flow_mreg_copy_resource *mcp_res;\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \n+\tif (!flow->mreg_copy)\n+\t\treturn;\n+\tmcp_res = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_MCP],\n+\t\t\t\t flow->mreg_copy);\n \tif (!mcp_res || !priv->mreg_cp_tbl)\n \t\treturn;\n \tif (flow->copy_applied) {\n@@ -3092,8 +3098,8 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \tMLX5_ASSERT(mcp_res->flow);\n \tflow_list_destroy(dev, NULL, mcp_res->flow);\n \tmlx5_hlist_remove(priv->mreg_cp_tbl, &mcp_res->hlist_ent);\n-\trte_free(mcp_res);\n-\tflow->mreg_copy = NULL;\n+\tmlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MCP], mcp_res->idx);\n+\tflow->mreg_copy = 0;\n }\n \n /**\n@@ -3111,10 +3117,15 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n flow_mreg_start_copy_action(struct rte_eth_dev *dev,\n \t\t\t struct rte_flow *flow)\n {\n-\tstruct mlx5_flow_mreg_copy_resource *mcp_res = flow->mreg_copy;\n+\tstruct mlx5_flow_mreg_copy_resource *mcp_res;\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n \tint ret;\n \n-\tif (!mcp_res || flow->copy_applied)\n+\tif (!flow->mreg_copy || flow->copy_applied)\n+\t\treturn 0;\n+\tmcp_res = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_MCP],\n+\t\t\t\t flow->mreg_copy);\n+\tif (!mcp_res)\n \t\treturn 0;\n \tif (!mcp_res->appcnt) {\n \t\tret = flow_drv_apply(dev, mcp_res->flow, NULL);\n@@ -3138,9 +3149,14 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n flow_mreg_stop_copy_action(struct rte_eth_dev *dev,\n \t\t\t struct rte_flow *flow)\n {\n-\tstruct mlx5_flow_mreg_copy_resource *mcp_res = flow->mreg_copy;\n+\tstruct mlx5_flow_mreg_copy_resource *mcp_res;\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n \n-\tif (!mcp_res || !flow->copy_applied)\n+\tif (!flow->mreg_copy || !flow->copy_applied)\n+\t\treturn;\n+\tmcp_res = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_MCP],\n+\t\t\t\t flow->mreg_copy);\n+\tif (!mcp_res)\n \t\treturn;\n \tMLX5_ASSERT(mcp_res->appcnt);\n \t--mcp_res->appcnt;\n@@ -3171,7 +3187,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \tMLX5_ASSERT(mcp_res->flow);\n \tflow_list_destroy(dev, NULL, mcp_res->flow);\n \tmlx5_hlist_remove(priv->mreg_cp_tbl, &mcp_res->hlist_ent);\n-\trte_free(mcp_res);\n+\tmlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MCP], mcp_res->idx);\n }\n \n /**\n@@ -3263,7 +3279,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t\t\t(dev, MLX5_FLOW_MARK_DEFAULT, error);\n \t\t\tif (!mcp_res)\n \t\t\t\treturn -rte_errno;\n-\t\t\tflow->mreg_copy = mcp_res;\n+\t\t\tflow->mreg_copy = mcp_res->idx;\n \t\t\tif (dev->data->dev_started) {\n \t\t\t\tmcp_res->appcnt++;\n \t\t\t\tflow->copy_applied = 1;\n@@ -3276,7 +3292,7 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,\n \t\t\t\tflow_mreg_add_copy_action(dev, mark->id, error);\n \t\t\tif (!mcp_res)\n \t\t\t\treturn -rte_errno;\n-\t\t\tflow->mreg_copy = mcp_res;\n+\t\t\tflow->mreg_copy = mcp_res->idx;\n \t\t\tif (dev->data->dev_started) {\n \t\t\t\tmcp_res->appcnt++;\n \t\t\t\tflow->copy_applied = 1;\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex c8b2d20..7611410 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -460,6 +460,7 @@ struct mlx5_flow_mreg_copy_resource {\n \t/* List entry for device flows. */\n \tuint32_t refcnt; /* Reference counter. */\n \tuint32_t appcnt; /* Apply/Remove counter. */\n+\tuint32_t idx;\n \tstruct rte_flow *flow; /* Built flow for copy. */\n };\n \n@@ -758,8 +759,8 @@ struct rte_flow {\n \tenum mlx5_flow_drv_type drv_type; /**< Driver type. */\n \tstruct mlx5_flow_rss_queue rss; /**< RSS queue context. */\n \tuint32_t counter; /**< Holds flow counter. */\n-\tstruct mlx5_flow_mreg_copy_resource *mreg_copy;\n-\t/**< pointer to metadata register copy table resource. */\n+\tuint32_t mreg_copy;\n+\t/**< Index to metadata register copy table resource. */\n \tuint16_t meter; /**< Holds flow meter id. */\n \tuint32_t dev_handles;\n \t/**< Device flow handles that are part of the flow. */\n", "prefixes": [ "08/10" ] }