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 160CD43BE7; Mon, 26 Feb 2024 10:09:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D7DB402BF; Mon, 26 Feb 2024 10:09:49 +0100 (CET) Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by mails.dpdk.org (Postfix) with ESMTP id 0F0A440144 for ; Mon, 26 Feb 2024 10:09:47 +0100 (CET) Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Tjvss03kBz1xpMk; Mon, 26 Feb 2024 17:08:17 +0800 (CST) Received: from dggpeml500024.china.huawei.com (unknown [7.185.36.10]) by mail.maildlp.com (Postfix) with ESMTPS id E96F1140383; Mon, 26 Feb 2024 17:09:44 +0800 (CST) Received: from [10.67.121.161] (10.67.121.161) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 26 Feb 2024 17:09:44 +0800 Subject: Re: [PATCH v4 2/7] ethdev: add telemetry cmd for registers To: Jie Hai , CC: , , , References: <20231214015650.3738578-1-haijie1@huawei.com> <20240226030739.3775514-1-haijie1@huawei.com> <20240226030739.3775514-3-haijie1@huawei.com> From: fengchengwen Message-ID: Date: Mon, 26 Feb 2024 17:09:44 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20240226030739.3775514-3-haijie1@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.121.161] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) 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 Hi Jie, On 2024/2/26 11:07, Jie Hai wrote: > This patch adds a telemetry command for registers dump, > and supports get registers with specified names. > The length of the string exported by telemetry is limited > by MAX_OUTPUT_LEN. Therefore, the filter should be more > precise. > > An example usage is shown below: > --> /ethdev/regs,0,INTR > { > "/ethdev/regs": { > "registers_length": 318, > "registers_width": 4, > "register_offset": "0x0", > "version": "0x1140011", > "group_0": { > "HNS3_CMDQ_INTR_STS_REG": "0x0", > "HNS3_CMDQ_INTR_EN_REG": "0x2", > "HNS3_CMDQ_INTR_GEN_REG": "0x0", > "queue_0_HNS3_TQP_INTR_CTRL_REG": "0x0", > "queue_0_HNS3_TQP_INTR_GL0_REG": "0xa", > "queue_0_HNS3_TQP_INTR_GL1_REG": "0xa", > "queue_0_HNS3_TQP_INTR_GL2_REG": "0x0", > ... > }, > "group_1": { > ... > }, > ... > } > > or as below if the number of registers not exceed the > RTE_TEL_MAX_DICT_ENTRIES: > --> /ethdev/regs,0,ppp > { > "/ethdev/regs": { > "registers_length": 156, > "registers_width": 4, > "register_offset": "0x0", > "version": "0x1140011", > "ppp_key_drop_num": "0x0", > "ppp_rlt_drop_num": "0x0", > "ssu_ppp_mac_key_num_l": "0x1", > "ssu_ppp_mac_key_num_h": "0x0", > "ssu_ppp_host_key_num_l": "0x1", > "ssu_ppp_host_key_num_h": "0x0", > "ppp_ssu_mac_rlt_num_l": "0x1", > ... > } > } > > Signed-off-by: Jie Hai > --- > lib/ethdev/rte_ethdev_telemetry.c | 126 ++++++++++++++++++++++++++++++ > 1 file changed, 126 insertions(+) > > diff --git a/lib/ethdev/rte_ethdev_telemetry.c b/lib/ethdev/rte_ethdev_telemetry.c > index 6b873e7abe68..f1ebb2fae632 100644 > --- a/lib/ethdev/rte_ethdev_telemetry.c > +++ b/lib/ethdev/rte_ethdev_telemetry.c > @@ -5,6 +5,7 @@ > #include > #include > > +#include > #include > #include > > @@ -1395,6 +1396,129 @@ eth_dev_handle_port_tm_node_caps(const char *cmd __rte_unused, > return ret; > } > > +static int > +eth_dev_store_regs(struct rte_tel_data *d, struct rte_dev_reg_info *reg_info) > +{ > + struct rte_tel_data *groups[RTE_TEL_MAX_DICT_ENTRIES] = {NULL}; no need zero. > + char group_name[RTE_TEL_MAX_STRING_LEN] = {0}; > + struct rte_tel_data *group = NULL; > + uint32_t grp_num = 0; > + uint32_t *data; > + int ret = 0; > + uint32_t i; > + > + rte_tel_data_start_dict(d); > + rte_tel_data_add_dict_uint(d, "register_length", reg_info->length); > + rte_tel_data_add_dict_uint(d, "register_width", reg_info->width); > + rte_tel_data_add_dict_uint_hex(d, "register_offset", reg_info->offset, 0); > + rte_tel_data_add_dict_uint_hex(d, "version", reg_info->version, 0); > + > + data = reg_info->data; > + if (reg_info->length <= RTE_TEL_MAX_DICT_ENTRIES) { > + for (i = 0; i < reg_info->length; i++, data++) > + rte_tel_data_add_dict_uint_hex(d, > + reg_info->names[i].name, *data, 0); The above format is OK for reg_info->width==4. There maybe reg_info->width == 8, pls support it. > + return 0; > + } > + > + for (i = 0; i < reg_info->length; i++, data++) { > + if (i % RTE_TEL_MAX_DICT_ENTRIES == 0) { > + if (i != 0) > + rte_tel_data_add_dict_container(d, group_name, > + group, 0); > + > + group = rte_tel_data_alloc(); > + if (group == NULL) { > + ret = -ENOMEM; > + goto out; > + } > + rte_tel_data_start_dict(group); > + snprintf(group_name, RTE_TEL_MAX_STRING_LEN, > + "group_%u", grp_num); grp_num + 1 ? > + if (grp_num >= RTE_TEL_MAX_DICT_ENTRIES) { > + RTE_ETHDEV_LOG_LINE(NOTICE, > + "Too many regs, please filter"); how about add more descrip: stop format! > + return 0; this group's memory was leak. How about move the extream case before for loop: uint32_t length = reg_info->lenght; if (length > RTE_TEL_MAX_DICT_ENTRIES * RTE_TEL_MAX_DICT_ENTRIES) { LOG(xxx); length = RTE_TEL_MAX_DICT_ENTRIES * RTE_TEL_MAX_DICT_ENTRIES; } > + } > + groups[grp_num++] = group; > + } > + rte_tel_data_add_dict_uint_hex(group, reg_info->names[i].name, > + *data, 0); > + } > + if (i % RTE_TEL_MAX_DICT_ENTRIES != 0) > + rte_tel_data_add_dict_container(d, group_name, group, 0); how about move all add dict in here. for (i = 0; i < grp_num; i++) { snprintf(group_name, xxx); rte_tel_data_add_dict_container(d, group_name, group[i], 0); } > + > + return 0; > +out: > + for (i = 0; i < grp_num; i++) > + rte_tel_data_free(groups[i]); > + > + return ret; > +} > + > +static int > +eth_dev_get_port_regs(int port_id, struct rte_tel_data *d, char *filter) > +{ > + struct rte_dev_reg_info reg_info; > + int ret; > + > + memset(®_info, 0, sizeof(reg_info)); > + reg_info.filter = filter; > + > + ret = rte_eth_dev_get_reg_info_ext(port_id, ®_info); > + if (ret != 0) { > + RTE_ETHDEV_LOG_LINE(ERR, > + "Error getting device reg info: %d", ret); > + return ret; > + } > + > + reg_info.data = calloc(reg_info.length, reg_info.width); > + if (!reg_info.data) pls use if (reg_info.data == NULL), and add error log > + return -ENOMEM; > + > + reg_info.names = calloc(reg_info.length, sizeof(struct rte_eth_reg_name)); > + if (!reg_info.names) { pls use if (reg_info.names == NULL), and add error log > + free(reg_info.data); > + return -ENOMEM; > + } > + > + ret = rte_eth_dev_get_reg_info_ext(port_id, ®_info); > + if (ret != 0) { > + RTE_ETHDEV_LOG_LINE(ERR, > + "Error getting regs from device: %d", ret); > + ret = -EINVAL; > + goto out; > + } > + > + ret = eth_dev_store_regs(d, ®_info); > +out: > + free(reg_info.data); > + free(reg_info.names); > + > + return ret; > +} > + > +static int > +eth_dev_handle_port_regs(const char *cmd __rte_unused, > + const char *params, > + struct rte_tel_data *d) > +{ > + char *filter = NULL; > + uint16_t port_id; > + char *end_param; > + int ret; > + > + ret = eth_dev_parse_port_params(params, &port_id, &end_param, true); > + if (ret != 0) > + return ret; > + > + filter = strtok(end_param, ","); > + if (filter != NULL && strlen(filter) == 0) > + filter = NULL; > + > + return eth_dev_get_port_regs(port_id, d, filter); > +} > + > RTE_INIT(ethdev_init_telemetry) > { > rte_telemetry_register_cmd("/ethdev/list", eth_dev_handle_port_list, > @@ -1436,4 +1560,6 @@ RTE_INIT(ethdev_init_telemetry) > "Returns TM Level Capabilities info for a port. Parameters: int port_id, int level_id (see tm_capability for the max)"); > rte_telemetry_register_cmd("/ethdev/tm_node_capability", eth_dev_handle_port_tm_node_caps, > "Returns TM Node Capabilities info for a port. Parameters: int port_id, int node_id (see tm_capability for the max)"); > + rte_telemetry_register_cmd("/ethdev/regs", eth_dev_handle_port_regs, > + "Returns regs for a port. Parameters: int port_id, string filter"); > } >