From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 876EDA0093; Tue, 26 Apr 2022 04:48:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1188341151; Tue, 26 Apr 2022 04:48:45 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 5E77741141 for ; Tue, 26 Apr 2022 04:48:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650941323; x=1682477323; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=drEeEWTF2Ij2bh0XVJWZJWIAKdgONGdVgpjU1w0dLNQ=; b=mECj1/FS+JdxynuSgK5tx/LPyzbbJ+Z0qVyXnY6mFs8gUm89nAwb9DXJ Rnvt0QlSft0Anxo0HTZBrpM9jsnhOKaUNVxZb24SgCeuSUa8GlgJlbusd Jp/UIm3NnWXKkNMGrVJtm/Xr1FXgJfzb/gnD8OwRYy12Eox3e+lCwc0tp CQfyIr8VA1BulhctGfZl0xP08VTtf2AeAh91fd6jExbOY8D6HX4T0Jxke KhMmpf6A0boBaNNHIEDk+OAgcJg41scIafbN6sebjEY6wRgqdNldSenTg qn/pzB+s2gzCT70mRqj2R6c5Kw9A4gapvdVpdOJYRt546QszVxoep/f5j w==; X-IronPort-AV: E=McAfee;i="6400,9594,10328"; a="252801978" X-IronPort-AV: E=Sophos;i="5.90,290,1643702400"; d="scan'208";a="252801978" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2022 19:48:43 -0700 X-IronPort-AV: E=Sophos;i="5.90,290,1643702400"; d="scan'208";a="579631314" Received: from intel-cd-odc-robin.cd.intel.com ([10.240.178.191]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2022 19:48:40 -0700 From: Robin Zhang To: dev@dpdk.org Cc: qiming.yang@intel.com, qi.z.zhang@intel.com, stevex.yang@intel.com, thomas@monjalon.net, andrew.rybchenko@oktetlabs.ru, bruce.richardson@intel.com, david.marchand@redhat.com, Robin Zhang Subject: [PATCH v5 1/5] ethdev: add telemetry command for module EEPROM Date: Tue, 26 Apr 2022 02:43:45 +0000 Message-Id: <20220426024349.1081666-2-robinx.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426024349.1081666-1-robinx.zhang@intel.com> References: <20220215101853.919735-1-robinx.zhang@intel.com> <20220426024349.1081666-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add a new telemetry command /ethdev/module_eeprom to dump the module EEPROM of each port. The format of module EEPROM information follows the SFF(Small Form Factor) Committee specifications. Current the format support SFP(Small Formfactor Pluggable)/SFP+/ QSFP+(Quad Small Formfactor Pluggable)/QSFP28 with specs SFF-8079/ SFF-8472/SFF-8024/SFF-8636. Signed-off-by: Robin Zhang --- lib/ethdev/ethdev_sff_telemetry.c | 131 ++++++++++++++++++++++++++++++ lib/ethdev/ethdev_sff_telemetry.h | 37 +++++++++ lib/ethdev/meson.build | 1 + lib/ethdev/rte_ethdev.c | 3 + 4 files changed, 172 insertions(+) create mode 100644 lib/ethdev/ethdev_sff_telemetry.c create mode 100644 lib/ethdev/ethdev_sff_telemetry.h diff --git a/lib/ethdev/ethdev_sff_telemetry.c b/lib/ethdev/ethdev_sff_telemetry.c new file mode 100644 index 0000000000..968b640b17 --- /dev/null +++ b/lib/ethdev/ethdev_sff_telemetry.c @@ -0,0 +1,131 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2022 Intel Corporation + */ + +#include + +#include +#include +#include "ethdev_sff_telemetry.h" + +static uint16_t sff_item_count; + +static void +sff_port_module_eeprom_display(uint16_t port_id, struct sff_item *items) +{ + struct rte_eth_dev_module_info minfo; + struct rte_dev_eeprom_info einfo; + int ret; + + ret = rte_eth_dev_get_module_info(port_id, &minfo); + if (ret != 0) { + switch (ret) { + case -ENODEV: + RTE_ETHDEV_LOG(ERR, "port index %d invalid\n", port_id); + break; + case -ENOTSUP: + RTE_ETHDEV_LOG(ERR, "operation not supported by device\n"); + break; + case -EIO: + RTE_ETHDEV_LOG(ERR, "device is removed\n"); + break; + default: + RTE_ETHDEV_LOG(ERR, "Unable to get port %d EEPROM module info\n", ret); + break; + } + return; + } + + einfo.offset = 0; + einfo.length = minfo.eeprom_len; + einfo.data = calloc(1, minfo.eeprom_len); + if (einfo.data == NULL) { + RTE_ETHDEV_LOG(ERR, "Allocation of port %u eeprom data failed\n", port_id); + return; + } + + ret = rte_eth_dev_get_module_eeprom(port_id, &einfo); + if (ret != 0) { + switch (ret) { + case -ENODEV: + RTE_ETHDEV_LOG(ERR, "port index %d invalid\n", port_id); + break; + case -ENOTSUP: + RTE_ETHDEV_LOG(ERR, "operation not supported by device\n"); + break; + case -EIO: + RTE_ETHDEV_LOG(ERR, "device is removed\n"); + break; + default: + RTE_ETHDEV_LOG(ERR, "Unable to get port %d module EEPROM\n", ret); + break; + } + free(einfo.data); + return; + } + + switch (minfo.type) { + /* parsing module EEPROM data base on different module type */ + default: + RTE_ETHDEV_LOG(NOTICE, "Unsupported module type: %u\n", minfo.type); + break; + } + + free(einfo.data); +} + +void +add_item_string(struct sff_item *items, const char *name_str, const char *value_str) +{ + /* append different values for same keys */ + if (sff_item_count > 0 && + (strcmp(items[sff_item_count - 1].name, name_str) == 0)) { + strlcat(items[sff_item_count - 1].value, "; ", SFF_ITEM_VALUE_SIZE); + strlcat(items[sff_item_count - 1].value, value_str, SFF_ITEM_VALUE_SIZE); + return; + } + + snprintf(items[sff_item_count].name, SFF_ITEM_NAME_SIZE, "%s", name_str); + snprintf(items[sff_item_count].value, SFF_ITEM_VALUE_SIZE, "%s", value_str); + sff_item_count++; +} + +int +eth_dev_handle_port_module_eeprom(const char *cmd __rte_unused, const char *params, + struct rte_tel_data *d) +{ + char *end_param; + int port_id, i; + struct sff_item *items; + sff_item_count = 0; + + if (params == NULL || strlen(params) == 0 || !isdigit(*params)) + return -1; + + errno = 0; + port_id = strtoul(params, &end_param, 0); + + if (errno != 0) { + RTE_ETHDEV_LOG(ERR, "Invalid argument\n"); + return -1; + } + + if (*end_param != '\0') + RTE_ETHDEV_LOG(NOTICE, + "Extra parameters passed to ethdev telemetry command, ignoring"); + + items = calloc(1, sizeof(struct sff_item) * SFF_ITEM_MAX_COUNT); + if (items == NULL) { + RTE_ETHDEV_LOG(ERR, "Error allocating memory of items\n"); + return -1; + } + + sff_port_module_eeprom_display(port_id, items); + + rte_tel_data_start_dict(d); + for (i = 0; i < sff_item_count; i++) + rte_tel_data_add_dict_string(d, items[i].name, items[i].value); + + free(items); + return 0; +} diff --git a/lib/ethdev/ethdev_sff_telemetry.h b/lib/ethdev/ethdev_sff_telemetry.h new file mode 100644 index 0000000000..5788bd6e60 --- /dev/null +++ b/lib/ethdev/ethdev_sff_telemetry.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2022 Intel Corporation + */ + +#ifndef _ETHDEV_SFF_TELEMETRY_H_ +#define _ETHDEV_SFF_TELEMETRY_H_ + +#include + +#define ARRAY_SIZE(arr) RTE_DIM(arr) + +#define SFF_ITEM_NAME_SIZE 64 +#define SFF_ITEM_VALUE_SIZE 256 +#define SFF_ITEM_MAX_COUNT 256 +#define SFF_ITEM_VAL_COMPOSE_SIZE 64 + +struct sff_item { + char name[SFF_ITEM_NAME_SIZE]; /* The item name. */ + char value[SFF_ITEM_VALUE_SIZE]; /* The item value. */ +}; + +/* SFF-8079 Optics diagnostics */ +void sff_8079_show_all(const uint8_t *data, struct sff_item *items); + +/* SFF-8472 Optics diagnostics */ +void sff_8472_show_all(const uint8_t *data, struct sff_item *items); + +/* SFF-8636 Optics diagnostics */ +void sff_8636_show_all(const uint8_t *data, uint32_t eeprom_len, struct sff_item *items); + +int eth_dev_handle_port_module_eeprom(const char *cmd __rte_unused, + const char *params, + struct rte_tel_data *d); + +void add_item_string(struct sff_item *items, const char *name_str, const char *value_str); + +#endif /* _ETHDEV_SFF_TELEMETRY_H_ */ diff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build index a094585bf7..49c77acb3f 100644 --- a/lib/ethdev/meson.build +++ b/lib/ethdev/meson.build @@ -11,6 +11,7 @@ sources = files( 'rte_flow.c', 'rte_mtr.c', 'rte_tm.c', + 'ethdev_sff_telemetry.c', ) headers = files( diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 29a3d80466..2b87df1b32 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -39,6 +39,7 @@ #include "ethdev_driver.h" #include "ethdev_profile.h" #include "ethdev_private.h" +#include "ethdev_sff_telemetry.h" struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS]; @@ -5876,4 +5877,6 @@ RTE_INIT(ethdev_init_telemetry) "Returns the link status for a port. Parameters: int port_id"); rte_telemetry_register_cmd("/ethdev/info", eth_dev_handle_port_info, "Returns the device info for a port. Parameters: int port_id"); + rte_telemetry_register_cmd("/ethdev/module_eeprom", eth_dev_handle_port_module_eeprom, + "Returns module EEPROM info with SFF specs. Parameters: int port_id"); } -- 2.25.1