From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, Thomas Monjalon <thomas@monjalon.net>,
Ferruh Yigit <ferruh.yigit@amd.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Cc: <haijie1@huawei.com>, <lihuisong@huawei.com>
Subject: [PATCH 3/4] ethdev: add telemetry command for TM level capabilities
Date: Wed, 18 Oct 2023 09:39:36 +0800 [thread overview]
Message-ID: <20231018013938.3830742-4-haijie1@huawei.com> (raw)
In-Reply-To: <20231018013938.3830742-1-haijie1@huawei.com>
This patch adds a telemetry command for traffic management level
capabilities, using (port_id,level_id) as parameters. An
example usage is shown below:
--> /ethdev/tm_level_capability,0,0
{
"/ethdev/tm_level_capability": {
"n_nodes_max": 1,
"n_nodes_nonleaf_max": 1,
"n_nodes_leaf_max": 0,
"non_leaf_nodes_identical": 1,
"leaf_nodes_identical": 1,
"nonleaf_cap": {
"shaper_private_supported": 1,
"shaper_private_dual_rate_supported": 0,
"shaper_private_rate_min": 0,
"shaper_private_rate_max": 25000000000,
"shaper_private_packet_mode_supported": 0,
"shaper_private_byte_mode_supported": 0,
"shaper_shared_n_max": 0,
"shaper_shared_packet_mode_supported": 0,
"shaper_shared_byte_mode_supported": 0,
"sched_n_children_max": 8,
"sched_sp_n_priorities_max": 1,
"sched_wfq_n_children_per_group_max": 0,
"sched_wfq_n_groups_max": 0,
"sched_wfq_weight_max": 1,
"sched_wfq_packet_mode_supported": 0,
"sched_wfq_byte_mode_supported": 0,
"stats_mask": "0x0"
},
"leaf_cap": {
"shaper_private_supported": 1,
"shaper_private_dual_rate_supported": 0,
"shaper_private_rate_min": 0,
"shaper_private_rate_max": 25000000000,
"shaper_private_packet_mode_supported": 0,
"shaper_private_byte_mode_supported": 0,
"shaper_shared_n_max": 0,
"shaper_shared_packet_mode_supported": 0,
"shaper_shared_byte_mode_supported": 0,
"cman_wred_packet_mode_supported": 8,
"cman_wred_byte_mode_supported": 1,
"cman_head_drop_supported": 0,
"cman_wred_context_private_supported": 0,
"cman_wred_context_shared_n_max": 1,
"stats_mask": "0x0"
}
}
}
Signed-off-by: Jie Hai <haijie1@huawei.com>
---
lib/ethdev/rte_ethdev_telemetry.c | 168 ++++++++++++++++++++++++++++++
1 file changed, 168 insertions(+)
diff --git a/lib/ethdev/rte_ethdev_telemetry.c b/lib/ethdev/rte_ethdev_telemetry.c
index 02d23486806e..4a56685be426 100644
--- a/lib/ethdev/rte_ethdev_telemetry.c
+++ b/lib/ethdev/rte_ethdev_telemetry.c
@@ -1127,6 +1127,172 @@ eth_dev_handle_port_tm_caps(const char *cmd __rte_unused,
return 0;
}
+static void
+eth_dev_add_tm_level_basic_caps(struct rte_tel_data *d,
+ struct rte_tm_level_capabilities *cap)
+{
+ rte_tel_data_add_dict_uint(d, "n_nodes_max", cap->n_nodes_max);
+ rte_tel_data_add_dict_uint(d, "n_nodes_nonleaf_max",
+ cap->n_nodes_nonleaf_max);
+ rte_tel_data_add_dict_uint(d, "n_nodes_leaf_max", cap->n_nodes_leaf_max);
+ rte_tel_data_add_dict_int(d, "non_leaf_nodes_identical",
+ cap->non_leaf_nodes_identical);
+ rte_tel_data_add_dict_int(d, "leaf_nodes_identical",
+ cap->leaf_nodes_identical);
+}
+
+static void
+eth_dev_add_tm_level_nonleaf_caps(struct rte_tel_data *nonleaf,
+ struct rte_tm_level_capabilities *cap)
+{
+ rte_tel_data_add_dict_int(nonleaf, "shaper_private_supported",
+ cap->nonleaf.shaper_private_supported);
+ rte_tel_data_add_dict_int(nonleaf, "shaper_private_dual_rate_supported",
+ cap->nonleaf.shaper_private_dual_rate_supported);
+ rte_tel_data_add_dict_uint(nonleaf, "shaper_private_rate_min",
+ cap->nonleaf.shaper_private_rate_min);
+ rte_tel_data_add_dict_uint(nonleaf, "shaper_private_rate_max",
+ cap->nonleaf.shaper_private_rate_max);
+ rte_tel_data_add_dict_int(nonleaf, "shaper_private_packet_mode_supported",
+ cap->nonleaf.shaper_private_packet_mode_supported);
+ rte_tel_data_add_dict_int(nonleaf, "shaper_private_byte_mode_supported",
+ cap->nonleaf.shaper_private_byte_mode_supported);
+ rte_tel_data_add_dict_uint(nonleaf, "shaper_shared_n_max",
+ cap->nonleaf.shaper_shared_n_max);
+ rte_tel_data_add_dict_int(nonleaf, "shaper_shared_packet_mode_supported",
+ cap->nonleaf.shaper_shared_packet_mode_supported);
+ rte_tel_data_add_dict_int(nonleaf, "shaper_shared_byte_mode_supported",
+ cap->nonleaf.shaper_shared_byte_mode_supported);
+ rte_tel_data_add_dict_uint(nonleaf, "sched_n_children_max",
+ cap->nonleaf.sched_n_children_max);
+ rte_tel_data_add_dict_uint(nonleaf, "sched_sp_n_priorities_max",
+ cap->nonleaf.sched_sp_n_priorities_max);
+ rte_tel_data_add_dict_uint(nonleaf, "sched_wfq_n_children_per_group_max",
+ cap->nonleaf.sched_wfq_n_children_per_group_max);
+ rte_tel_data_add_dict_uint(nonleaf, "sched_wfq_n_groups_max",
+ cap->nonleaf.sched_wfq_n_groups_max);
+ rte_tel_data_add_dict_uint(nonleaf, "sched_wfq_weight_max",
+ cap->nonleaf.sched_wfq_weight_max);
+ rte_tel_data_add_dict_int(nonleaf, "sched_wfq_packet_mode_supported",
+ cap->nonleaf.sched_wfq_packet_mode_supported);
+ rte_tel_data_add_dict_int(nonleaf, "sched_wfq_byte_mode_supported",
+ cap->nonleaf.sched_wfq_byte_mode_supported);
+ rte_tel_data_add_dict_uint_hex(nonleaf, "stats_mask",
+ cap->nonleaf.stats_mask, 0);
+}
+
+static void
+eth_dev_add_tm_level_leaf_caps(struct rte_tel_data *leaf,
+ struct rte_tm_level_capabilities *cap)
+{
+ rte_tel_data_add_dict_int(leaf, "shaper_private_supported",
+ cap->leaf.shaper_private_supported);
+ rte_tel_data_add_dict_int(leaf, "shaper_private_dual_rate_supported",
+ cap->leaf.shaper_private_dual_rate_supported);
+ rte_tel_data_add_dict_uint(leaf, "shaper_private_rate_min",
+ cap->leaf.shaper_private_rate_min);
+ rte_tel_data_add_dict_uint(leaf, "shaper_private_rate_max",
+ cap->leaf.shaper_private_rate_max);
+ rte_tel_data_add_dict_int(leaf, "shaper_private_packet_mode_supported",
+ cap->leaf.shaper_private_packet_mode_supported);
+ rte_tel_data_add_dict_int(leaf, "shaper_private_byte_mode_supported",
+ cap->leaf.shaper_private_byte_mode_supported);
+ rte_tel_data_add_dict_uint(leaf, "shaper_shared_n_max",
+ cap->leaf.shaper_shared_n_max);
+ rte_tel_data_add_dict_int(leaf, "shaper_shared_packet_mode_supported",
+ cap->leaf.shaper_shared_packet_mode_supported);
+ rte_tel_data_add_dict_int(leaf, "shaper_shared_byte_mode_supported",
+ cap->leaf.shaper_shared_byte_mode_supported);
+ rte_tel_data_add_dict_int(leaf, "cman_wred_packet_mode_supported",
+ cap->leaf.cman_wred_packet_mode_supported);
+ rte_tel_data_add_dict_int(leaf, "cman_wred_byte_mode_supported",
+ cap->leaf.cman_wred_byte_mode_supported);
+ rte_tel_data_add_dict_int(leaf, "cman_head_drop_supported",
+ cap->leaf.cman_head_drop_supported);
+ rte_tel_data_add_dict_int(leaf, "cman_wred_context_private_supported",
+ cap->leaf.cman_wred_context_private_supported);
+ rte_tel_data_add_dict_uint(leaf, "cman_wred_context_shared_n_max",
+ cap->leaf.cman_wred_context_shared_n_max);
+ rte_tel_data_add_dict_uint_hex(leaf, "stats_mask",
+ cap->leaf.stats_mask, 0);
+}
+
+static int
+eth_dev_parse_tm_params(char *params, uint32_t *result)
+{
+ const char *splited_param;
+ uint64_t ret;
+
+ splited_param = strtok(params, ",");
+ if (!splited_param || strlen(splited_param) == 0 || !isdigit(*splited_param))
+ return -EINVAL;
+
+ ret = strtoul(splited_param, ¶ms, 0);
+ if (*params != '\0')
+ RTE_ETHDEV_LOG(NOTICE,
+ "Extra parameters passed to ethdev telemetry command, ignoring\n");
+
+ if (ret >= UINT32_MAX)
+ return -EINVAL;
+
+ *result = ret;
+ return 0;
+}
+
+static int
+eth_dev_handle_port_tm_level_caps(const char *cmd __rte_unused,
+ const char *params,
+ struct rte_tel_data *d)
+{
+ struct rte_tm_level_capabilities cap = {0};
+ struct rte_tm_error error = {0};
+ struct rte_tel_data *nonleaf;
+ struct rte_tel_data *leaf;
+ uint32_t level_id;
+ 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;
+
+ ret = eth_dev_parse_tm_params(end_param, &level_id);
+ if (ret != 0)
+ return ret;
+
+ ret = rte_tm_level_capabilities_get(port_id, level_id, &cap, &error);
+ if (ret != 0) {
+ RTE_ETHDEV_LOG(ERR, "error: %s, error type: %u\n",
+ error.message ? error.message : "no stated reason",
+ error.type);
+ return ret;
+ }
+
+ rte_tel_data_start_dict(d);
+ eth_dev_add_tm_level_basic_caps(d, &cap);
+
+ nonleaf = rte_tel_data_alloc();
+ if (nonleaf == NULL)
+ return -ENOMEM;
+
+ rte_tel_data_start_dict(nonleaf);
+ eth_dev_add_tm_level_nonleaf_caps(nonleaf, &cap);
+ rte_tel_data_add_dict_container(d, "nonleaf_cap", nonleaf, 0);
+
+ leaf = rte_tel_data_alloc();
+ if (leaf == NULL) {
+ rte_tel_data_free(nonleaf);
+ return -ENOMEM;
+ }
+
+ rte_tel_data_start_dict(leaf);
+ eth_dev_add_tm_level_leaf_caps(leaf, &cap);
+ rte_tel_data_add_dict_container(d, "leaf_cap", leaf, 0);
+
+ return 0;
+}
+
RTE_INIT(ethdev_init_telemetry)
{
rte_telemetry_register_cmd("/ethdev/list", eth_dev_handle_port_list,
@@ -1164,4 +1330,6 @@ RTE_INIT(ethdev_init_telemetry)
"Returns VLAN info for a port. Parameters: int port_id");
rte_telemetry_register_cmd("/ethdev/tm_capability", eth_dev_handle_port_tm_caps,
"Returns TM Capabilities info for a port. Parameters: int port_id");
+ rte_telemetry_register_cmd("/ethdev/tm_level_capability", eth_dev_handle_port_tm_level_caps,
+ "Returns TM Level Capabilities info for a port. Parameters: int port_id, int level_id (see tm_capability for the max)");
}
--
2.30.0
next prev parent reply other threads:[~2023-10-18 1:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 1:39 [PATCH 0/4] add telemetry commands for TM capabilities Jie Hai
2023-10-18 1:39 ` [PATCH 1/4] net/hns3: fix a typo Jie Hai
2023-10-18 11:32 ` lihuisong (C)
2023-10-27 6:20 ` Jie Hai
2023-10-18 1:39 ` [PATCH 2/4] ethdev: add telemetry command for TM capabilities Jie Hai
2023-10-18 1:39 ` Jie Hai [this message]
2023-10-18 1:39 ` [PATCH 4/4] ethdev: add telemetry command for TM node capabilities Jie Hai
2023-10-18 10:50 ` [PATCH 0/4] add telemetry commands for TM capabilities fengchengwen
2023-10-25 1:47 ` Jie Hai
2023-10-31 15:30 ` Ferruh Yigit
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=20231018013938.3830742-4-haijie1@huawei.com \
--to=haijie1@huawei.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=lihuisong@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).