From: Jie Hai <haijie1@huawei.com>
To: Thomas Monjalon <thomas@monjalon.net>,
Ferruh Yigit <ferruh.yigit@amd.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Cc: <dev@dpdk.org>, <liudongdong3@huawei.com>
Subject: [PATCH 02/10] ethdev: support RxTx offload display
Date: Tue, 30 May 2023 17:05:02 +0800 [thread overview]
Message-ID: <20230530090510.56812-3-haijie1@huawei.com> (raw)
In-Reply-To: <20230530090510.56812-1-haijie1@huawei.com>
Currently, Rx/Tx offloads are displayed in numeric format,
which is not easy to understand. This patch fixes it.
Signed-off-by: Jie Hai <haijie1@huawei.com>
---
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
--
2.33.0
next prev parent reply other threads:[~2023-05-30 9:07 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 9:05 [PATCH 00/10] support telemetry query ethdev info Jie Hai
2023-05-30 9:05 ` [PATCH 01/10] ethdev: support telemetry query MAC addresses Jie Hai
2023-06-01 14:39 ` Ferruh Yigit
2023-05-30 9:05 ` Jie Hai [this message]
2023-05-30 9:05 ` [PATCH 03/10] ethdev: support telemetry query flow ctrl info Jie Hai
2023-05-30 9:05 ` [PATCH 04/10] ethdev: support telemetry query Rx queue info Jie Hai
2023-05-30 9:05 ` [PATCH 05/10] ethdev: support telemetry query Tx " Jie Hai
2023-05-30 9:05 ` [PATCH 06/10] ethdev: add firmware version in telemetry info command Jie Hai
2023-05-30 9:05 ` [PATCH 07/10] ethdev: support telemetry query DCB info Jie Hai
2023-05-30 9:05 ` [PATCH 08/10] ethdev: support telemetry query RSS info Jie Hai
2023-05-30 9:05 ` [PATCH 09/10] ethdev: support telemetry query FEC info Jie Hai
2023-05-30 9:05 ` [PATCH 10/10] ethdev: support telemetry query VLAN info Jie Hai
2023-06-01 12:05 ` [PATCH 00/10] support telemetry query ethdev info Ferruh Yigit
2023-06-01 12:23 ` Jie Hai
2023-06-01 14:36 ` Ferruh Yigit
2023-06-05 6:19 ` Jie Hai
2023-06-07 7:41 ` [PATCH v2 00/13] " Jie Hai
2023-06-07 7:41 ` [PATCH v2 01/13] ethdev: fix incorrect argument of calloc Jie Hai
2023-06-07 11:35 ` Ferruh Yigit
2023-06-07 7:41 ` [PATCH v2 02/13] ethdev: extract telemetry codes to a file Jie Hai
2023-06-07 11:37 ` Ferruh Yigit
2023-06-07 7:41 ` [PATCH v2 03/13] ethdev: extract codes parsing port ID as a function Jie Hai
2023-06-07 11:37 ` Ferruh Yigit
2023-06-07 7:41 ` [PATCH v2 04/13] ethdev: support telemetry query MAC addresses Jie Hai
2023-06-07 7:42 ` [PATCH v2 05/13] ethdev: support RxTx offload display Jie Hai
2023-06-07 7:42 ` [PATCH v2 06/13] ethdev: support telemetry query flow ctrl info Jie Hai
2023-06-07 7:42 ` [PATCH v2 07/13] ethdev: support telemetry query Rx queue info Jie Hai
2023-06-07 7:42 ` [PATCH v2 08/13] ethdev: support telemetry query Tx " Jie Hai
2023-06-07 7:42 ` [PATCH v2 09/13] ethdev: add firmware version in telemetry info command Jie Hai
2023-06-07 7:42 ` [PATCH v2 10/13] ethdev: support telemetry query DCB info Jie Hai
2023-06-07 7:42 ` [PATCH v2 11/13] ethdev: support telemetry query RSS info Jie Hai
2023-06-07 14:08 ` Ferruh Yigit
2023-06-07 7:42 ` [PATCH v2 12/13] ethdev: support telemetry query FEC info Jie Hai
2023-06-07 7:42 ` [PATCH v2 13/13] ethdev: support telemetry query VLAN info Jie Hai
2023-06-07 11:40 ` [PATCH v2 00/13] support telemetry query ethdev info Ferruh Yigit
2023-06-08 2:01 ` Jie Hai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230530090510.56812-3-haijie1@huawei.com \
--to=haijie1@huawei.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=liudongdong3@huawei.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).