Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132859/?format=api
{ "id": 132859, "url": "http://patches.dpdk.org/api/patches/132859/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231018064806.24145-25-syalavarthi@marvell.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": "<20231018064806.24145-25-syalavarthi@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231018064806.24145-25-syalavarthi@marvell.com", "date": "2023-10-18T06:47:52", "name": "[v5,24/34] ml/cnxk: enable model unload in tvmdp library", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a7040bd5d00a0df35e0d5a867d03ebe698a976b6", "submitter": { "id": 2480, "url": "http://patches.dpdk.org/api/people/2480/?format=api", "name": "Srikanth Yalavarthi", "email": "syalavarthi@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231018064806.24145-25-syalavarthi@marvell.com/mbox/", "series": [ { "id": 29898, "url": "http://patches.dpdk.org/api/series/29898/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29898", "date": "2023-10-18T06:47:28", "name": "Implementation of revised ml/cnxk driver", "version": 5, "mbox": "http://patches.dpdk.org/series/29898/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/132859/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/132859/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 03E5043196;\n\tWed, 18 Oct 2023 08:50:39 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7960C42E3B;\n\tWed, 18 Oct 2023 08:48:39 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id 05DF4402E6\n for <dev@dpdk.org>; Wed, 18 Oct 2023 08:48:19 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 39HKEpYp012051 for <dev@dpdk.org>; Tue, 17 Oct 2023 23:48:19 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3tt1481rwr-5\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Tue, 17 Oct 2023 23:48:19 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48;\n Tue, 17 Oct 2023 23:48:17 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend\n Transport; Tue, 17 Oct 2023 23:48:17 -0700", "from ml-host-33.caveonetworks.com (unknown [10.110.143.233])\n by maili.marvell.com (Postfix) with ESMTP id 6B1565B695B;\n Tue, 17 Oct 2023 23:48:16 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=Q5zAwzICxv2vdFPgPrxnwXwWFtDz2mZ8iRUi1H0uTOQ=;\n b=hVoTLDj0bRlOkxf4czMzpi78gDwrAgMd5SdXSaGPRA9SVZojfQ1qajhqjqIUTT7nI2LJ\n alozRdrlxRYYIedjUIwk1d9CatzHHcS6wUu9haoU2o9BhRKRQYG89aggYvmU6SsP9nlv\n A+7v976Tbj2dVNvvVIUNSh9kYSR+gOcdsmYPQ+7QRDts1YIinmG6s7EdvvEvA6c2lHaO\n jI3nBptt7GrD4NP0RDFCnBok3VenIEEFVtmsy62kkwfceveX7mjqIpLP/+b6I1MOY8Lu\n /qhd2y512F4yoFp82J4o9Ldw1xPjcF9vimNZJOoCrUC6nRFC1uemqEOYJKzcrp7hLVWG Dw==", "From": "Srikanth Yalavarthi <syalavarthi@marvell.com>", "To": "Srikanth Yalavarthi <syalavarthi@marvell.com>", "CC": "<dev@dpdk.org>, <sshankarnara@marvell.com>, <aprabhu@marvell.com>,\n <ptakkar@marvell.com>", "Subject": "[PATCH v5 24/34] ml/cnxk: enable model unload in tvmdp library", "Date": "Tue, 17 Oct 2023 23:47:52 -0700", "Message-ID": "<20231018064806.24145-25-syalavarthi@marvell.com>", "X-Mailer": "git-send-email 2.42.0", "In-Reply-To": "<20231018064806.24145-1-syalavarthi@marvell.com>", "References": "<20230830155927.3566-1-syalavarthi@marvell.com>\n <20231018064806.24145-1-syalavarthi@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "0eCe5iiaBE0NIEHPVoGP3_QYzAe-2TJw", "X-Proofpoint-ORIG-GUID": "0eCe5iiaBE0NIEHPVoGP3_QYzAe-2TJw", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26\n definitions=2023-10-18_04,2023-10-17_01,2023-05-22_02", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "Enable unloading model using external tvmdp library. Updated\nlayer unload callback to support multiple layers.\n\nSigned-off-by: Srikanth Yalavarthi <syalavarthi@marvell.com>\nSigned-off-by: Anup Prabhu <aprabhu@marvell.com>\n---\n drivers/ml/cnxk/cn10k_ml_ops.c | 8 +++++---\n drivers/ml/cnxk/cnxk_ml_ops.c | 7 +++++--\n drivers/ml/cnxk/mvtvm_ml_ops.c | 28 ++++++++++++++++++++++++++++\n drivers/ml/cnxk/mvtvm_ml_ops.h | 1 +\n drivers/ml/cnxk/mvtvm_ml_stubs.c | 9 +++++++++\n drivers/ml/cnxk/mvtvm_ml_stubs.h | 1 +\n 6 files changed, 49 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/ml/cnxk/cn10k_ml_ops.c b/drivers/ml/cnxk/cn10k_ml_ops.c\nindex 4191ccc840..e7208391fd 100644\n--- a/drivers/ml/cnxk/cn10k_ml_ops.c\n+++ b/drivers/ml/cnxk/cn10k_ml_ops.c\n@@ -780,11 +780,9 @@ cn10k_ml_layer_unload(void *device, uint16_t model_id, const char *layer_name)\n \tstruct cnxk_ml_layer *layer;\n \n \tchar str[RTE_MEMZONE_NAMESIZE];\n-\tuint16_t layer_id = 0;\n+\tuint16_t layer_id;\n \tint ret;\n \n-\tPLT_SET_USED(layer_name);\n-\n \tcnxk_mldev = (struct cnxk_ml_dev *)device;\n \tif (cnxk_mldev == NULL) {\n \t\tplt_err(\"Invalid device = %p\", device);\n@@ -797,6 +795,10 @@ cn10k_ml_layer_unload(void *device, uint16_t model_id, const char *layer_name)\n \t\treturn -EINVAL;\n \t}\n \n+\tret = cn10k_ml_model_get_layer_id(model, layer_name, &layer_id);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n \tlayer = &model->layer[layer_id];\n \n \tsnprintf(str, RTE_MEMZONE_NAMESIZE, \"%s_%u_%u\", CN10K_ML_LAYER_MEMZONE_NAME,\ndiff --git a/drivers/ml/cnxk/cnxk_ml_ops.c b/drivers/ml/cnxk/cnxk_ml_ops.c\nindex 90b23d9c1c..cd95a3c7ad 100644\n--- a/drivers/ml/cnxk/cnxk_ml_ops.c\n+++ b/drivers/ml/cnxk/cnxk_ml_ops.c\n@@ -1107,7 +1107,7 @@ cnxk_ml_model_unload(struct rte_ml_dev *dev, uint16_t model_id)\n \tstruct cnxk_ml_model *model;\n \n \tchar str[RTE_MEMZONE_NAMESIZE];\n-\tint ret;\n+\tint ret = 0;\n \n \tif (dev == NULL)\n \t\treturn -EINVAL;\n@@ -1125,7 +1125,10 @@ cnxk_ml_model_unload(struct rte_ml_dev *dev, uint16_t model_id)\n \t\treturn -EBUSY;\n \t}\n \n-\tret = cn10k_ml_model_unload(cnxk_mldev, model);\n+\tif (model->type == ML_CNXK_MODEL_TYPE_GLOW)\n+\t\tret = cn10k_ml_model_unload(cnxk_mldev, model);\n+\telse\n+\t\tret = mvtvm_ml_model_unload(cnxk_mldev, model);\n \tif (ret != 0)\n \t\treturn ret;\n \ndiff --git a/drivers/ml/cnxk/mvtvm_ml_ops.c b/drivers/ml/cnxk/mvtvm_ml_ops.c\nindex e248310cb3..9fd9e58de6 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_ops.c\n+++ b/drivers/ml/cnxk/mvtvm_ml_ops.c\n@@ -185,3 +185,31 @@ mvtvm_ml_model_load(struct cnxk_ml_dev *cnxk_mldev, struct rte_ml_model_params *\n \n \treturn ret;\n }\n+\n+int\n+mvtvm_ml_model_unload(struct cnxk_ml_dev *cnxk_mldev, struct cnxk_ml_model *model)\n+{\n+\tchar str[RTE_MEMZONE_NAMESIZE];\n+\tconst struct plt_memzone *mz;\n+\tint ret;\n+\n+\tRTE_SET_USED(cnxk_mldev);\n+\n+\t/* Initialize model in TVMDP */\n+\tret = tvmdp_model_unload(model->model_id);\n+\tif (ret != 0) {\n+\t\tplt_err(\"TVMDP: Model unload failed, model_id = %u, error = %d\", model->model_id,\n+\t\t\tret);\n+\t\treturn ret;\n+\t}\n+\n+\tsnprintf(str, RTE_MEMZONE_NAMESIZE, \"%s_%u\", MVTVM_ML_MODEL_MEMZONE_NAME, model->model_id);\n+\tmz = rte_memzone_lookup(str);\n+\tif (mz == NULL) {\n+\t\tplt_err(\"Memzone lookup failed for TVM model: model_id = %u, mz = %s\",\n+\t\t\tmodel->model_id, str);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn plt_memzone_free(mz);\n+}\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_ops.h b/drivers/ml/cnxk/mvtvm_ml_ops.h\nindex 6607537599..770794fe7d 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_ops.h\n+++ b/drivers/ml/cnxk/mvtvm_ml_ops.h\n@@ -18,5 +18,6 @@ int mvtvm_ml_dev_configure(struct cnxk_ml_dev *cnxk_mldev, const struct rte_ml_d\n int mvtvm_ml_dev_close(struct cnxk_ml_dev *cnxk_mldev);\n int mvtvm_ml_model_load(struct cnxk_ml_dev *cnxk_mldev, struct rte_ml_model_params *params,\n \t\t\tstruct cnxk_ml_model *model);\n+int mvtvm_ml_model_unload(struct cnxk_ml_dev *cnxk_mldev, struct cnxk_ml_model *model);\n \n #endif /* _MVTVM_ML_OPS_H_ */\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_stubs.c b/drivers/ml/cnxk/mvtvm_ml_stubs.c\nindex 80a9a90b4e..a17a76e41f 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_stubs.c\n+++ b/drivers/ml/cnxk/mvtvm_ml_stubs.c\n@@ -63,3 +63,12 @@ mvtvm_ml_model_load(struct cnxk_ml_dev *cnxk_mldev, struct rte_ml_model_params *\n \n \treturn -EINVAL;\n }\n+\n+int\n+mvtvm_ml_model_unload(struct cnxk_ml_dev *cnxk_mldev, struct cnxk_ml_model *model)\n+{\n+\tRTE_SET_USED(cnxk_mldev);\n+\tRTE_SET_USED(model);\n+\n+\treturn -EINVAL;\n+}\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_stubs.h b/drivers/ml/cnxk/mvtvm_ml_stubs.h\nindex 29f721072a..3776fb5369 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_stubs.h\n+++ b/drivers/ml/cnxk/mvtvm_ml_stubs.h\n@@ -15,6 +15,7 @@ int mvtvm_ml_dev_configure(struct cnxk_ml_dev *cnxk_mldev, const struct rte_ml_d\n int mvtvm_ml_dev_close(struct cnxk_ml_dev *cnxk_mldev);\n int mvtvm_ml_model_load(struct cnxk_ml_dev *cnxk_mldev, struct rte_ml_model_params *params,\n \t\t\tstruct cnxk_ml_model *model);\n+int mvtvm_ml_model_unload(struct cnxk_ml_dev *cnxk_mldev, struct cnxk_ml_model *model);\n \n int mvtvm_ml_model_get_layer_id(struct cnxk_ml_model *model, const char *layer_name,\n \t\t\t\tuint16_t *layer_id);\n", "prefixes": [ "v5", "24/34" ] }