Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64948/?format=api
{ "id": 64948, "url": "http://patches.dpdk.org/api/patches/64948/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1579539790-3882-12-git-send-email-matan@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": "<1579539790-3882-12-git-send-email-matan@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1579539790-3882-12-git-send-email-matan@mellanox.com", "date": "2020-01-20T17:02:43", "name": "[v1,11/38] common/mlx5: support DevX indirect mkey creation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "8166fa1303542c195d20c1f008fa5e53c768481a", "submitter": { "id": 796, "url": "http://patches.dpdk.org/api/people/796/?format=api", "name": "Matan Azrad", "email": "matan@mellanox.com" }, "delegate": { "id": 2642, "url": "http://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1579539790-3882-12-git-send-email-matan@mellanox.com/mbox/", "series": [ { "id": 8223, "url": "http://patches.dpdk.org/api/series/8223/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8223", "date": "2020-01-20T17:02:37", "name": "Introduce mlx5 vDPA driver", "version": 1, "mbox": "http://patches.dpdk.org/series/8223/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/64948/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/64948/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 04FFFA0526;\n\tMon, 20 Jan 2020 18:05:01 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 37C301BFD6;\n\tMon, 20 Jan 2020 18:03:37 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id 2C0D91BF9A\n for <dev@dpdk.org>; Mon, 20 Jan 2020 18:03:14 +0100 (CET)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n asafp@mellanox.com)\n with ESMTPS (AES256-SHA encrypted); 20 Jan 2020 19:03:12 +0200", "from pegasus07.mtr.labs.mlnx (pegasus07.mtr.labs.mlnx\n [10.210.16.112])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 00KH3BGU024424;\n Mon, 20 Jan 2020 19:03:12 +0200" ], "From": "Matan Azrad <matan@mellanox.com>", "To": "dev@dpdk.org", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>,\n Thomas Monjalon <thomas@monjalon.net>", "Date": "Mon, 20 Jan 2020 17:02:43 +0000", "Message-Id": "<1579539790-3882-12-git-send-email-matan@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1579539790-3882-1-git-send-email-matan@mellanox.com>", "References": "<1579539790-3882-1-git-send-email-matan@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v1 11/38] common/mlx5: support DevX indirect mkey\n\tcreation", "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": "Add option to create an indirect mkey by the current\nmlx5_devx_cmd_mkey_create command.\n\nAlign the net/mlx5 driver usage in the above command.\n\nSigned-off-by: Matan Azrad <matan@mellanox.com>\n---\n drivers/common/mlx5/mlx5_devx_cmds.c | 43 ++++++++++++++++++++++++++++++------\n drivers/common/mlx5/mlx5_devx_cmds.h | 12 ++++++++++\n drivers/common/mlx5/mlx5_prm.h | 12 ++++++++++\n drivers/net/mlx5/mlx5_flow_dv.c | 4 ++++\n 4 files changed, 64 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c\nindex c6965da..aa2feeb 100644\n--- a/drivers/common/mlx5/mlx5_devx_cmds.c\n+++ b/drivers/common/mlx5/mlx5_devx_cmds.c\n@@ -142,7 +142,11 @@ struct mlx5_devx_obj *\n mlx5_devx_cmd_mkey_create(struct ibv_context *ctx,\n \t\t\t struct mlx5_devx_mkey_attr *attr)\n {\n-\tuint32_t in[MLX5_ST_SZ_DW(create_mkey_in)] = {0};\n+\tstruct mlx5_klm *klm_array = attr->klm_array;\n+\tint klm_num = attr->klm_num;\n+\tint in_size_dw = MLX5_ST_SZ_DW(create_mkey_in) +\n+\t\t (klm_num ? RTE_ALIGN(klm_num, 4) : 0) * MLX5_ST_SZ_DW(klm);\n+\tuint32_t in[in_size_dw];\n \tuint32_t out[MLX5_ST_SZ_DW(create_mkey_out)] = {0};\n \tvoid *mkc;\n \tstruct mlx5_devx_obj *mkey = rte_zmalloc(\"mkey\", sizeof(*mkey), 0);\n@@ -153,27 +157,52 @@ struct mlx5_devx_obj *\n \t\trte_errno = ENOMEM;\n \t\treturn NULL;\n \t}\n+\tmemset(in, 0, in_size_dw * 4);\n \tpgsize = sysconf(_SC_PAGESIZE);\n-\ttranslation_size = (RTE_ALIGN(attr->size, pgsize) * 8) / 16;\n \tMLX5_SET(create_mkey_in, in, opcode, MLX5_CMD_OP_CREATE_MKEY);\n+\tmkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);\n+\tif (klm_num > 0) {\n+\t\tint i;\n+\t\tuint8_t *klm = (uint8_t *)MLX5_ADDR_OF(create_mkey_in, in,\n+\t\t\t\t\t\t klm_pas_mtt);\n+\t\ttranslation_size = RTE_ALIGN(klm_num, 4);\n+\t\tfor (i = 0; i < klm_num; i++) {\n+\t\t\tMLX5_SET(klm, klm, byte_count, klm_array[i].byte_count);\n+\t\t\tMLX5_SET(klm, klm, mkey, klm_array[i].mkey);\n+\t\t\tMLX5_SET64(klm, klm, address, klm_array[i].address);\n+\t\t\tklm += MLX5_ST_SZ_BYTES(klm);\n+\t\t}\n+\t\tfor (; i < (int)translation_size; i++) {\n+\t\t\tMLX5_SET(klm, klm, mkey, 0x0);\n+\t\t\tMLX5_SET64(klm, klm, address, 0x0);\n+\t\t\tklm += MLX5_ST_SZ_BYTES(klm);\n+\t\t}\n+\t\tMLX5_SET(mkc, mkc, access_mode_1_0, attr->log_entity_size ?\n+\t\t\t MLX5_MKC_ACCESS_MODE_KLM_FBS :\n+\t\t\t MLX5_MKC_ACCESS_MODE_KLM);\n+\t\tMLX5_SET(mkc, mkc, log_page_size, attr->log_entity_size);\n+\t} else {\n+\t\ttranslation_size = (RTE_ALIGN(attr->size, pgsize) * 8) / 16;\n+\t\tMLX5_SET(mkc, mkc, access_mode_1_0, MLX5_MKC_ACCESS_MODE_MTT);\n+\t\tMLX5_SET(mkc, mkc, log_page_size, rte_log2_u32(pgsize));\n+\t}\n \tMLX5_SET(create_mkey_in, in, translations_octword_actual_size,\n \t\t translation_size);\n \tMLX5_SET(create_mkey_in, in, mkey_umem_id, attr->umem_id);\n-\tmkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);\n+\tMLX5_SET(create_mkey_in, in, pg_access, attr->pg_access);\n \tMLX5_SET(mkc, mkc, lw, 0x1);\n \tMLX5_SET(mkc, mkc, lr, 0x1);\n-\tMLX5_SET(mkc, mkc, access_mode_1_0, MLX5_MKC_ACCESS_MODE_MTT);\n \tMLX5_SET(mkc, mkc, qpn, 0xffffff);\n \tMLX5_SET(mkc, mkc, pd, attr->pd);\n \tMLX5_SET(mkc, mkc, mkey_7_0, attr->umem_id & 0xFF);\n \tMLX5_SET(mkc, mkc, translations_octword_size, translation_size);\n \tMLX5_SET64(mkc, mkc, start_addr, attr->addr);\n \tMLX5_SET64(mkc, mkc, len, attr->size);\n-\tMLX5_SET(mkc, mkc, log_page_size, rte_log2_u32(pgsize));\n-\tmkey->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in), out,\n+\tmkey->obj = mlx5_glue->devx_obj_create(ctx, in, in_size_dw * 4, out,\n \t\t\t\t\t sizeof(out));\n \tif (!mkey->obj) {\n-\t\tDRV_LOG(ERR, \"Can't create mkey - error %d\", errno);\n+\t\tDRV_LOG(ERR, \"Can't create %sdirect mkey - error %d\\n\",\n+\t\t\tklm_num ? \"an in\" : \"a \", errno);\n \t\trte_errno = errno;\n \t\trte_free(mkey);\n \t\treturn NULL;\ndiff --git a/drivers/common/mlx5/mlx5_devx_cmds.h b/drivers/common/mlx5/mlx5_devx_cmds.h\nindex dea1597..ceeca64 100644\n--- a/drivers/common/mlx5/mlx5_devx_cmds.h\n+++ b/drivers/common/mlx5/mlx5_devx_cmds.h\n@@ -13,11 +13,22 @@ struct mlx5_devx_obj {\n \tint id; /* The object ID. */\n };\n \n+/* UMR memory buffer used to define 1 entry in indirect mkey. */\n+struct mlx5_klm {\n+\tuint32_t byte_count;\n+\tuint32_t mkey;\n+\tuint64_t address;\n+};\n+\n struct mlx5_devx_mkey_attr {\n \tuint64_t addr;\n \tuint64_t size;\n \tuint32_t umem_id;\n \tuint32_t pd;\n+\tuint32_t log_entity_size;\n+\tuint32_t pg_access:1;\n+\tstruct mlx5_klm *klm_array;\n+\tint klm_num;\n };\n \n /* HCA qos attributes. */\n@@ -212,6 +223,7 @@ struct mlx5_devx_modify_sq_attr {\n \tuint32_t hairpin_peer_vhca:16;\n };\n \n+\n /* mlx5_devx_cmds.c */\n \n struct mlx5_devx_obj *mlx5_devx_cmd_flow_counter_alloc(struct ibv_context *ctx,\ndiff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h\nindex b0b8ab9..058bd8c 100644\n--- a/drivers/common/mlx5/mlx5_prm.h\n+++ b/drivers/common/mlx5/mlx5_prm.h\n@@ -726,6 +726,8 @@ enum {\n \n enum {\n \tMLX5_MKC_ACCESS_MODE_MTT = 0x1,\n+\tMLX5_MKC_ACCESS_MODE_KLM = 0x2,\n+\tMLX5_MKC_ACCESS_MODE_KLM_FBS = 0x3,\n };\n \n /* Flow counters. */\n@@ -790,6 +792,16 @@ struct mlx5_ifc_query_flow_counter_in_bits {\n \tu8 flow_counter_id[0x20];\n };\n \n+#define MLX5_MAX_KLM_BYTE_COUNT 0x80000000u\n+#define MLX5_MIN_KLM_FIXED_BUFFER_SIZE 0x1000u\n+\n+\n+struct mlx5_ifc_klm_bits {\n+\tu8 byte_count[0x20];\n+\tu8 mkey[0x20];\n+\tu8 address[0x40];\n+};\n+\n struct mlx5_ifc_mkc_bits {\n \tu8 reserved_at_0[0x1];\n \tu8 free[0x1];\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex 50d1078..cfdfdf4 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -3933,6 +3933,10 @@ struct field_modify_info modify_tcp[] = {\n \tmkey_attr.size = size;\n \tmkey_attr.umem_id = mem_mng->umem->umem_id;\n \tmkey_attr.pd = sh->pdn;\n+\tmkey_attr.log_entity_size = 0;\n+\tmkey_attr.pg_access = 0;\n+\tmkey_attr.klm_array = NULL;\n+\tmkey_attr.klm_num = 0;\n \tmem_mng->dm = mlx5_devx_cmd_mkey_create(sh->ctx, &mkey_attr);\n \tif (!mem_mng->dm) {\n \t\tmlx5_glue->devx_umem_dereg(mem_mng->umem);\n", "prefixes": [ "v1", "11/38" ] }