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 C73A5A04B5; Thu, 10 Sep 2020 21:34:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B5B811C0D8; Thu, 10 Sep 2020 21:34:24 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 8197D1C10B for ; Thu, 10 Sep 2020 21:34:23 +0200 (CEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200910193422euoutp018b1698b895ed20d44695a4ea7b03b048~zgx9DyhzH0325703257euoutp01E; Thu, 10 Sep 2020 19:34:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200910193422euoutp018b1698b895ed20d44695a4ea7b03b048~zgx9DyhzH0325703257euoutp01E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1599766463; bh=A2PTzi/6QAPdj31SukY6WaSzyjFhYitbEDWVAQoenkE=; h=From:To:Subject:Date:In-Reply-To:Reply-To:References:From; b=Braw16v7rzUhLCmncofKKN7JrWSWfQ5y+3iRhiqOFosKEcHUb2uvXdzmjpCdrTKqM EsbkqmWeP/wKEU88tXHWrL6kigKaRNLm2Qc9WlFY/buCpjFYGgHsU+VYKkDo0Jlmak qpHoIvMDC7RdYuAkuJ+aPtVlRiPL2Sb6seUoNjdE= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200910193421eucas1p12453e58dece4bdfcb70ac43f978817d0~zgx8CAKrp0435804358eucas1p1C; Thu, 10 Sep 2020 19:34:21 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 98.0D.06456.DBF7A5F5; Thu, 10 Sep 2020 20:34:21 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200910193420eucas1p1c7ed662be24a6fbc8e272dadefbbb22f~zgx64WU4D0308403084eucas1p1n; Thu, 10 Sep 2020 19:34:20 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200910193420eusmtrp14c07ffaa1ffaad08c872d8188a6086ae~zgx63gWya3165331653eusmtrp1u; Thu, 10 Sep 2020 19:34:20 +0000 (GMT) X-AuditID: cbfec7f2-7efff70000001938-80-5f5a7fbd9d91 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 16.8A.06017.CBF7A5F5; Thu, 10 Sep 2020 20:34:20 +0100 (BST) Received: from idyukov.rnd.samsung.ru (unknown [106.109.129.29]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200910193418eusmtip2378bf4cf96e38dacd375a04475582bf0~zgx5GNrOU1654016540eusmtip27; Thu, 10 Sep 2020 19:34:18 +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: Thu, 10 Sep 2020 22:33:36 +0300 Message-Id: <20200910193400.15326-4-i.dyukov@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910193400.15326-1-i.dyukov@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA0WSb0xTZxTGd+69vffS2O1aNJ44h7OJizP8kWCWM1nEsS25S/ywD/tEAqzO m2qkxfQCk2XZCDPIKjKsxE1wlYkTLCiiLa0EXC2ZRQtjgERYoKLBEdhArZBNh9soF7Nvz/md 55znfd+8Imt08mvFvbYCxW4z55l4Pdd2/UlfUucXWblbmr1J1NLjAroXqWdpvHqMp8MPDzI0 7M6gDt9JHTnvlDBU6XzEkK/RwdMf46UczUZ9DI12hgWqGSgVKBqcFOhIXy3Q5MI0SyfqHgP1 ubw6enKtnacHC6c5qnw6BPS1pxsoVPGIo+orfqAyh0QPzzUIVD+aQNHxbo7CI5cFap7vZ8nb 8wzoaKgFqLfsX92ODfLTuh90cn3HFCMf+76fla+PHBfkihsuRm6d9TPyg6tDvFzpcYN8895h Vm6a+Iv/QJ+lf2u3kre3SLGnbP9Iv+fgwHnd/ur0Axc6AmwJeJIdIIoobcWfzmQ6IE40So2A g79+7gD9op4D9EYWOK14DOjsivDPB0K1L2m8AbDr1LegFfOAwze/YmKreGkThstdTKyxSmrl 0bdwe6kRL+3EyPQFIaY5aSP2TjSyMW2Q3sTwxOySB6X12HQxwMbS4qRteHc0WzteAt4+Nbe0 E6VbIpb3BAXN/y66e47wmo7H6ZBnma/D8LEKThs4BHi07bKgFVWAX9bOLLsy0PP7z0IsjZVe x5b2FA2/jd39tzjtyi/i8MzKGGYXpbPtG1bDBiwvM2puEwZuDCxjxGd/r9CwjGOuNp32Pp2A 1WNNUAXra/7PqgNwwxqlULVaFDXVpnySrJqtaqHNkvxxvvUSLP7U8D+hqB/mB3YFQRLBtMIQ 2JaVa9SZi9RiaxBQZE2rDJm94RyjYbe5+FPFnp9rL8xT1CC8LHKmNYa001PZRsliLlD2Kcp+ xf68y4hxa0ugZl/O9p2rN4K7PW31Bl/loM7S8ELgvV+EEyuzpj4TLbVq1Y7B/L5rOV7rprP8 0Pxvg3z2q5ku61WxueuN+OOJRZ7h7+571TtTacXr4i022/l3dt1vZf0pc6WtSTkzBeU8Jk4e 8L//p/G1VyLR9IzE3pPclg+3dqaO/MjFHbpbkpBu4tQ95tTNrF01/weLqbuIpQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrCIsWRmVeSWpSXmKPExsVy+t/xe7p76qPiDS7MUbRYf2Yeo8Wje4uZ LR5Muctm0f2hhcnixip7iz3b57BaTLrfwGTRN+kjk8X2FV1sFm8eNLFYvPu0ncnizt7T7Baz LjWxW3w69Jzdovf8bEaL539eMVvMXPCZ0eL8vK2sFj8P7mKzeP9nEYtF36+rjBb9W04wWhzv +chiMWXnDkaLti4Biw8rl7NbLL4jZ/HpwQkWi9M3N7NbrPl6kdli65m/jBYTj69ntDjb9p/V QdHj14KlrB6L97xk8pi88CKzx7Gb09g9ek7OY/LY+G4Hk8f7fVfZPPq2rGL0OPWom9lj9ZMf bAFcUXo2RfmlJakKGfnFJbZK0YYWRnqGlhZ6RiaWeobG5rFWRqZK+nY2Kak5mWWpRfp2CXoZ LZfWshZMsa5Yt+cAcwPjFr0uRg4OCQETieOz+bsYuTiEBJYySkz7Op0FIi4h8foJcxcjJ5Ap LPHnWhcbRM1nRonfr66zgCTYBDQkTnfMYwJJiAjcZpO43N4IlhAW8JG492odO4jNIqAqcfbJ CrBJvAKWEqefvGOCmCovsXrDAWaQZZwCVhIP78SChIUEMiXmnfnGCmHLSVyf/4VpAiPfAkaG VYwiqaXFuem5xUZ6xYm5xaV56XrJ+bmbGIExvu3Yzy07GLveBR9iFOBgVOLhPWAVFS/EmlhW XJl7iFGCg1lJhNfp7Ok4Id6UxMqq1KL8+KLSnNTiQ4ymQPdNZJYSTc4Hpp+8knhDU0NzC0tD c2NzYzMLJXHeDoGDMUIC6YklqdmpqQWpRTB9TBycUg2MScVnnJ5aZod3VqU1Vq7bWvm7Wctg qsCyovq6u4Kxxik2clfdDj86698oONX8hYyRc3fM1HW9/74++C/t+/nKz531zLtlmH4V3u7w Xidustz6D7/V5628nHUikw76l9190iYbUKS+NGJD9auksqfTEjW2qlx+udUup82wZI+K8rJU yy01DR5KLMUZiYZazEXFiQD1egDYBwMAAA== X-CMS-MailID: 20200910193420eucas1p1c7ed662be24a6fbc8e272dadefbbb22f X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20200910193420eucas1p1c7ed662be24a6fbc8e272dadefbbb22f X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200910193420eucas1p1c7ed662be24a6fbc8e272dadefbbb22f References: <20200427095737.11082-1-i.dyukov@samsung.com> <20200910193400.15326-1-i.dyukov@samsung.com> Subject: [dpdk-dev] [PATCH v10 03/24] app: update apps&docs with new UNKNOWN link speed 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_to_str function to example applications and docs Signed-off-by: Ivan Dyukov --- app/proc-info/main.c | 11 +++++------ app/test-pipeline/init.c | 11 +++++------ app/test-pmd/config.c | 9 +++++---- app/test-pmd/testpmd.c | 12 ++++-------- app/test/test_pmd_perf.c | 17 +++++++---------- doc/guides/sample_app_ug/link_status_intr.rst | 10 +++++----- 6 files changed, 31 insertions(+), 39 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index abeca4aab..0b030d326 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -672,6 +672,7 @@ show_port(void) struct rte_eth_dev_info dev_info; struct rte_eth_rxq_info queue_info; struct rte_eth_rss_conf rss_conf; + char link_status_text[RTE_ETH_LINK_MAX_STR_LEN]; memset(&rss_conf, 0, sizeof(rss_conf)); @@ -685,12 +686,10 @@ 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_to_str(link_status_text, + sizeof(link_status_text), + &link); + printf("\t%s\n", link_status_text); } 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..fe37d6373 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[RTE_ETH_LINK_MAX_STR_LEN]; 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_to_str(link_status_text, sizeof(link_status_text), + &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..f814de29c 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -605,7 +605,7 @@ port_infos_display(portid_t port_id) 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 speed: %s\n", rte_eth_link_speed_to_str(link.link_speed)); printf("Link duplex: %s\n", (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? ("full-duplex") : ("half-duplex")); @@ -750,12 +750,12 @@ port_summary_display(portid_t port_id) if (ret != 0) return; - printf("%-4d %02X:%02X:%02X:%02X:%02X:%02X %-12s %-14s %-8s %uMbps\n", + printf("%-4d %02X:%02X:%02X:%02X:%02X:%02X %-12s %-14s %-8s %s\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); + rte_eth_link_speed_to_str(link.link_speed)); } void @@ -3899,7 +3899,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..e996e2b75 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2991,6 +2991,7 @@ check_all_ports_link_status(uint32_t port_mask) uint8_t count, all_ports_up, print_flag = 0; struct rte_eth_link link; int ret; + char link_status[RTE_ETH_LINK_MAX_STR_LEN]; printf("Checking link statuses...\n"); fflush(stdout); @@ -3010,14 +3011,9 @@ 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_to_str(link_status, + sizeof(link_status), &link); + printf("Port %d %s\n", portid, link_status); 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..d1240b76f 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[RTE_ETH_LINK_MAX_STR_LEN]; 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_to_str(link_status, + sizeof(link_status), &link); + printf("Port %d %s\n", portid, link_status); continue; } /* clear all_ports_up flag if any link down */ diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index 04c40f285..1057c7584 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -158,6 +158,7 @@ An example callback function that has been written as indicated below. { struct rte_eth_link link; int ret; + char link_status[RTE_ETH_LINK_MAX_STR_LEN]; RTE_SET_USED(param); @@ -169,11 +170,10 @@ An example callback function that has been written as indicated below. if (ret < 0) { printf("Failed to get port %d link status: %s\n\n", port_id, rte_strerror(-ret)); - } else if (link.link_status) { - printf("Port %d Link Up - speed %u Mbps - %s\n\n", port_id, (unsigned)link.link_speed, - (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? ("full-duplex") : ("half-duplex")); - } else - printf("Port %d Link Down\n\n", port_id); + } else { + rte_eth_link_to_str(link_status, sizeof(link_status), &link); + printf("Port %d %s\n", port_id, link_status); + } } This function is called when a link status interrupt is present for the right port. -- 2.17.1