Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131697/?format=api
{ "id": 131697, "url": "https://patches.dpdk.org/api/patches/131697/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230920072528.14185-26-syalavarthi@marvell.com/", "project": { "id": 1, "url": "https://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": "<20230920072528.14185-26-syalavarthi@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230920072528.14185-26-syalavarthi@marvell.com", "date": "2023-09-20T07:25:16", "name": "[v2,25/34] ml/cnxk: enable model unload in tvmdp library", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "57d53ff7ef18c83f8b47776a77720cdfba79ae5c", "submitter": { "id": 2480, "url": "https://patches.dpdk.org/api/people/2480/?format=api", "name": "Srikanth Yalavarthi", "email": "syalavarthi@marvell.com" }, "delegate": { "id": 310, "url": "https://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230920072528.14185-26-syalavarthi@marvell.com/mbox/", "series": [ { "id": 29567, "url": "https://patches.dpdk.org/api/series/29567/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=29567", "date": "2023-09-20T07:24:51", "name": "Implemenation of revised ml/cnxk driver", "version": 2, "mbox": "https://patches.dpdk.org/series/29567/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/131697/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/131697/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 511A2425E4;\n\tWed, 20 Sep 2023 09:28:11 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D587842D87;\n\tWed, 20 Sep 2023 09:26:03 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id 647A5410D5\n for <dev@dpdk.org>; Wed, 20 Sep 2023 09:25:42 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 38K7JW12008355 for <dev@dpdk.org>; Wed, 20 Sep 2023 00:25:41 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3t7htasykw-10\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Wed, 20 Sep 2023 00:25:41 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48;\n Wed, 20 Sep 2023 00:25:40 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend\n Transport; Wed, 20 Sep 2023 00:25:40 -0700", "from ml-host-33.caveonetworks.com (unknown [10.110.143.233])\n by maili.marvell.com (Postfix) with ESMTP id 41A995B6929;\n Wed, 20 Sep 2023 00:25:40 -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=sIbnX95p1SSAvyu7SQsAmexdTyX49A99QbBHsVntz6A=;\n b=bSDqWGOALcQ3gNJuzJueRk3eYMlQMpLTO8Sr0e4cN6Sp7tDPE05DTtuADQImnzfOW6LL\n QZN7nHQM+lB8NQmH8onkQjryfODBQm4HwnC/tJMgpJdWYMfNdGspdegrDs44CBRkEAtB\n NhnzZQ0diaYXRS2ujdXiYzDMUUzQxeTUoaL7hVImqQYsim1F5a8WYuR3PnSXBoibqGm/\n CIdPMp/IjD/kSvxAleAqD4Hxj/9dVsakYUhAleHUgW3GricvpaFXgM/Ygyu60cVu+oLs\n jXHAVITrXUWLhAZxThXpHHjnd0I+2rY/DOWt22FiYM/q2UG/oPdJT+siCUo0XQ9ozGao BA==", "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 v2 25/34] ml/cnxk: enable model unload in tvmdp library", "Date": "Wed, 20 Sep 2023 00:25:16 -0700", "Message-ID": "<20230920072528.14185-26-syalavarthi@marvell.com>", "X-Mailer": "git-send-email 2.41.0", "In-Reply-To": "<20230920072528.14185-1-syalavarthi@marvell.com>", "References": "<20230830155927.3566-1-syalavarthi@marvell.com>\n <20230920072528.14185-1-syalavarthi@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "wyLr94sLBtar4T1qOoIZ8EpO7DKU2Rp6", "X-Proofpoint-GUID": "wyLr94sLBtar4T1qOoIZ8EpO7DKU2Rp6", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.601,FMLib:17.11.176.26\n definitions=2023-09-20_02,2023-09-19_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 | 20 ++++++++++++++++++++\n drivers/ml/cnxk/cnxk_ml_ops.c | 9 +++++++--\n drivers/ml/cnxk/mvtvm_ml_ops.c | 28 ++++++++++++++++++++++++++++\n drivers/ml/cnxk/mvtvm_ml_ops.h | 1 +\n 4 files changed, 56 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/ml/cnxk/cn10k_ml_ops.c b/drivers/ml/cnxk/cn10k_ml_ops.c\nindex 79217165cd..85d0a9e18b 100644\n--- a/drivers/ml/cnxk/cn10k_ml_ops.c\n+++ b/drivers/ml/cnxk/cn10k_ml_ops.c\n@@ -725,7 +725,9 @@ cn10k_ml_layer_unload(void *device, uint16_t model_id, const char *layer_name)\n \tuint16_t layer_id = 0;\n \tint ret;\n \n+#ifndef RTE_MLDEV_CNXK_ENABLE_MVTVM\n \tPLT_SET_USED(layer_name);\n+#endif\n \n \tcnxk_mldev = (struct cnxk_ml_dev *)device;\n \tif (cnxk_mldev == NULL) {\n@@ -739,6 +741,24 @@ cn10k_ml_layer_unload(void *device, uint16_t model_id, const char *layer_name)\n \t\treturn -EINVAL;\n \t}\n \n+#ifdef RTE_MLDEV_CNXK_ENABLE_MVTVM\n+\tif (model->type == ML_CNXK_MODEL_TYPE_TVM) {\n+\t\tfor (layer_id = 0; layer_id < model->mvtvm.metadata.model.nb_layers; layer_id++) {\n+\t\t\tif (strcmp(model->layer[layer_id].name, layer_name) == 0)\n+\t\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (layer_id == model->mvtvm.metadata.model.nb_layers) {\n+\t\t\tplt_err(\"Invalid layer name: %s\", layer_name);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tif (model->layer[layer_id].type != ML_CNXK_LAYER_TYPE_MRVL) {\n+\t\t\tplt_err(\"Invalid layer name / type: %s\", layer_name);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+#endif\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 8e17f597af..512bac641e 100644\n--- a/drivers/ml/cnxk/cnxk_ml_ops.c\n+++ b/drivers/ml/cnxk/cnxk_ml_ops.c\n@@ -1182,7 +1182,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@@ -1200,7 +1200,12 @@ 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+#ifdef RTE_MLDEV_CNXK_ENABLE_MVTVM\n+\telse\n+\t\tret = mvtvm_ml_model_unload(cnxk_mldev, model);\n+#endif\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 1d585a57ff..073773e409 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_ops.c\n+++ b/drivers/ml/cnxk/mvtvm_ml_ops.c\n@@ -189,3 +189,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_ */\n", "prefixes": [ "v2", "25/34" ] }