From patchwork Mon Dec 19 09:07:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 121031 X-Patchwork-Delegate: thomas@monjalon.net 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 4C18CA00C5; Mon, 19 Dec 2022 10:14:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 269C54114B; Mon, 19 Dec 2022 10:14:06 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id EE9AC40146 for ; Mon, 19 Dec 2022 10:14:03 +0100 (CET) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NbDRk64FyzqT3V; Mon, 19 Dec 2022 17:09:38 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 19 Dec 2022 17:14:01 +0800 From: Chengwen Feng To: , , CC: , , , Subject: [PATCH v5 1/5] dmadev: support stats reset telemetry command Date: Mon, 19 Dec 2022 09:07:19 +0000 Message-ID: <20221219090723.29356-2-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221219090723.29356-1-fengchengwen@huawei.com> References: <20221219090723.29356-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) 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 The stats reset is useful for debugging, so add it to the dmadev telemetry command lists. Signed-off-by: Chengwen Feng --- lib/dmadev/rte_dmadev.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c index 4da653eec7..93e15d4972 100644 --- a/lib/dmadev/rte_dmadev.c +++ b/lib/dmadev/rte_dmadev.c @@ -994,6 +994,44 @@ dmadev_handle_dev_stats(const char *cmd __rte_unused, return 0; } +static int +dmadev_handle_dev_stats_reset(const char *cmd __rte_unused, + const char *params, + struct rte_tel_data *d __rte_unused) +{ + struct rte_dma_info dma_info; + int dev_id, ret, vchan_id; + const char *vchan_param; + char *end_param; + + if (params == NULL || strlen(params) == 0 || !isdigit(*params)) + return -EINVAL; + + dev_id = strtoul(params, &end_param, 0); + + /* Function info_get validates dev_id so we don't need to. */ + ret = rte_dma_info_get(dev_id, &dma_info); + if (ret < 0) + return -EINVAL; + + /* If the device has one vchan the user does not need to supply the + * vchan id and only the device id is needed, no extra parameters. + */ + if (dma_info.nb_vchans == 1 && *end_param == '\0') + vchan_id = 0; + else { + vchan_param = strtok(end_param, ","); + if (!vchan_param || strlen(vchan_param) == 0 || !isdigit(*vchan_param)) + return -EINVAL; + + vchan_id = strtoul(vchan_param, &end_param, 0); + } + if (*end_param != '\0') + RTE_DMA_LOG(WARNING, "Extra parameters passed to dmadev telemetry command, ignoring"); + + return rte_dma_stats_reset(dev_id, vchan_id); +} + #ifndef RTE_EXEC_ENV_WINDOWS static int dmadev_handle_dev_dump(const char *cmd __rte_unused, @@ -1041,6 +1079,8 @@ RTE_INIT(dmadev_init_telemetry) "Returns information for a dmadev. Parameters: int dev_id"); rte_telemetry_register_cmd("/dmadev/stats", dmadev_handle_dev_stats, "Returns the stats for a dmadev vchannel. Parameters: int dev_id, vchan_id (Optional if only one vchannel)"); + rte_telemetry_register_cmd("/dmadev/stats_reset", dmadev_handle_dev_stats_reset, + "Reset the stats for a dmadev vchannel. Parameters: int dev_id, vchan_id (Optional if only one vchannel)"); #ifndef RTE_EXEC_ENV_WINDOWS rte_telemetry_register_cmd("/dmadev/dump", dmadev_handle_dev_dump, "Returns dump information for a dmadev. Parameters: int dev_id"); From patchwork Mon Dec 19 09:07:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 121032 X-Patchwork-Delegate: thomas@monjalon.net 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 67BE1A00C5; Mon, 19 Dec 2022 10:14:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EBA442D12; Mon, 19 Dec 2022 10:14:07 +0100 (CET) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 1E8F140685 for ; Mon, 19 Dec 2022 10:14:04 +0100 (CET) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NbDWf73CGzJqbW; Mon, 19 Dec 2022 17:13:02 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 19 Dec 2022 17:14:01 +0800 From: Chengwen Feng To: , , CC: , , , Subject: [PATCH v5 2/5] telemetry: fix repeated display when callback don't set dict Date: Mon, 19 Dec 2022 09:07:20 +0000 Message-ID: <20221219090723.29356-3-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221219090723.29356-1-fengchengwen@huawei.com> References: <20221219090723.29356-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) 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 When telemetry callback didn't set dict and return a non-negative number, the telemetry will repeat to display the last result. Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality") Cc: stable@dpdk.org Signed-off-by: Chengwen Feng --- lib/telemetry/telemetry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c index 8fbb4f3060..a6c84e3499 100644 --- a/lib/telemetry/telemetry.c +++ b/lib/telemetry/telemetry.c @@ -334,8 +334,10 @@ static void perform_command(telemetry_cb fn, const char *cmd, const char *param, int s) { struct rte_tel_data data; + int ret; - int ret = fn(cmd, param, &data); + rte_tel_data_start_dict(&data); + ret = fn(cmd, param, &data); if (ret < 0) { char out_buf[MAX_CMD_LEN + 10]; int used = snprintf(out_buf, sizeof(out_buf), "{\"%.*s\":null}", From patchwork Mon Dec 19 09:07:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 121033 X-Patchwork-Delegate: thomas@monjalon.net 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 3F774A00C5; Mon, 19 Dec 2022 10:14:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED23B42D1F; Mon, 19 Dec 2022 10:14:07 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 571A640A7A for ; Mon, 19 Dec 2022 10:14:05 +0100 (CET) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NbDRl19ZWzqT6t; Mon, 19 Dec 2022 17:09:39 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 19 Dec 2022 17:14:01 +0800 From: Chengwen Feng To: , , CC: , , , Subject: [PATCH v5 3/5] ethdev: support xstats reset telemetry command Date: Mon, 19 Dec 2022 09:07:21 +0000 Message-ID: <20221219090723.29356-4-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221219090723.29356-1-fengchengwen@huawei.com> References: <20221219090723.29356-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) 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 The xstats reset is useful for debugging, so add it to the ethdev telemetry command lists. Signed-off-by: Chengwen Feng --- lib/ethdev/rte_ethdev.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 5d5e18db1e..0774de81b0 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -5915,6 +5915,27 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused, return 0; } +static int +eth_dev_handle_port_xstats_reset(const char *cmd __rte_unused, + const char *params, + struct rte_tel_data *d __rte_unused) +{ + char *end_param; + int port_id; + + if (params == NULL || strlen(params) == 0 || !isdigit(*params)) + return -1; + + 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 (!rte_eth_dev_is_valid_port(port_id)) + return -1; + + return rte_eth_xstats_reset(port_id); +} + #ifndef RTE_EXEC_ENV_WINDOWS static int eth_dev_handle_port_dump_priv(const char *cmd __rte_unused, @@ -6328,6 +6349,8 @@ RTE_INIT(ethdev_init_telemetry) "Returns the common stats for a port. Parameters: int port_id"); rte_telemetry_register_cmd("/ethdev/xstats", eth_dev_handle_port_xstats, "Returns the extended stats for a port. Parameters: int port_id"); + rte_telemetry_register_cmd("/ethdev/xstats_reset", eth_dev_handle_port_xstats_reset, + "Reset the extended stats for a port. Parameters: int port_id"); #ifndef RTE_EXEC_ENV_WINDOWS rte_telemetry_register_cmd("/ethdev/dump_priv", eth_dev_handle_port_dump_priv, "Returns dump private information for a port. Parameters: int port_id"); From patchwork Mon Dec 19 09:07:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 121035 X-Patchwork-Delegate: thomas@monjalon.net 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 38D4DA00C5; Mon, 19 Dec 2022 10:14:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD31742D27; Mon, 19 Dec 2022 10:14:09 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 6B85040A7A for ; Mon, 19 Dec 2022 10:14:05 +0100 (CET) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NbDRl2HRLzqTDZ; Mon, 19 Dec 2022 17:09:39 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 19 Dec 2022 17:14:01 +0800 From: Chengwen Feng To: , , CC: , , , Subject: [PATCH v5 4/5] ethdev: telemetry xstats support hide zero Date: Mon, 19 Dec 2022 09:07:22 +0000 Message-ID: <20221219090723.29356-5-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221219090723.29356-1-fengchengwen@huawei.com> References: <20221219090723.29356-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) 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 The number of xstats may be large, after the hide zero option is added, only non-zero values can be displayed. Signed-off-by: Chengwen Feng --- lib/ethdev/rte_ethdev.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 0774de81b0..2075086eeb 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -5870,20 +5870,33 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused, { struct rte_eth_xstat *eth_xstats; struct rte_eth_xstat_name *xstat_names; + char *end_param, *hide_param; int port_id, num_xstats; + int hide_zero = 0; int i, ret; - char *end_param; if (params == NULL || strlen(params) == 0 || !isdigit(*params)) return -1; port_id = strtoul(params, &end_param, 0); - if (*end_param != '\0') - RTE_ETHDEV_LOG(NOTICE, - "Extra parameters passed to ethdev telemetry command, ignoring"); if (!rte_eth_dev_is_valid_port(port_id)) return -1; + if (*end_param != '\0') { + hide_param = strtok(end_param, ","); + if (!hide_param || strlen(hide_param) == 0 || !isdigit(*hide_param)) + return -EINVAL; + hide_zero = strtoul(hide_param, &end_param, 0); + if (*end_param != '\0') + RTE_ETHDEV_LOG(NOTICE, + "Extra parameters passed to ethdev telemetry command, ignoring\n"); + if (hide_zero != 0 && hide_zero != 1) { + hide_zero = !!hide_zero; + RTE_ETHDEV_LOG(NOTICE, + "Hide zero parameter is non-boolean, cast to boolean\n"); + } + } + num_xstats = rte_eth_xstats_get(port_id, NULL, 0); if (num_xstats < 0) return -1; @@ -5908,9 +5921,12 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused, } rte_tel_data_start_dict(d); - for (i = 0; i < num_xstats; i++) + for (i = 0; i < num_xstats; i++) { + if (hide_zero && eth_xstats[i].value == 0) + continue; rte_tel_data_add_dict_u64(d, xstat_names[i].name, eth_xstats[i].value); + } free(eth_xstats); return 0; } @@ -6348,7 +6364,7 @@ RTE_INIT(ethdev_init_telemetry) rte_telemetry_register_cmd("/ethdev/stats", eth_dev_handle_port_stats, "Returns the common stats for a port. Parameters: int port_id"); rte_telemetry_register_cmd("/ethdev/xstats", eth_dev_handle_port_xstats, - "Returns the extended stats for a port. Parameters: int port_id"); + "Returns the extended stats for a port. Parameters: int port_id, hide_zero (Optional, specify whether to hide zero values)"); rte_telemetry_register_cmd("/ethdev/xstats_reset", eth_dev_handle_port_xstats_reset, "Reset the extended stats for a port. Parameters: int port_id"); #ifndef RTE_EXEC_ENV_WINDOWS From patchwork Mon Dec 19 09:07:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 121034 X-Patchwork-Delegate: thomas@monjalon.net 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 BBE1AA00C5; Mon, 19 Dec 2022 10:14:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D4B3642D22; Mon, 19 Dec 2022 10:14:08 +0100 (CET) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id C61DD40A7A for ; Mon, 19 Dec 2022 10:14:05 +0100 (CET) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NbDWY2lg1z16LjH; Mon, 19 Dec 2022 17:12:57 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 19 Dec 2022 17:14:01 +0800 From: Chengwen Feng To: , , CC: , , , Subject: [PATCH v5 5/5] ethdev: add newline to telemetry log string Date: Mon, 19 Dec 2022 09:07:23 +0000 Message-ID: <20221219090723.29356-6-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221219090723.29356-1-fengchengwen@huawei.com> References: <20221219090723.29356-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) 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 The telemetry related code may invoke RTE_ETHDEV_LOG to display information, the newline character is not added automatically to the RTE_ETHDEV_LOG, therefore, the newline character must be explicitly added to the log string. Cc: stable@dpdk.org Signed-off-by: Chengwen Feng --- lib/ethdev/rte_ethdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 2075086eeb..30f79b7d4c 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -5968,7 +5968,7 @@ eth_dev_handle_port_dump_priv(const char *cmd __rte_unused, port_id = strtoul(params, &end_param, 0); if (*end_param != '\0') RTE_ETHDEV_LOG(NOTICE, - "Extra parameters passed to ethdev telemetry command, ignoring"); + "Extra parameters passed to ethdev telemetry command, ignoring\n"); if (!rte_eth_dev_is_valid_port(port_id)) return -EINVAL; @@ -6010,7 +6010,7 @@ eth_dev_handle_port_link_status(const char *cmd __rte_unused, port_id = strtoul(params, &end_param, 0); if (*end_param != '\0') RTE_ETHDEV_LOG(NOTICE, - "Extra parameters passed to ethdev telemetry command, ignoring"); + "Extra parameters passed to ethdev telemetry command, ignoring\n"); if (!rte_eth_dev_is_valid_port(port_id)) return -1; @@ -6048,7 +6048,7 @@ eth_dev_handle_port_info(const char *cmd __rte_unused, port_id = strtoul(params, &end_param, 0); if (*end_param != '\0') RTE_ETHDEV_LOG(NOTICE, - "Extra parameters passed to ethdev telemetry command, ignoring"); + "Extra parameters passed to ethdev telemetry command, ignoring\n"); if (!rte_eth_dev_is_valid_port(port_id)) return -EINVAL;