From patchwork Tue May 30 09:05:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Hai X-Patchwork-Id: 127690 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id A962C42BE1; Tue, 30 May 2023 11:07:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C444942D0D; Tue, 30 May 2023 11:07:42 +0200 (CEST) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id 55A2342BC9 for ; Tue, 30 May 2023 11:07:41 +0200 (CEST) Received: from kwepemi500020.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4QVmdL4JmGz18Lc8; Tue, 30 May 2023 17:03:02 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by kwepemi500020.china.huawei.com (7.221.188.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 30 May 2023 17:07:39 +0800 From: Jie Hai To: Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko CC: , Subject: [PATCH 02/10] ethdev: support RxTx offload display Date: Tue, 30 May 2023 17:05:02 +0800 Message-ID: <20230530090510.56812-3-haijie1@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230530090510.56812-1-haijie1@huawei.com> References: <20230530090510.56812-1-haijie1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemi500020.china.huawei.com (7.221.188.8) X-CFilter-Loop: Reflected 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 Currently, Rx/Tx offloads are displayed in numeric format, which is not easy to understand. This patch fixes it. Signed-off-by: Jie Hai --- lib/ethdev/rte_ethdev.c | 67 +++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 65e0101fc0eb..3207b3177256 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -6607,16 +6607,44 @@ eth_dev_handle_port_link_status(const char *cmd __rte_unused, return 0; } +static void +eth_dev_parse_rx_offloads(uint64_t offload, struct rte_tel_data *d) +{ + uint32_t i; + + rte_tel_data_start_array(d, RTE_TEL_STRING_VAL); + for (i = 0; i < RTE_DIM(eth_dev_rx_offload_names); i++) { + if ((offload & eth_dev_rx_offload_names[i].offload) != 0) + rte_tel_data_add_array_string(d, + eth_dev_rx_offload_names[i].name); + } +} + +static void +eth_dev_parse_tx_offloads(uint64_t offload, struct rte_tel_data *d) +{ + uint32_t i; + + rte_tel_data_start_array(d, RTE_TEL_STRING_VAL); + for (i = 0; i < RTE_DIM(eth_dev_tx_offload_names); i++) { + if ((offload & eth_dev_tx_offload_names[i].offload) != 0) + rte_tel_data_add_array_string(d, + eth_dev_tx_offload_names[i].name); + } +} + static int eth_dev_handle_port_info(const char *cmd __rte_unused, const char *params, struct rte_tel_data *d) { + struct rte_tel_data *rx_offload, *tx_offload; struct rte_tel_data *rxq_state, *txq_state; char mac_addr[RTE_ETHER_ADDR_FMT_SIZE]; struct rte_eth_dev *eth_dev; char *end_param; - int port_id, i; + int port_id; + uint32_t i; if (params == NULL || strlen(params) == 0 || !isdigit(*params)) return -1; @@ -6632,14 +6660,20 @@ eth_dev_handle_port_info(const char *cmd __rte_unused, eth_dev = &rte_eth_devices[port_id]; rxq_state = rte_tel_data_alloc(); - if (!rxq_state) + if (rxq_state == NULL) return -ENOMEM; txq_state = rte_tel_data_alloc(); - if (!txq_state) { - rte_tel_data_free(rxq_state); - return -ENOMEM; - } + if (txq_state == NULL) + goto free_rxq_state; + + rx_offload = rte_tel_data_alloc(); + if (rx_offload == NULL) + goto free_txq_state; + + tx_offload = rte_tel_data_alloc(); + if (tx_offload == NULL) + goto free_rx_offload; rte_tel_data_start_dict(d); rte_tel_data_add_dict_string(d, "name", eth_dev->data->name); @@ -6681,14 +6715,27 @@ eth_dev_handle_port_info(const char *cmd __rte_unused, rte_tel_data_add_dict_int(d, "numa_node", eth_dev->data->numa_node); rte_tel_data_add_dict_uint_hex(d, "dev_flags", eth_dev->data->dev_flags, 0); - rte_tel_data_add_dict_uint_hex(d, "rx_offloads", - eth_dev->data->dev_conf.rxmode.offloads, 0); - rte_tel_data_add_dict_uint_hex(d, "tx_offloads", - eth_dev->data->dev_conf.txmode.offloads, 0); + + eth_dev_parse_rx_offloads(eth_dev->data->dev_conf.rxmode.offloads, + rx_offload); + rte_tel_data_add_dict_container(d, "rx_offloads", rx_offload, 0); + eth_dev_parse_tx_offloads(eth_dev->data->dev_conf.txmode.offloads, + tx_offload); + rte_tel_data_add_dict_container(d, "tx_offloads", tx_offload, 0); + rte_tel_data_add_dict_uint_hex(d, "ethdev_rss_hf", eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf, 0); return 0; + +free_rx_offload: + rte_tel_data_free(rx_offload); +free_txq_state: + rte_tel_data_free(txq_state); +free_rxq_state: + rte_tel_data_free(rxq_state); + + return -ENOMEM; } int