Patch Detail

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

{
    "id": 132051,
    "url": "http://patches.dpdk.org/api/patches/132051/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230927183052.17347-21-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": "<20230927183052.17347-21-syalavarthi@marvell.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20230927183052.17347-21-syalavarthi@marvell.com",
    "date": "2023-09-27T18:30:33",
    "name": "[v3,20/35] ml/cnxk: add support for identify model type",
    "commit_ref": null,
    "pull_url": null,
    "state": "changes-requested",
    "archived": true,
    "hash": "7d10d764cc14fd30c6bab56d5591184c12cf22d5",
    "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/20230927183052.17347-21-syalavarthi@marvell.com/mbox/",
    "series": [
        {
            "id": 29661,
            "url": "http://patches.dpdk.org/api/series/29661/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29661",
            "date": "2023-09-27T18:30:13",
            "name": "Implemenation of revised ml/cnxk driver",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/29661/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/132051/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/132051/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 1AA124262B;\n\tWed, 27 Sep 2023 20:33:57 +0200 (CEST)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2DFC0427E8;\n\tWed, 27 Sep 2023 20:31:33 +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 F125140DDA\n for <dev@dpdk.org>; Wed, 27 Sep 2023 20:31:11 +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 38RCJcIT015145 for <dev@dpdk.org>; Wed, 27 Sep 2023 11:31:11 -0700",
            "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3tcma5sft7-13\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Wed, 27 Sep 2023 11:31:11 -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, 27 Sep 2023 11:31:09 -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, 27 Sep 2023 11:31:09 -0700",
            "from ml-host-33.caveonetworks.com (unknown [10.110.143.233])\n by maili.marvell.com (Postfix) with ESMTP id E740A3F709D;\n Wed, 27 Sep 2023 11:31:08 -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=NDzbECKibIJhoy+Nh2SLW0XG+ybTxrhI58uD3tKRawk=;\n b=dbpH6c4ZVIlF7BoV+fkcbzgf71pS6wb4JSMx5OKmMoD3MXjpDVMkZGN/poDi5gZs7bVW\n OlpKYhgPWs3Ej2FL9loHVgO8d8WwBh1verpFsK0wBmtsne8/FjjJB+MARMGcTKPFWzDK\n uzlifK1IMeQZUf7pAw0bPgHgz0LGTrigsjyZ2HRi6fhCxNVmlLc3K+UCP4qePzkYHes1\n NFpXCS8kAg/BQCI9pYU/RNXhbeB6BRR14aMZKYl0FCEcZbMBa9gmGBYjxcNKcEZnY1Xc\n mZbi32YI+R3ntu8Bub5kNZVIG70HqGBmkbKQMB725rZqlQMFw0WGrQ8QH7fBTDWcqmWx ag==",
        "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 v3 20/35] ml/cnxk: add support for identify model type",
        "Date": "Wed, 27 Sep 2023 11:30:33 -0700",
        "Message-ID": "<20230927183052.17347-21-syalavarthi@marvell.com>",
        "X-Mailer": "git-send-email 2.41.0",
        "In-Reply-To": "<20230927183052.17347-1-syalavarthi@marvell.com>",
        "References": "<20230830155927.3566-1-syalavarthi@marvell.com>\n <20230927183052.17347-1-syalavarthi@marvell.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Content-Type": "text/plain",
        "X-Proofpoint-GUID": "Xvy_EG6XxIzAm6a4t6LGkyYVwBC120x7",
        "X-Proofpoint-ORIG-GUID": "Xvy_EG6XxIzAm6a4t6LGkyYVwBC120x7",
        "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26\n definitions=2023-09-27_12,2023-09-27_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 support to parse model buffer to identify the\nmodel type and model sub-type. Enabled basic checks\nfor Glow model type buffer.\n\nSigned-off-by: Srikanth Yalavarthi <syalavarthi@marvell.com>\nSigned-off-by: Anup Prabhu <aprabhu@marvell.com>\n---\n drivers/ml/cnxk/cnxk_ml_model.c  | 49 ++++++++++++++++++++++++++++\n drivers/ml/cnxk/cnxk_ml_model.h  |  3 ++\n drivers/ml/cnxk/cnxk_ml_ops.c    |  8 +++++\n drivers/ml/cnxk/meson.build      |  6 ++++\n drivers/ml/cnxk/mvtvm_ml_model.c | 55 ++++++++++++++++++++++++++++++++\n drivers/ml/cnxk/mvtvm_ml_model.h |  2 ++\n drivers/ml/cnxk/mvtvm_ml_stubs.c |  9 ++++++\n drivers/ml/cnxk/mvtvm_ml_stubs.h |  1 +\n 8 files changed, 133 insertions(+)\n create mode 100644 drivers/ml/cnxk/mvtvm_ml_model.c",
    "diff": "diff --git a/drivers/ml/cnxk/cnxk_ml_model.c b/drivers/ml/cnxk/cnxk_ml_model.c\nindex b069d4e3a5..02f80410ec 100644\n--- a/drivers/ml/cnxk/cnxk_ml_model.c\n+++ b/drivers/ml/cnxk/cnxk_ml_model.c\n@@ -2,11 +2,60 @@\n  * Copyright (c) 2023 Marvell.\n  */\n \n+#include <rte_hash_crc.h>\n #include <rte_mldev.h>\n \n #include \"cnxk_ml_model.h\"\n #include \"cnxk_ml_utils.h\"\n \n+enum cnxk_ml_model_type\n+cnxk_ml_model_get_type(struct rte_ml_model_params *params)\n+{\n+\tstruct cn10k_ml_model_metadata_header *metadata_header;\n+\tenum cnxk_ml_model_type type;\n+\tuint32_t payload_crc32c;\n+\tuint32_t header_crc32c;\n+\n+\ttype = mvtvm_ml_model_type_get(params);\n+\tif (type == ML_CNXK_MODEL_TYPE_TVM)\n+\t\treturn ML_CNXK_MODEL_TYPE_TVM;\n+\telse if (type == ML_CNXK_MODEL_TYPE_INVALID)\n+\t\treturn ML_CNXK_MODEL_TYPE_INVALID;\n+\n+\t/* Check model magic string */\n+\tmetadata_header = (struct cn10k_ml_model_metadata_header *)params->addr;\n+\tif (strncmp((char *)metadata_header->magic, MRVL_ML_MODEL_MAGIC_STRING, 4) != 0) {\n+\t\tplt_err(\"Invalid Glow model, magic = %s\", metadata_header->magic);\n+\t\treturn ML_CNXK_MODEL_TYPE_INVALID;\n+\t}\n+\n+\t/* Header CRC check */\n+\tif (metadata_header->header_crc32c != 0) {\n+\t\theader_crc32c = rte_hash_crc(\n+\t\t\tparams->addr,\n+\t\t\tsizeof(struct cn10k_ml_model_metadata_header) - sizeof(uint32_t), 0);\n+\n+\t\tif (header_crc32c != metadata_header->header_crc32c) {\n+\t\t\tplt_err(\"Invalid Glow model, Header CRC mismatch\");\n+\t\t\treturn ML_CNXK_MODEL_TYPE_INVALID;\n+\t\t}\n+\t}\n+\n+\t/* Payload CRC check */\n+\tif (metadata_header->payload_crc32c != 0) {\n+\t\tpayload_crc32c = rte_hash_crc(\n+\t\t\tPLT_PTR_ADD(params->addr, sizeof(struct cn10k_ml_model_metadata_header)),\n+\t\t\tparams->size - sizeof(struct cn10k_ml_model_metadata_header), 0);\n+\n+\t\tif (payload_crc32c != metadata_header->payload_crc32c) {\n+\t\t\tplt_err(\"Invalid Glow model, Payload CRC mismatch\");\n+\t\t\treturn ML_CNXK_MODEL_TYPE_INVALID;\n+\t\t}\n+\t}\n+\n+\treturn ML_CNXK_MODEL_TYPE_GLOW;\n+}\n+\n void\n cnxk_ml_model_dump(struct cnxk_ml_dev *cnxk_mldev, struct cnxk_ml_model *model, FILE *fp)\n {\ndiff --git a/drivers/ml/cnxk/cnxk_ml_model.h b/drivers/ml/cnxk/cnxk_ml_model.h\nindex f100eca203..a2fced46a2 100644\n--- a/drivers/ml/cnxk/cnxk_ml_model.h\n+++ b/drivers/ml/cnxk/cnxk_ml_model.h\n@@ -13,6 +13,8 @@\n \n #ifdef RTE_MLDEV_CNXK_ENABLE_MVTVM\n #include \"mvtvm_ml_model.h\"\n+#else\n+#include \"mvtvm_ml_stubs.h\"\n #endif\n \n #include \"cnxk_ml_io.h\"\n@@ -184,6 +186,7 @@ struct cnxk_ml_model {\n \tset_poll_addr_t set_poll_addr;\n };\n \n+enum cnxk_ml_model_type cnxk_ml_model_get_type(struct rte_ml_model_params *params);\n void cnxk_ml_model_dump(struct cnxk_ml_dev *cnxk_mldev, struct cnxk_ml_model *model, FILE *fp);\n \n #endif /* _CNXK_ML_MODEL_H_ */\ndiff --git a/drivers/ml/cnxk/cnxk_ml_ops.c b/drivers/ml/cnxk/cnxk_ml_ops.c\nindex ea6f59a70f..c140408023 100644\n--- a/drivers/ml/cnxk/cnxk_ml_ops.c\n+++ b/drivers/ml/cnxk/cnxk_ml_ops.c\n@@ -1018,6 +1018,7 @@ cnxk_ml_model_load(struct rte_ml_dev *dev, struct rte_ml_model_params *params, u\n {\n \tstruct rte_ml_dev_info dev_info;\n \tstruct cnxk_ml_dev *cnxk_mldev;\n+\tenum cnxk_ml_model_type type;\n \tstruct cnxk_ml_model *model;\n \n \tchar str[RTE_MEMZONE_NAMESIZE];\n@@ -1033,6 +1034,12 @@ cnxk_ml_model_load(struct rte_ml_dev *dev, struct rte_ml_model_params *params, u\n \n \tcnxk_mldev = dev->data->dev_private;\n \n+\ttype = cnxk_ml_model_get_type(params);\n+\tif (type == ML_CNXK_MODEL_TYPE_INVALID) {\n+\t\tplt_err(\"Invalid / unsupported model type\");\n+\t\treturn -EINVAL;\n+\t}\n+\n \t/* Find model ID */\n \tfound = false;\n \tfor (lcl_model_id = 0; lcl_model_id < dev->data->nb_models; lcl_model_id++) {\n@@ -1066,6 +1073,7 @@ cnxk_ml_model_load(struct rte_ml_dev *dev, struct rte_ml_model_params *params, u\n \n \tmodel = mz->addr;\n \tmodel->cnxk_mldev = cnxk_mldev;\n+\tmodel->type = type;\n \tmodel->model_id = lcl_model_id;\n \tmodel->info = PLT_PTR_ADD(\n \t\tmodel, PLT_ALIGN_CEIL(sizeof(struct cnxk_ml_model), dev_info.align_size));\ndiff --git a/drivers/ml/cnxk/meson.build b/drivers/ml/cnxk/meson.build\nindex 12b73ee3be..b3a62a7871 100644\n--- a/drivers/ml/cnxk/meson.build\n+++ b/drivers/ml/cnxk/meson.build\n@@ -9,6 +9,11 @@ endif\n \n enable_mvtvm = true\n \n+if not libarchive.found()\n+        message('drivers/ml/cnxk: libarchive not found')\n+        enable_mvtvm = false\n+endif\n+\n if not jansson_dep.found()\n         message('drivers/ml/cnxk: jansson not found')\n         enable_mvtvm = false\n@@ -71,6 +76,7 @@ driver_sdk_headers += files(\n \n sources += files(\n         'mvtvm_ml_ops.c',\n+        'mvtvm_ml_model.c',\n )\n \n ext_deps += tvmrt_dep\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_model.c b/drivers/ml/cnxk/mvtvm_ml_model.c\nnew file mode 100644\nindex 0000000000..ab5f8baa67\n--- /dev/null\n+++ b/drivers/ml/cnxk/mvtvm_ml_model.c\n@@ -0,0 +1,55 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\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 \"cnxk_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+enum cnxk_ml_model_type\n+mvtvm_ml_model_type_get(struct rte_ml_model_params *params)\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/* Assume as archive and check for read status */\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 ML_CNXK_MODEL_TYPE_UNKNOWN;\n+\n+\t/* Parse buffer for available objects */\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\tobject_found[i] = true;\n+\t\t}\n+\t\tarchive_read_data_skip(a);\n+\t}\n+\n+\t/* Check if all objects are available */\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\treturn ML_CNXK_MODEL_TYPE_INVALID;\n+\t\t}\n+\t}\n+\n+\treturn ML_CNXK_MODEL_TYPE_TVM;\n+}\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_model.h b/drivers/ml/cnxk/mvtvm_ml_model.h\nindex 1f6b435be0..b6162fceec 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_model.h\n+++ b/drivers/ml/cnxk/mvtvm_ml_model.h\n@@ -43,4 +43,6 @@ struct mvtvm_ml_model_data {\n \tstruct cnxk_ml_io_info info;\n };\n \n+enum cnxk_ml_model_type mvtvm_ml_model_type_get(struct rte_ml_model_params *params);\n+\n #endif /* _MVTVM_ML_MODEL_H_ */\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_stubs.c b/drivers/ml/cnxk/mvtvm_ml_stubs.c\nindex a31cd39cfa..a7352840a6 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_stubs.c\n+++ b/drivers/ml/cnxk/mvtvm_ml_stubs.c\n@@ -7,6 +7,15 @@\n #include \"mvtvm_ml_stubs.h\"\n \n #include \"cnxk_ml_dev.h\"\n+#include \"cnxk_ml_model.h\"\n+\n+enum cnxk_ml_model_type\n+mvtvm_ml_model_type_get(struct rte_ml_model_params *params)\n+{\n+\tRTE_SET_USED(params);\n+\n+\treturn ML_CNXK_MODEL_TYPE_UNKNOWN;\n+}\n \n int\n mvtvm_ml_dev_configure(struct cnxk_ml_dev *cnxk_mldev, const struct rte_ml_dev_config *conf)\ndiff --git a/drivers/ml/cnxk/mvtvm_ml_stubs.h b/drivers/ml/cnxk/mvtvm_ml_stubs.h\nindex 11c56e5144..467a9d39e5 100644\n--- a/drivers/ml/cnxk/mvtvm_ml_stubs.h\n+++ b/drivers/ml/cnxk/mvtvm_ml_stubs.h\n@@ -9,6 +9,7 @@\n \n struct cnxk_ml_dev;\n \n+enum cnxk_ml_model_type mvtvm_ml_model_type_get(struct rte_ml_model_params *params);\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 \n",
    "prefixes": [
        "v3",
        "20/35"
    ]
}