From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 861BFA00C5; Mon, 6 Jul 2020 22:38:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A59501DD43; Mon, 6 Jul 2020 22:38:03 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id E818F1DD2C for ; Mon, 6 Jul 2020 22:38:02 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200706203802euoutp0138ac6abdbee56d26f02cc75dab862232~fREsoTkWW0553305533euoutp01f; Mon, 6 Jul 2020 20:38:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200706203802euoutp0138ac6abdbee56d26f02cc75dab862232~fREsoTkWW0553305533euoutp01f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1594067882; bh=xmD2mOfSPYEySXTKCkIqMp30Ohht0MjEUFipNVMWweQ=; h=From:To:Subject:Date:In-Reply-To:Reply-To:References:From; b=u0yAn/PDAezN5scMI8Hst/BOqBJGMRJDDaapmczWoJBho/RrFnnzJHMB/ycpBr+xB Q1nirR6M0bWlZIvvTlvT2RW+XluhK9k6NulJp0e8C54oPeOMjBd+LYyaOxQbwo/m1F BB0dTQZSukZSH2TfivtgwEXd4YDtTn2+IhL9sn68= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200706203801eucas1p11f4722e39a78de870354e407bc480a6c~fRErmgyrR0771107711eucas1p1n; Mon, 6 Jul 2020 20:38:01 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 63.C9.05997.9AB830F5; Mon, 6 Jul 2020 21:38:01 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200706203800eucas1p2e1cb90a305258ac2a02fb5de8abc03cb~fREqUe9uK2121221212eucas1p2z; Mon, 6 Jul 2020 20:38:00 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200706203800eusmtrp2166d799390963ac5a295ca5efce96d76~fREqTdSvK0640206402eusmtrp2p; Mon, 6 Jul 2020 20:38:00 +0000 (GMT) X-AuditID: cbfec7f4-677ff7000000176d-a6-5f038ba9c642 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 61.7E.06017.8AB830F5; Mon, 6 Jul 2020 21:38:00 +0100 (BST) Received: from idyukov.rnd.samsung.ru (unknown [106.109.129.29]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200706203758eusmtip1b17497f360182a942e58171c8d362d30~fREob5DxL1791017910eusmtip1i; Mon, 6 Jul 2020 20:37:58 +0000 (GMT) From: Ivan Dyukov To: dev@dpdk.org, i.dyukov@samsung.com, v.kuramshin@samsung.com, thomas@monjalon.net, david.marchand@redhat.com, ferruh.yigit@intel.com, arybchenko@solarflare.com, wei.zhao1@intel.com, jia.guo@intel.com, beilei.xing@intel.com, qiming.yang@intel.com, wenzhuo.lu@intel.com, mb@smartsharesystems.com, stephen@networkplumber.org, nicolas.chautru@intel.com, bruce.richardson@intel.com, konstantin.ananyev@intel.com, cristian.dumitrescu@intel.com, radu.nicolau@intel.com, akhil.goyal@nxp.com, declan.doherty@intel.com, skori@marvell.com, pbhagavatula@marvell.com, jerinj@marvell.com, kirankumark@marvell.com, david.hunt@intel.com, anatoly.burakov@intel.com, xiaoyun.li@intel.com, jingjing.wu@intel.com, john.mcnamara@intel.com, jasvinder.singh@intel.com, byron.marohn@intel.com, yipeng1.wang@intel.com Date: Mon, 6 Jul 2020 23:37:17 +0300 Message-Id: <20200706203743.29416-4-i.dyukov@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200706203743.29416-1-i.dyukov@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA0VSa0xbZRj2PV97zqGheOxIeMW5xWaaTSPTqcmrWYa3H0cTM36YeInK6nZk U9otPTB3M+IULJeBFpwbk8uKk8tmGNAV6EC2JqOwMubQpWAQyEIkXdnGgE1Btkp7WPz3fM/l e558+URmKuWTxW22LMVus2SaeYPO0z3X/2R9IUt/ynftYWrsqwS6MlLDaKzsT54Kp77iaLAh lTpaf9CTczSHo2LnTY5a6wp4mhzbr6Pr060cDXcGBCof2C/QtG9CoAMXjwBNLFxldLh6Buhi 5Sk9zZ318nRjwaWj4vnLQCXuHiB/0U0dlbW3AeUVSDRVXytQzfAKmh7r0VFgqEWgE7cuMTrV dwfoW38j0IW8iP7FR+T56mN6uaYjxMmlRy8xuXvooCAX9VZyctP1Nk6+8ctlXi52N4B8/koh k4+P/8OnGd41rN+iZG7bqdjXbthk2NpyLsx2lKXsCg3WQw7cXlUAcSJKz+IXQ3+xAjCIJqkO MHwoV4gKJmkW8Oi4rAkzgM3fuYR7ia6KEtCEWsCprhFOO9wCPF3hjbl4aTUGHJUxIVFq4rF1 IchFhWXSBpxpicSwTnoU/+hojwWM0vM42eXSaxUr8fjJM4ujRDFOegErziVrk1ZgsGo2didK v4pYG/59yf8q/jhdxWt4GV71u5emLsdIexWn4b34d3NQ0MIOwBFX7pIpFd3hfiFaxqQ12Ohd q9EvYWlvE0RplBJw8NoDUZotQqfne6bRRnTkmTS3Gc/0DizRiHf+jddoGZ2Tc4L2PJ2Ad4Mn 2Dewsvz/rmqABkhSslVrhqKusymfpqgWq5pty0jZvN3aDItfNXDXP9sG3oUPfSCJYI43OniW btJbdqq7rT5AkZkTjS9fCHxgMm6x7N6j2Len27MzFdUHD4k6c5LxGVfofZOUYclSPlGUHYr9 nsqJcck5YPh4tNxxrO/1konQpu5Xxu93tNh69iZ8Lbd3DpXtMhnT3KH+I2+dHH1TDf989nDu nvmBjLonUuPXee7b+Njpt5e/k7zev+/2RyPVB79kqqd3/idv22/v1UTy82caXxtI21hefH6y KN+z742ErNTCA4mRpOecxjWrOqzDXOLqzz97MEibvWadutXy9OPMrlr+A/naeDWmAwAA X-Brightmail-Tracker: H4sIAAAAAAAAAzWSe0hTcRTH+917d++UVpe56IfYw1UQgatNzTPR9YK8f4kWRPTSpbcpOSf3 bqVCpFJm0zTLgl5mmmVWmDpTwzQNs1omVpZmlo3KSpmvlCx7bEn/fTjf7znnC+dISfk45S2N TzTzQqI+QUl7UvbfbX1+Zdlk1KqfHyVQ8aQQgeNtCQn9BX00ZI8cIqC7fA001J6XwIl3aQTk nhgloLbMSsNQfwYFzrFaAt7ctTNw9lkGA2MtAwwc6ziHYGD6KwlnisYRdBTWSGCq+Q4Nw9PF FOT+6EKQZ3uIoC1nlIKC+joEmVYWRq5dZaDkzUIY639Igb2nmoEbE50k1Dz5hSC/rQJBe+Yf yVpf7kdRqYQrafhCcCcvdZLcg57TDJfzqJDgKp11BDfc2EVzubZyxD12ZJPc9Q/f6QjPbaoQ wWQx84vjTKI5VLldDRqVWgsqTYBWpfYP2hmsCVSu1IXE8gnx+3hhpS5aFVfdOkgmFaiSv3Rf Q2locqkVeUgxG4CbLuQhN8vZUoSr0sKsSOqqYzz4gZyxeOHpl1baijxdlnGEu/ryCbdAs8ux PauQcAsKtpfGz4+kU27Bi9Xh8eo//0wUuwy/bqhn3CxjtXioqVgyM3URvn7rHule5sEG4wut 3m6Us/H49TdmJs5C/OriN+I4mlOEZpUjBW8RjQajqFGJeqNoSTSoYkzGKuQ6+O0HU7Y6ZHVu bkGsFClny7JoMkou0e8TU4wtCEtJpUK2vt2+Sy6L1aek8oIpSrAk8GILCnTFyye958WYXO+T aI5SB6qDQKsO8g/yXw3K+bIstnmHnDXozfxenk/ihf99hNTDOw1t0aU6fGKfLt0uO95sWLXR YUkXFLVtvhu2bM0jwi7bGgcmfHw3OQ8X8Ytj/MIfV0Z+HpjamHlwd+flT37hi5Z03S+VvpjM Xze0v/fG4I4rB0S6IiV0rn5P5Puy2Kqv8SlHiyNsyryG1Mbed1nMqZsLdFXDOsGZvN8jWhFJ yUzp5holJcbp1StIQdT/BQ8mMRQGAwAA X-CMS-MailID: 20200706203800eucas1p2e1cb90a305258ac2a02fb5de8abc03cb X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20200706203800eucas1p2e1cb90a305258ac2a02fb5de8abc03cb X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200706203800eucas1p2e1cb90a305258ac2a02fb5de8abc03cb References: <20200427095737.11082-1-i.dyukov@samsung.com> <20200706203743.29416-1-i.dyukov@samsung.com> Subject: [dpdk-dev] [PATCH v6 03/25] app: UNKNOWN link speed print format X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: i.dyukov@samsung.com List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add usage of rte_eth_link_strf function to example applications Signed-off-by: Ivan Dyukov --- app/proc-info/main.c | 9 +++------ app/test-pipeline/init.c | 11 +++++------ app/test-pmd/config.c | 20 ++++++++++++-------- app/test-pmd/testpmd.c | 9 +-------- app/test/test_pmd_perf.c | 17 +++++++---------- 5 files changed, 28 insertions(+), 38 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index abeca4aab..4a4c572c3 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -685,12 +685,9 @@ show_port(void) printf("Link get failed (port %u): %s\n", i, rte_strerror(-ret)); } else { - printf("\t -- link speed %d duplex %d," - " auto neg %d status %d\n", - link.link_speed, - link.link_duplex, - link.link_autoneg, - link.link_status); + rte_eth_link_printf("\t -- link speed: %M, duplex: %D," + " auto neg: %A, status: %S\n", + &link); } printf("\t -- promiscuous (%d)\n", rte_eth_promiscuous_get(i)); diff --git a/app/test-pipeline/init.c b/app/test-pipeline/init.c index 67d54ae05..b59064672 100644 --- a/app/test-pipeline/init.c +++ b/app/test-pipeline/init.c @@ -155,7 +155,7 @@ static void app_ports_check_link(void) { uint32_t all_ports_up, i; - + char link_status_text[50]; all_ports_up = 1; for (i = 0; i < app.n_ports; i++) { @@ -173,12 +173,11 @@ app_ports_check_link(void) all_ports_up = 0; continue; } - - RTE_LOG(INFO, USER1, "Port %u (%u Gbps) %s\n", + rte_eth_link_strf(link_status_text, 50, "(%G Gbps) %S", + &link); + RTE_LOG(INFO, USER1, "Port %u %s\n", port, - link.link_speed / 1000, - link.link_status ? "UP" : "DOWN"); - + link_status_text); if (link.link_status == ETH_LINK_DOWN) all_ports_up = 0; } diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index a7112c998..cb2795a94 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -604,10 +604,9 @@ port_infos_display(portid_t port_id) } else printf("\nmemory allocation on the socket: %u",port->socket_id); - printf("\nLink status: %s\n", (link.link_status) ? ("up") : ("down")); - printf("Link speed: %u Mbps\n", (unsigned) link.link_speed); - printf("Link duplex: %s\n", (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex")); + rte_eth_link_printf("\nLink status: %S\n" + "Link speed: %M Mbps\n" + "Link duplex: %D\n", &link); if (!rte_eth_dev_get_mtu(port_id, &mtu)) printf("MTU: %u\n", mtu); @@ -730,6 +729,8 @@ port_summary_display(portid_t port_id) struct rte_eth_link link; struct rte_eth_dev_info dev_info; char name[RTE_ETH_NAME_MAX_LEN]; + char status_text[6]; + char speed_text[12]; int ret; if (port_id_is_invalid(port_id, ENABLED_WARN)) { @@ -750,12 +751,14 @@ port_summary_display(portid_t port_id) if (ret != 0) return; - printf("%-4d %02X:%02X:%02X:%02X:%02X:%02X %-12s %-14s %-8s %uMbps\n", + rte_eth_link_strf(status_text, 6, "%S", &link); + rte_eth_link_strf(speed_text, 12, "%M", &link); + printf("%-4d %02X:%02X:%02X:%02X:%02X:%02X %-12s %-14s %-8s %sMbps\n", port_id, mac_addr.addr_bytes[0], mac_addr.addr_bytes[1], mac_addr.addr_bytes[2], mac_addr.addr_bytes[3], mac_addr.addr_bytes[4], mac_addr.addr_bytes[5], name, - dev_info.driver_name, (link.link_status) ? ("up") : ("down"), - (unsigned int) link.link_speed); + dev_info.driver_name, status_text, + speed_text); } void @@ -3899,7 +3902,8 @@ set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint16_t rate) ret = eth_link_get_nowait_print_err(port_id, &link); if (ret < 0) return 1; - if (rate > link.link_speed) { + if (link.link_speed != ETH_SPEED_NUM_UNKNOWN && + rate > link.link_speed) { printf("Invalid rate value:%u bigger than link speed: %u\n", rate, link.link_speed); return 1; diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 4989d22ca..a1b9c1c1c 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -3010,14 +3010,7 @@ check_all_ports_link_status(uint32_t port_mask) } /* print link status if flag set */ if (print_flag == 1) { - if (link.link_status) - printf( - "Port%d Link Up. speed %u Mbps- %s\n", - portid, link.link_speed, - (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex")); - else - printf("Port %d Link Down\n", portid); + rte_eth_link_printf(NULL, &link); continue; } /* clear all_ports_up flag if any link down */ diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c index 352cd4715..7ebe4efae 100644 --- a/app/test/test_pmd_perf.c +++ b/app/test/test_pmd_perf.c @@ -126,6 +126,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) uint8_t count, all_ports_up, print_flag = 0; struct rte_eth_link link; int ret; + char link_status[50]; printf("Checking link statuses...\n"); fflush(stdout); @@ -146,16 +147,12 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) /* print link status if flag set */ if (print_flag == 1) { - if (link.link_status) { - printf( - "Port%d Link Up. Speed %u Mbps - %s\n", - portid, link.link_speed, - (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex")); - if (link_mbps == 0) - link_mbps = link.link_speed; - } else - printf("Port %d Link Down\n", portid); + if (link.link_status && link_mbps == 0) + link_mbps = link.link_speed; + + rte_eth_link_strf(link_status, 50, NULL, + &link); + printf("Port %d %s\n", portid, link_status); continue; } /* clear all_ports_up flag if any link down */ -- 2.17.1