On 6/7/2023 8:42 AM, Jie Hai wrote:
> This patch supports querying RSS info by telemetry command.
> The command is like:
> --> /ethdev/rss_info,0
> {
> "/ethdev/rss_info": {
> "rss_hf": "0x238c",
> "rss_key_len": 40,
> "rss_key": "6d5a56da255b0ec24167253d43a38fb0d0ca2b\
> cbae7b30b477cb2da38030f20c6a42b73bbeac01fa"
> }
> }
>
> Signed-off-by: Jie Hai <haij...@huawei.com>
> ---
> lib/ethdev/rte_ethdev_telemetry.c | 79 +++++++++++++++++++++++++++++++
> 1 file changed, 79 insertions(+)
>
> diff --git a/lib/ethdev/rte_ethdev_telemetry.c
> b/lib/ethdev/rte_ethdev_telemetry.c
> index d0d55993102b..d42901fe57b1 100644
> --- a/lib/ethdev/rte_ethdev_telemetry.c
> +++ b/lib/ethdev/rte_ethdev_telemetry.c
> @@ -706,6 +706,83 @@ eth_dev_handle_port_dcb(const char *cmd __rte_unused,
> return eth_dev_add_dcb_info(port_id, d);
> }
>
> +static int
> +eth_dev_add_rss_info(struct rte_eth_rss_conf *rss_conf, struct rte_tel_data
> *d)
> +{
> + const uint32_t key_len = rss_conf->rss_key_len * 2 + 1;
> + char *rss_key;
> + char *key;
> + uint32_t i;
> + int ret;
> +
> + key = malloc(key_len);
> + if (key == NULL)
> + return -ENOMEM;
> +
Key is to hold only char representation of single byte, so it doesn't
need this much space and no need to dynamically allocate/free small
space, hence updating in next-net as following:
```
diff --git a/lib/ethdev/rte_ethdev_telemetry.c
b/lib/ethdev/rte_ethdev_telemetry.c
index c64045cb1dad..f246a03e2966 100644
--- a/lib/ethdev/rte_ethdev_telemetry.c
+++ b/lib/ethdev/rte_ethdev_telemetry.c
@@ -723,19 +723,13 @@ eth_dev_add_rss_info(struct rte_eth_rss_conf
*rss_conf, struct rte_tel_data *d)
{
const uint32_t key_len = rss_conf->rss_key_len * 2 + 1;
char *rss_key;
- char *key;
+ char key[3]; /* FF\0 */
uint32_t i;
int ret;
- key = malloc(key_len);
- if (key == NULL)
- return -ENOMEM;
-
rss_key = malloc(key_len);
- if (rss_key == NULL) {
- ret = -ENOMEM;
- goto free_key;
- }
+ if (rss_key == NULL)
+ return -ENOMEM;
rte_tel_data_start_dict(d);
rte_tel_data_add_dict_uint_hex(d, "rss_hf", rss_conf->rss_hf, 0);
@@ -743,7 +737,7 @@ eth_dev_add_rss_info(struct rte_eth_rss_conf
*rss_conf, struct rte_tel_data *d)
memset(rss_key, 0, key_len);
for (i = 0; i < rss_conf->rss_key_len; i++) {
- ret = snprintf(key, key_len, "%02x",
rss_conf->rss_key[i]);
+ ret = snprintf(key, 3, "%02x", rss_conf->rss_key[i]);
if (ret < 0)
goto free_rss_key;
strlcat(rss_key, key, key_len);
@@ -752,8 +746,7 @@ eth_dev_add_rss_info(struct rte_eth_rss_conf
*rss_conf, struct rte_tel_data *d)
free_rss_key:
free(rss_key);
-free_key:
- free(key);
+
return ret;
}
```
> + rss_key = malloc(key_len);
> + if (rss_key == NULL) {
> + ret = -ENOMEM;
> + goto free_key;
> + }
> +
> + rte_tel_data_start_dict(d);
> + rte_tel_data_add_dict_uint_hex(d, "rss_hf", rss_conf->rss_hf, 0);
> + rte_tel_data_add_dict_uint(d, "rss_key_len", rss_conf->rss_key_len);
> +
> + memset(rss_key, 0, key_len);
> + for (i = 0; i < rss_conf->rss_key_len; i++) {
> + ret = snprintf(key, key_len, "%02x", rss_conf->rss_key[i]);
> + if (ret < 0)
> + goto free_rss_key;
> + strlcat(rss_key, key, key_len);
> + }
> + ret = rte_tel_data_add_dict_string(d, "rss_key", rss_key);
> +
> +free_rss_key:
> + free(rss_key);
> +free_key:
> + free(key);
> + return ret;
> +}
> +
> +static int
> +eth_dev_handle_port_rss_info(const char *cmd __rte_unused,
> + const char *params,
> + struct rte_tel_data *d)
> +{
> + struct rte_eth_dev_info dev_info;
> + struct rte_eth_rss_conf rss_conf;
> + uint16_t port_id;
> + char *end_param;
> + int ret;
> +
> + ret = eth_dev_parse_port_params(params, &port_id, &end_param, false);
> + if (ret < 0)
> + return ret;
> +
> + ret = rte_eth_dev_info_get(port_id, &dev_info);
> + if (ret != 0) {
> + RTE_ETHDEV_LOG(ERR,
> + "Failed to get device info, ret = %d\n", ret);
> + return ret;
> + }
> +
> + rss_conf.rss_key_len = dev_info.hash_key_size;
> + rss_conf.rss_key = malloc(dev_info.hash_key_size);
> + if (rss_conf.rss_key == NULL)
> + return -ENOMEM;
> +
This patch cause telemetry unit test failure, because some pmd's provide
'0' as 'dev_info.hash_key_size', hence updating as following which sets
key size as 40 if 'dev_info.hash_key_size' is 0:
```
@@ -764,6 +757,7 @@ eth_dev_handle_port_rss_info(const char *cmd
__rte_unused,
{
struct rte_eth_dev_info dev_info;
struct rte_eth_rss_conf rss_conf;
+ uint8_t key_len;
uint16_t port_id;
char *end_param;
int ret;
@@ -779,8 +773,9 @@ eth_dev_handle_port_rss_info(const char *cmd
__rte_unused,
return ret;
}
- rss_conf.rss_key_len = dev_info.hash_key_size;
- rss_conf.rss_key = malloc(dev_info.hash_key_size);
+ key_len = dev_info.hash_key_size ? dev_info.hash_key_size : 40;
+ rss_conf.rss_key_len = key_len;
+ rss_conf.rss_key = malloc(key_len);
if (rss_conf.rss_key == NULL)
return -ENOMEM;
```
> + ret = rte_eth_dev_rss_hash_conf_get(port_id, &rss_conf);
> + if (ret != 0) {
> + free(rss_conf.rss_key);
> + return ret;
> + }
> +
> + ret = eth_dev_add_rss_info(&rss_conf, d);
> + free(rss_conf.rss_key);
> + return ret;
> +}
> +
> RTE_INIT(ethdev_init_telemetry)
> {
> rte_telemetry_register_cmd("/ethdev/list", eth_dev_handle_port_list,
> @@ -735,4 +812,6 @@ RTE_INIT(ethdev_init_telemetry)
> "Returns Tx queue info for a port. Parameters: int
> port_id, int queue_id (Optional if only one queue)");
> rte_telemetry_register_cmd("/ethdev/dcb", eth_dev_handle_port_dcb,
> "Returns DCB info for a port. Parameters: int port_id");
> + rte_telemetry_register_cmd("/ethdev/rss_info",
> eth_dev_handle_port_rss_info,
> + "Returns RSS info for a port. Parameters: int port_id");
> }
