Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 131696,
    "url": "http://patches.dpdk.org/api/patches/131696/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230920072528.14185-23-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": "<20230920072528.14185-23-syalavarthi@marvell.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20230920072528.14185-23-syalavarthi@marvell.com",
    "date": "2023-09-20T07:25:13",
    "name": "[v2,22/34] ml/cnxk: add support to parse TVM model objects",
    "commit_ref": null,
    "pull_url": null,
    "state": "changes-requested",
    "archived": true,
    "hash": "925abeb81e0fc38c0cf296e4d31f0e9b52396a28",
    "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/20230920072528.14185-23-syalavarthi@marvell.com/mbox/",
    "series": [
        {
            "id": 29567,
            "url": "http://patches.dpdk.org/api/series/29567/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29567",
            "date": "2023-09-20T07:24:51",
            "name": "Implemenation of revised ml/cnxk driver",
            "version": 2,
            "mbox": "http://patches.dpdk.org/series/29567/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/131696/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/131696/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 600A6425E4;\n\tWed, 20 Sep 2023 09:28:05 +0200 (CEST)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E6AFA42D78;\n\tWed, 20 Sep 2023 09:26:02 +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 D1300410D0\n for <dev@dpdk.org>; Wed, 20 Sep 2023 09:25:41 +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 38K7JW11008355 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-9\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-EXCH02.marvell.com (10.69.176.39) 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:39 -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; Wed, 20 Sep 2023 00:25:39 -0700",
            "from ml-host-33.caveonetworks.com (unknown [10.110.143.233])\n by maili.marvell.com (Postfix) with ESMTP id 504615B6922;\n Wed, 20 Sep 2023 00:25:39 -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=2gU7mUOH2ysYc3tL6IMB2VSNeTr1cVWKHvLdd5GbziI=;\n b=bgwyUZXh9GmtNEUOVdN58YeJeGN8WLzYwsak5qjRMmEMVaQXqfOLAh/mKEF6OFcRdBIi\n 7ZqpUsz9KbenRiQmjqdMqOtnXSrqzB5RW0gTRePxu25MgNft/4YLSrZ6Kvt5hVAO5QFD\n pr3ukRvooH9S2cVVRVwhx0nZyYke17oWE8XMC7oxisEFfkD66pKJ9RlEu1OZMpZwNAg3\n 9Tli2rxSSuZvqPX4bhzR9dxxSlKPcI2Atpm/d+jZaJKC/JdC1Xa1egkkMuzHJuqIcnfL\n AC1JArBBoCyh4l1gKl3sfBo7Us69aadrZwlhc7hWYzioBoisww94mZvj8jPExX+hq4G1 JQ==",
        "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 22/34] ml/cnxk: add support to parse TVM model objects",
        "Date": "Wed, 20 Sep 2023 00:25:13 -0700",
        "Message-ID": "<20230920072528.14185-23-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": "10qhB4av7f-FMsG8E_f63OAaWw3-dWsU",
        "X-Proofpoint-GUID": "10qhB4av7f-FMsG8E_f63OAaWw3-dWsU",
        "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": "Added support to parse TVM model objects from the model\narchive buffer. Added support to check for all expected\nobjects and copy TVM model objects to internal buffers.\n\nSigned-off-by: Srikanth Yalavarthi <syalavarthi@marvell.com>\nSigned-off-by: Anup Prabhu <aprabhu@marvell.com>\n---\n drivers/ml/cnxk/cnxk_ml_ops.c    | 14 +++++--\n drivers/ml/cnxk/mvtvm_ml_model.c | 62 +++++++++++++++++++++++++++++++\n drivers/ml/cnxk/mvtvm_ml_model.h |  3 ++\n drivers/ml/cnxk/mvtvm_ml_ops.c   | 63 ++++++++++++++++++++++++++++++++\n drivers/ml/cnxk/mvtvm_ml_ops.h   |  3 ++\n 5 files changed, 142 insertions(+), 3 deletions(-)",
    "diff": "diff --git a/drivers/ml/cnxk/cnxk_ml_ops.c b/drivers/ml/cnxk/cnxk_ml_ops.c\nindex 052c69e510..8e17f597af 100644\n--- a/drivers/ml/cnxk/cnxk_ml_ops.c\n+++ b/drivers/ml/cnxk/cnxk_ml_ops.c\n@@ -1149,9 +1149,17 @@ cnxk_ml_model_load(struct rte_ml_dev *dev, struct rte_ml_model_params *params, u\n \t\tmodel, PLT_ALIGN_CEIL(sizeof(struct cnxk_ml_model), dev_info.align_size));\n \tdev->data->models[lcl_model_id] = model;\n \n-\tret = cn10k_ml_model_load(cnxk_mldev, params, model);\n-\tif (ret != 0)\n-\t\tgoto error;\n+\tif (type == ML_CNXK_MODEL_TYPE_GLOW) {\n+\t\tret = cn10k_ml_model_load(cnxk_mldev, params, model);\n+\t\tif (ret != 0)\n+\t\t\tgoto error;\n+#ifdef RTE_MLDEV_CNXK_ENABLE_MVTVM\n+\t} else {\n+\t\tret = mvtvm_ml_model_load(cnxk_mldev, params, model);\n+\t\tif (ret != 0)\n+\t\t\tgoto error;\n+#endif\n+\t}\n \n \tplt_spinlock_init(&model->lock);\n \tmodel->state = ML_CNXK_MODEL_STATE_LOADED;\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_model.c b/drivers/ml/cnxk/mvtvm_ml_model.c\nindex 6462267534..425a682209 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_model.c\n+++ b/drivers/ml/cnxk/mvtvm_ml_model.c\n@@ -2,10 +2,72 @@\n  * Copyright (c) 2023 Marvell.\n  */\n \n+#include <archive.h>\n+#include <archive_entry.h>\n+\n #include <rte_mldev.h>\n \n+#include <roc_api.h>\n+\n #include \"mvtvm_ml_model.h\"\n \n /* Objects list */\n char mvtvm_object_list[ML_MVTVM_MODEL_OBJECT_MAX][RTE_ML_STR_MAX] = {\"mod.so\", \"mod.json\",\n \t\t\t\t\t\t\t\t     \"mod.params\"};\n+\n+int\n+mvtvm_ml_model_blob_parse(struct rte_ml_model_params *params, struct mvtvm_ml_model_object *object)\n+{\n+\tbool object_found[ML_MVTVM_MODEL_OBJECT_MAX] = {false, false, false};\n+\tstruct archive_entry *entry;\n+\tstruct archive *a;\n+\tuint8_t i;\n+\tint ret;\n+\n+\t/* Open archive */\n+\ta = archive_read_new();\n+\tarchive_read_support_filter_all(a);\n+\tarchive_read_support_format_all(a);\n+\n+\tret = archive_read_open_memory(a, params->addr, params->size);\n+\tif (ret != ARCHIVE_OK)\n+\t\treturn archive_errno(a);\n+\n+\t/* Read archive */\n+\twhile (archive_read_next_header(a, &entry) == ARCHIVE_OK) {\n+\t\tfor (i = 0; i < ML_MVTVM_MODEL_OBJECT_MAX; i++) {\n+\t\t\tif (!object_found[i] &&\n+\t\t\t    (strcmp(archive_entry_pathname(entry), mvtvm_object_list[i]) == 0)) {\n+\t\t\t\tmemcpy(object[i].name, mvtvm_object_list[i], RTE_ML_STR_MAX);\n+\t\t\t\tobject[i].size = archive_entry_size(entry);\n+\t\t\t\tobject[i].buffer = rte_malloc(NULL, object[i].size, 0);\n+\n+\t\t\t\tif (archive_read_data(a, object[i].buffer, object[i].size) !=\n+\t\t\t\t    object[i].size) {\n+\t\t\t\t\tplt_err(\"Failed to read object from model archive: %s\",\n+\t\t\t\t\t\tobject[i].name);\n+\t\t\t\t\tgoto error;\n+\t\t\t\t}\n+\t\t\t\tobject_found[i] = true;\n+\t\t\t}\n+\t\t}\n+\t\tarchive_read_data_skip(a);\n+\t}\n+\n+\t/* Check if all objects are parsed */\n+\tfor (i = 0; i < ML_MVTVM_MODEL_OBJECT_MAX; i++) {\n+\t\tif (!object_found[i]) {\n+\t\t\tplt_err(\"Object %s not found in archive!\\n\", mvtvm_object_list[i]);\n+\t\t\tgoto error;\n+\t\t}\n+\t}\n+\treturn 0;\n+\n+error:\n+\tfor (i = 0; i < ML_MVTVM_MODEL_OBJECT_MAX; i++) {\n+\t\tif (object[i].buffer != NULL)\n+\t\t\trte_free(object[i].buffer);\n+\t}\n+\n+\treturn -EINVAL;\n+}\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_model.h b/drivers/ml/cnxk/mvtvm_ml_model.h\nindex 1f6b435be0..73a45a91d6 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_model.h\n+++ b/drivers/ml/cnxk/mvtvm_ml_model.h\n@@ -43,4 +43,7 @@ struct mvtvm_ml_model_data {\n \tstruct cnxk_ml_io_info info;\n };\n \n+int mvtvm_ml_model_blob_parse(struct rte_ml_model_params *params,\n+\t\t\t      struct mvtvm_ml_model_object *object);\n+\n #endif /* _MVTVM_ML_MODEL_H_ */\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_ops.c b/drivers/ml/cnxk/mvtvm_ml_ops.c\nindex f2b9499cf4..baa9099084 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_ops.c\n+++ b/drivers/ml/cnxk/mvtvm_ml_ops.c\n@@ -7,9 +7,14 @@\n #include <rte_mldev.h>\n #include <rte_mldev_pmd.h>\n \n+#include \"mvtvm_ml_model.h\"\n #include \"mvtvm_ml_ops.h\"\n \n #include \"cnxk_ml_dev.h\"\n+#include \"cnxk_ml_model.h\"\n+\n+/* ML model macros */\n+#define MVTVM_ML_MODEL_MEMZONE_NAME \"ml_mvtvm_model_mz\"\n \n int\n mvtvm_ml_dev_configure(struct cnxk_ml_dev *cnxk_mldev, const struct rte_ml_dev_config *conf)\n@@ -40,3 +45,61 @@ mvtvm_ml_dev_close(struct cnxk_ml_dev *cnxk_mldev)\n \n \treturn ret;\n }\n+\n+int\n+mvtvm_ml_model_load(struct cnxk_ml_dev *cnxk_mldev, struct rte_ml_model_params *params,\n+\t\t    struct cnxk_ml_model *model)\n+{\n+\tstruct mvtvm_ml_model_object object[ML_MVTVM_MODEL_OBJECT_MAX];\n+\tchar str[RTE_MEMZONE_NAMESIZE];\n+\tconst struct plt_memzone *mz;\n+\tsize_t model_object_size = 0;\n+\tuint64_t mz_size = 0;\n+\tint ret;\n+\n+\tRTE_SET_USED(cnxk_mldev);\n+\n+\tret = mvtvm_ml_model_blob_parse(params, object);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n+\tmodel_object_size = RTE_ALIGN_CEIL(object[0].size, RTE_CACHE_LINE_MIN_SIZE) +\n+\t\t\t    RTE_ALIGN_CEIL(object[1].size, RTE_CACHE_LINE_MIN_SIZE) +\n+\t\t\t    RTE_ALIGN_CEIL(object[2].size, RTE_CACHE_LINE_MIN_SIZE);\n+\tmz_size += model_object_size;\n+\n+\t/* Allocate memzone for model object */\n+\tsnprintf(str, RTE_MEMZONE_NAMESIZE, \"%s_%u\", MVTVM_ML_MODEL_MEMZONE_NAME, model->model_id);\n+\tmz = plt_memzone_reserve_aligned(str, mz_size, 0, ML_CN10K_ALIGN_SIZE);\n+\tif (!mz) {\n+\t\tplt_err(\"plt_memzone_reserve failed : %s\", str);\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\t/* Copy mod.so */\n+\tmodel->mvtvm.object.so.addr = mz->addr;\n+\tmodel->mvtvm.object.so.size = object[0].size;\n+\trte_memcpy(model->mvtvm.object.so.name, object[0].name, TVMDP_NAME_STRLEN);\n+\trte_memcpy(model->mvtvm.object.so.addr, object[0].buffer, object[0].size);\n+\trte_free(object[0].buffer);\n+\n+\t/* Copy mod.json */\n+\tmodel->mvtvm.object.json.addr =\n+\t\tRTE_PTR_ADD(model->mvtvm.object.so.addr,\n+\t\t\t    RTE_ALIGN_CEIL(model->mvtvm.object.so.size, RTE_CACHE_LINE_MIN_SIZE));\n+\tmodel->mvtvm.object.json.size = object[1].size;\n+\trte_memcpy(model->mvtvm.object.json.name, object[1].name, TVMDP_NAME_STRLEN);\n+\trte_memcpy(model->mvtvm.object.json.addr, object[1].buffer, object[1].size);\n+\trte_free(object[1].buffer);\n+\n+\t/* Copy mod.params */\n+\tmodel->mvtvm.object.params.addr =\n+\t\tRTE_PTR_ADD(model->mvtvm.object.json.addr,\n+\t\t\t    RTE_ALIGN_CEIL(model->mvtvm.object.json.size, RTE_CACHE_LINE_MIN_SIZE));\n+\tmodel->mvtvm.object.params.size = object[2].size;\n+\trte_memcpy(model->mvtvm.object.params.name, object[2].name, TVMDP_NAME_STRLEN);\n+\trte_memcpy(model->mvtvm.object.params.addr, object[2].buffer, object[2].size);\n+\trte_free(object[2].buffer);\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_ops.h b/drivers/ml/cnxk/mvtvm_ml_ops.h\nindex 305b4681ed..6607537599 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_ops.h\n+++ b/drivers/ml/cnxk/mvtvm_ml_ops.h\n@@ -12,8 +12,11 @@\n #include <rte_mldev.h>\n \n struct cnxk_ml_dev;\n+struct cnxk_ml_model;\n \n int mvtvm_ml_dev_configure(struct cnxk_ml_dev *cnxk_mldev, const struct rte_ml_dev_config *conf);\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 \n #endif /* _MVTVM_ML_OPS_H_ */\n",
    "prefixes": [
        "v2",
        "22/34"
    ]
}