Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/111890/?format=api
{ "id": 111890, "url": "https://patches.dpdk.org/api/patches/111890/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220526073215.428410-2-robinx.zhang@intel.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": "<20220526073215.428410-2-robinx.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220526073215.428410-2-robinx.zhang@intel.com", "date": "2022-05-26T07:32:11", "name": "[v9,1/5] ethdev: add telemetry command for module EEPROM", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "99a8cc7be9d35af3d8a3dd576baa0f9992be4e60", "submitter": { "id": 2004, "url": "https://patches.dpdk.org/api/people/2004/?format=api", "name": "Robin Zhang", "email": "robinx.zhang@intel.com" }, "delegate": { "id": 3961, "url": "https://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20220526073215.428410-2-robinx.zhang@intel.com/mbox/", "series": [ { "id": 23180, "url": "https://patches.dpdk.org/api/series/23180/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=23180", "date": "2022-05-26T07:32:10", "name": "add telemetry command for show module EEPROM", "version": 9, "mbox": "https://patches.dpdk.org/series/23180/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/111890/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/111890/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 5BC50A0557;\n\tThu, 26 May 2022 09:39:38 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4F55C427EC;\n\tThu, 26 May 2022 09:39:33 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by mails.dpdk.org (Postfix) with ESMTP id C4A2A40DF7\n for <dev@dpdk.org>; Thu, 26 May 2022 09:39:30 +0200 (CEST)", "from orsmga006.jf.intel.com ([10.7.209.51])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 26 May 2022 00:39:23 -0700", "from intel-cd-odc-robin.cd.intel.com ([10.240.178.142])\n by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 26 May 2022 00:39:21 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1653550771; x=1685086771;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=Tc6pKc2qJb8C/PDLQI+h/gbQ89TRMdBl+zI2Rkeq/oE=;\n b=QjBFKjc16BpOPoXeFoh0BOj4/u2poP7zV8HfULRiJQRYZ+7IFi5LkCD/\n Q0Kfw0XMMadnr6Ukn5DTVxZacIrJPjAmKCNWVZy/246JwlapdtZUrarxJ\n IKTOZcgfoo4UYA8U/6DMg79WuH1NbCICNolIevg4WVtPhaBu327oijQqi\n UVzjBl/FpoVtItcEkti95UirVTACLBCW+mIwoiA8bHVR2YiJ3+XOhPak6\n N24mptvPoo3HFjj5i/tyZg/17VCTi3qiap/UKrTl5Nq/q7jD/Ny61pTUo\n RvtUIlG0kkpRU2uBjYWZGoFSpjr1uOnLtmiPEiwTrrLC8/tCQs3Uhr1DG Q==;", "X-IronPort-AV": [ "E=McAfee;i=\"6400,9594,10358\"; a=\"272885316\"", "E=Sophos;i=\"5.91,252,1647327600\"; d=\"scan'208\";a=\"272885316\"", "E=Sophos;i=\"5.91,252,1647327600\"; d=\"scan'208\";a=\"549441832\"" ], "From": "Robin Zhang <robinx.zhang@intel.com>", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net, andrew.rybchenko@oktetlabs.ru, kevinx.liu@intel.com,\n Robin Zhang <robinx.zhang@intel.com>", "Subject": "[PATCH v9 1/5] ethdev: add telemetry command for module EEPROM", "Date": "Thu, 26 May 2022 07:32:11 +0000", "Message-Id": "<20220526073215.428410-2-robinx.zhang@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220526073215.428410-1-robinx.zhang@intel.com>", "References": "<20220525031446.72578-1-robinx.zhang@intel.com>\n <20220526073215.428410-1-robinx.zhang@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "Add a new telemetry command /ethdev/module_eeprom to dump the module\nEEPROM of each port. The format of module EEPROM information follows\nthe SFF(Small Form Factor) Committee specifications.\n\nSigned-off-by: Robin Zhang <robinx.zhang@intel.com>\nSigned-off-by: Kevin Liu <kevinx.liu@intel.com>\n---\n devtools/words-case.txt | 1 +\n lib/ethdev/meson.build | 1 +\n lib/ethdev/rte_ethdev.c | 3 +\n lib/ethdev/sff_telemetry.c | 139 +++++++++++++++++++++++++++++++++++++\n lib/ethdev/sff_telemetry.h | 27 +++++++\n 5 files changed, 171 insertions(+)\n create mode 100644 lib/ethdev/sff_telemetry.c\n create mode 100644 lib/ethdev/sff_telemetry.h", "diff": "diff --git a/devtools/words-case.txt b/devtools/words-case.txt\nindex bc33470532..2f1753bdc8 100644\n--- a/devtools/words-case.txt\n+++ b/devtools/words-case.txt\n@@ -76,6 +76,7 @@ RSS\n RVU\n Rx\n SCTP\n+SFF\n SMP\n SoC\n SQ\ndiff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build\nindex a094585bf7..6a14d0b402 100644\n--- a/lib/ethdev/meson.build\n+++ b/lib/ethdev/meson.build\n@@ -11,6 +11,7 @@ sources = files(\n 'rte_flow.c',\n 'rte_mtr.c',\n 'rte_tm.c',\n+ 'sff_telemetry.c',\n )\n \n headers = files(\ndiff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c\nindex 29a3d80466..56814d2e54 100644\n--- a/lib/ethdev/rte_ethdev.c\n+++ b/lib/ethdev/rte_ethdev.c\n@@ -39,6 +39,7 @@\n #include \"ethdev_driver.h\"\n #include \"ethdev_profile.h\"\n #include \"ethdev_private.h\"\n+#include \"sff_telemetry.h\"\n \n struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];\n \n@@ -5876,4 +5877,6 @@ RTE_INIT(ethdev_init_telemetry)\n \t\t\t\"Returns the link status for a port. Parameters: int port_id\");\n \trte_telemetry_register_cmd(\"/ethdev/info\", eth_dev_handle_port_info,\n \t\t\t\"Returns the device info for a port. Parameters: int port_id\");\n+\trte_telemetry_register_cmd(\"/ethdev/module_eeprom\", eth_dev_handle_port_module_eeprom,\n+\t\t\t\"Returns module EEPROM info with SFF specs. Parameters: int port_id\");\n }\ndiff --git a/lib/ethdev/sff_telemetry.c b/lib/ethdev/sff_telemetry.c\nnew file mode 100644\nindex 0000000000..7da4385223\n--- /dev/null\n+++ b/lib/ethdev/sff_telemetry.c\n@@ -0,0 +1,139 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2022 Intel Corporation\n+ */\n+\n+#include <errno.h>\n+\n+#include \"rte_ethdev.h\"\n+#include <rte_common.h>\n+#include \"sff_telemetry.h\"\n+#include <telemetry_data.h>\n+\n+static void\n+sff_port_module_eeprom_parse(uint16_t port_id, struct rte_tel_data *d)\n+{\n+\tstruct rte_eth_dev_module_info minfo;\n+\tstruct rte_dev_eeprom_info einfo;\n+\tint ret;\n+\n+\tif (d == NULL) {\n+\t\tRTE_ETHDEV_LOG(ERR, \"Dict invalid\\n\");\n+\t\treturn;\n+\t}\n+\n+\tret = rte_eth_dev_get_module_info(port_id, &minfo);\n+\tif (ret != 0) {\n+\t\tswitch (ret) {\n+\t\tcase -ENODEV:\n+\t\t\tRTE_ETHDEV_LOG(ERR, \"Port index %d invalid\\n\", port_id);\n+\t\t\tbreak;\n+\t\tcase -ENOTSUP:\n+\t\t\tRTE_ETHDEV_LOG(ERR, \"Operation not supported by device\\n\");\n+\t\t\tbreak;\n+\t\tcase -EIO:\n+\t\t\tRTE_ETHDEV_LOG(ERR, \"Device is removed\\n\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tRTE_ETHDEV_LOG(ERR, \"Unable to get port module info, %d\\n\", ret);\n+\t\t\tbreak;\n+\t\t}\n+\t\treturn;\n+\t}\n+\n+\teinfo.offset = 0;\n+\teinfo.length = minfo.eeprom_len;\n+\teinfo.data = calloc(1, minfo.eeprom_len);\n+\tif (einfo.data == NULL) {\n+\t\tRTE_ETHDEV_LOG(ERR, \"Allocation of port %u EEPROM data failed\\n\", port_id);\n+\t\treturn;\n+\t}\n+\n+\tret = rte_eth_dev_get_module_eeprom(port_id, &einfo);\n+\tif (ret != 0) {\n+\t\tswitch (ret) {\n+\t\tcase -ENODEV:\n+\t\t\tRTE_ETHDEV_LOG(ERR, \"Port index %d invalid\\n\", port_id);\n+\t\t\tbreak;\n+\t\tcase -ENOTSUP:\n+\t\t\tRTE_ETHDEV_LOG(ERR, \"Operation not supported by device\\n\");\n+\t\t\tbreak;\n+\t\tcase -EIO:\n+\t\t\tRTE_ETHDEV_LOG(ERR, \"Device is removed\\n\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tRTE_ETHDEV_LOG(ERR, \"Unable to get port module EEPROM, %d\\n\", ret);\n+\t\t\tbreak;\n+\t\t}\n+\t\tfree(einfo.data);\n+\t\treturn;\n+\t}\n+\n+\tswitch (minfo.type) {\n+\t/* parsing module EEPROM data base on different module type */\n+\tdefault:\n+\t\tRTE_ETHDEV_LOG(NOTICE, \"Unsupported module type: %u\\n\", minfo.type);\n+\t\tbreak;\n+\t}\n+\n+\tfree(einfo.data);\n+}\n+\n+void\n+ssf_add_dict_string(struct rte_tel_data *d, const char *name_str, const char *value_str)\n+{\n+\tstruct tel_dict_entry *e = &d->data.dict[d->data_len];\n+\n+\tif (d->type != RTE_TEL_DICT)\n+\t\treturn;\n+\tif (d->data_len >= RTE_TEL_MAX_DICT_ENTRIES) {\n+\t\tRTE_ETHDEV_LOG(ERR, \"data_len has exceeded the maximum number of inserts\\n\");\n+\t\treturn;\n+\t}\n+\n+\te->type = RTE_TEL_STRING_VAL;\n+\t/* append different values for same keys */\n+\tif (d->data_len > 0) {\n+\t\tstruct tel_dict_entry *previous = &d->data.dict[d->data_len - 1];\n+\t\tif (strcmp(previous->name, name_str) == 0) {\n+\t\t\tstrlcat(previous->value.sval, \"; \", RTE_TEL_MAX_STRING_LEN);\n+\t\t\tstrlcat(previous->value.sval, value_str, RTE_TEL_MAX_STRING_LEN);\n+\t\t\tgoto end;\n+\t\t}\n+\t}\n+\tstrlcpy(e->value.sval, value_str, RTE_TEL_MAX_STRING_LEN);\n+\tstrlcpy(e->name, name_str, RTE_TEL_MAX_STRING_LEN);\n+\td->data_len++;\n+\n+end:\n+\treturn;\n+}\n+\n+int\n+eth_dev_handle_port_module_eeprom(const char *cmd __rte_unused, const char *params,\n+\t\t\t\t struct rte_tel_data *d)\n+{\n+\tchar *end_param;\n+\tint port_id;\n+\n+\tif (params == NULL || strlen(params) == 0 || !isdigit(*params))\n+\t\treturn -1;\n+\n+\terrno = 0;\n+\tport_id = strtoul(params, &end_param, 0);\n+\n+\tif (errno != 0) {\n+\t\tRTE_ETHDEV_LOG(ERR, \"Invalid argument, %d\\n\", errno);\n+\t\treturn -1;\n+\t}\n+\n+\tif (*end_param != '\\0')\n+\t\tRTE_ETHDEV_LOG(NOTICE,\n+\t\t\t\"Extra parameters [%s] passed to ethdev telemetry command, ignoring\\n\",\n+\t\t\t\tend_param);\n+\n+\trte_tel_data_start_dict(d);\n+\n+\tsff_port_module_eeprom_parse(port_id, d);\n+\n+\treturn 0;\n+}\ndiff --git a/lib/ethdev/sff_telemetry.h b/lib/ethdev/sff_telemetry.h\nnew file mode 100644\nindex 0000000000..1fd870e0ef\n--- /dev/null\n+++ b/lib/ethdev/sff_telemetry.h\n@@ -0,0 +1,27 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2022 Intel Corporation\n+ */\n+\n+#ifndef _ETHDEV_SFF_TELEMETRY_H_\n+#define _ETHDEV_SFF_TELEMETRY_H_\n+\n+#include <rte_telemetry.h>\n+\n+#define SFF_ITEM_VAL_COMPOSE_SIZE 64\n+\n+/* SFF-8079 Optics diagnostics */\n+void sff_8079_show_all(const uint8_t *data, struct rte_tel_data *d);\n+\n+/* SFF-8472 Optics diagnostics */\n+void sff_8472_show_all(const uint8_t *data, struct rte_tel_data *d);\n+\n+/* SFF-8636 Optics diagnostics */\n+void sff_8636_show_all(const uint8_t *data, uint32_t eeprom_len, struct rte_tel_data *d);\n+\n+int eth_dev_handle_port_module_eeprom(const char *cmd __rte_unused,\n+\t\t\t\t const char *params,\n+\t\t\t\t struct rte_tel_data *d);\n+\n+void ssf_add_dict_string(struct rte_tel_data *d, const char *name_str, const char *value_str);\n+\n+#endif /* _ETHDEV_SFF_TELEMETRY_H_ */\n", "prefixes": [ "v9", "1/5" ] }