From patchwork Tue May 30 09:05:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Hai X-Patchwork-Id: 127696 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 3CACD42BE1; Tue, 30 May 2023 11:08:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8DA5B42D48; Tue, 30 May 2023 11:07:49 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id A131F406BC for ; Tue, 30 May 2023 11:07:43 +0200 (CEST) Received: from kwepemi500020.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QVmdN43GFzqTQr; Tue, 30 May 2023 17:03:04 +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:42 +0800 From: Jie Hai To: Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko CC: , Subject: [PATCH 08/10] ethdev: support telemetry query RSS info Date: Tue, 30 May 2023 17:05:08 +0800 Message-ID: <20230530090510.56812-9-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 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 --- lib/ethdev/rte_ethdev.c | 86 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index dad9c5538149..6699b40d5e15 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -7432,6 +7432,90 @@ 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 = rte_malloc(NULL, key_len, 0); + if (key == NULL) + return -ENOMEM; + + rss_key = rte_malloc(NULL, key_len, 0); + 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: + rte_free(rss_key); +free_key: + rte_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; + unsigned long port_id; + char *end_param; + int ret; + + if (params == NULL || strlen(params) == 0 || !isdigit(*params)) + return -EINVAL; + + port_id = strtoul(params, &end_param, 0); + if (*end_param != '\0') + RTE_ETHDEV_LOG(NOTICE, + "Extra parameters passed to ethdev telemetry command, ignoring\n"); + + if (port_id >= UINT16_MAX || !rte_eth_dev_is_valid_port(port_id)) + return -EINVAL; + + 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 = rte_malloc(NULL, dev_info.hash_key_size, 0); + if (rss_conf.rss_key == NULL) + return -ENOMEM; + + ret = rte_eth_dev_rss_hash_conf_get(port_id, &rss_conf); + if (ret != 0) { + rte_free(rss_conf.rss_key); + return ret; + } + + ret = eth_dev_add_rss_info(&rss_conf, d); + rte_free(rss_conf.rss_key); + return ret; +} + RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO); RTE_INIT(ethdev_init_telemetry) @@ -7463,4 +7547,6 @@ RTE_INIT(ethdev_init_telemetry) "Returns Tx queue info for a port. Parameters: unsigned port_id, unsigned 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: unsigned port_id"); + rte_telemetry_register_cmd("/ethdev/rss_info", eth_dev_handle_port_rss_info, + "Returns RSS info for a port. Parameters: unsigned port_id"); }