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 1146AA04B7; Wed, 14 Oct 2020 15:30:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 17B881DDFE; Wed, 14 Oct 2020 15:29:25 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id B92431DDB3 for ; Wed, 14 Oct 2020 15:29:17 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.150]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 5A101200AE; Wed, 14 Oct 2020 13:29:16 +0000 (UTC) Received: from us4-mdac16-3.at1.mdlocal (unknown [10.110.49.149]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 576A6800AD; Wed, 14 Oct 2020 13:29:16 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.49.103]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id B0F8A100071; Wed, 14 Oct 2020 13:29:15 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 729F8980079; Wed, 14 Oct 2020 13:29:15 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 14 Oct 2020 14:29:12 +0100 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 14 Oct 2020 14:29:12 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 09EDTB6C009143; Wed, 14 Oct 2020 14:29:12 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 68F1B1613AB; Wed, 14 Oct 2020 14:29:12 +0100 (BST) From: Andrew Rybchenko To: Harry van Haaren , Ori Kam , Bruce Richardson , Radu Nicolau , Akhil Goyal , Ferruh Yigit , Sunil Kumar Kori , "Pavan Nikhilesh" , Jerin Jacob , Kiran Kumar K , Nithin Dabilpuram , David Hunt CC: , Ivan Ilchenko Date: Wed, 14 Oct 2020 14:28:59 +0100 Message-ID: <1602682146-4722-5-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1602682146-4722-1-git-send-email-arybchenko@solarflare.com> References: <1602682146-4722-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.6.1012-25724.003 X-TM-AS-Result: No-1.587400-8.000000-10 X-TMASE-MatchedRID: tSbNnqEiYYHRlxaUc/KTYX4neC0h7SAD3V4UShoTXad+SLLtNOiBhhOv qWE4CGBUQ0ew+orY3L24HGCfl+dhoCHhSBQfglfsA9lly13c/gHpVMb1xnESMsnZhDdFIXZEOho 7xiBfL+dWqgnWQ924PCyCUGDXD74mbwFT1cZHxCHBe89zsi5D0NnLANiJ9J62T7zqZowzdpLSJJ cbp1Y+W8zub46theXNlup21Q6iopbcQUtYchmLP3V7tdtvoibawuIWIvQEbW7fc2Xd6VJ+ykTq5 x6JKmWROV0mD06qoXzvK3TBvg+vxe1KuqFSI2Ku+CjwEqX1p7kx/k92L7R8tkoPLn6eZ90+jG76 DvZqHwE7OJE/RLyfLuXcvHH+KGk9Q9tg+p38ZonHmyDJSEsI25yqUJ2uHKFAKBVvFbsUM5WSDdw 9v34fhC5Oh8YnEjIhgDLqnrRlXrZ8nn9tnqel2MZW5ai5WKlykrMXDgtoYrdRTufIbxRU/jhruI tukMy/TWkuGEI2K2m50N7mpEhr6SVF9Qp6e+qgwp07mfZ1DXpDtnTUorEyNAdh57FSns3r8Oycc FNBL2TKhETi2//sjuP9Cb59K8ACZrS+A8PszW/U9h9N881NSQ== X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--1.587400-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25724.003 X-MDID: 1602682156-0Gbl6edffxuP X-PPE-DISP: 1602682156;0Gbl6edffxuP Subject: [dpdk-dev] [PATCH 04/11] examples: check eth dev stop status X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Ivan Ilchenko rte_eth_dev_stop() return value was changed from void to int, so this patch modify usage of this function across examples according to new return type. Signed-off-by: Ivan Ilchenko Signed-off-by: Andrew Rybchenko --- examples/ethtool/lib/rte_ethtool.c | 17 ++++++++++------- examples/eventdev_pipeline/main.c | 3 ++- examples/flow_filtering/main.c | 12 +++++++----- examples/ioat/ioatfwd.c | 5 ++++- examples/ipsec-secgw/event_helper.c | 7 ++++++- examples/ipsec-secgw/ipsec-secgw.c | 6 +++++- examples/kni/main.c | 28 +++++++++++++++++++++++----- examples/l2fwd-event/main.c | 10 ++++++++-- examples/l2fwd/main.c | 5 ++++- examples/l3fwd-graph/main.c | 6 +++++- examples/l3fwd-power/main.c | 6 +++++- examples/l3fwd/main.c | 10 ++++++++-- 12 files changed, 87 insertions(+), 28 deletions(-) diff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c index db8150efd5..78321b32ee 100644 --- a/examples/ethtool/lib/rte_ethtool.c +++ b/examples/ethtool/lib/rte_ethtool.c @@ -297,7 +297,11 @@ rte_ethtool_set_pauseparam(uint16_t port_id, int rte_ethtool_net_open(uint16_t port_id) { - rte_eth_dev_stop(port_id); + int ret; + + ret = rte_eth_dev_stop(port_id); + if (ret != 0) + return ret; return rte_eth_dev_start(port_id); } @@ -305,10 +309,7 @@ rte_ethtool_net_open(uint16_t port_id) int rte_ethtool_net_stop(uint16_t port_id) { - RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); - rte_eth_dev_stop(port_id); - - return 0; + return rte_eth_dev_stop(port_id); } int @@ -450,7 +451,7 @@ rte_ethtool_set_ringparam(uint16_t port_id, struct ethtool_ringparam *ring_param) { struct rte_eth_rxq_info rx_qinfo; - int stat; + int stat, ret; if (ring_param == NULL) return -EINVAL; @@ -459,7 +460,9 @@ rte_ethtool_set_ringparam(uint16_t port_id, if (stat != 0) return stat; - rte_eth_dev_stop(port_id); + ret = rte_eth_dev_stop(port_id); + if (ret != 0) + return ret; stat = rte_eth_tx_queue_setup(port_id, 0, ring_param->tx_pending, rte_socket_id(), NULL); diff --git a/examples/eventdev_pipeline/main.c b/examples/eventdev_pipeline/main.c index 4ac5821539..597540c3d6 100644 --- a/examples/eventdev_pipeline/main.c +++ b/examples/eventdev_pipeline/main.c @@ -296,7 +296,8 @@ signal_handler(int signum) RTE_ETH_FOREACH_DEV(portid) { rte_event_eth_rx_adapter_stop(portid); rte_event_eth_tx_adapter_stop(portid); - rte_eth_dev_stop(portid); + if (rte_eth_dev_stop(portid) < 0) + printf("Failed to stop port %u", portid); } rte_eal_mp_wait_lcore(); diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c index cc9e7e7808..a92a4aa04e 100644 --- a/examples/flow_filtering/main.c +++ b/examples/flow_filtering/main.c @@ -52,7 +52,7 @@ print_ether_addr(const char *what, struct rte_ether_addr *eth_addr) printf("%s%s", what, buf); } -static void +static int main_loop(void) { struct rte_mbuf *mbufs[32]; @@ -61,6 +61,7 @@ main_loop(void) uint16_t nb_rx; uint16_t i; uint16_t j; + int ret; while (!force_quit) { for (i = 0; i < nr_queues; i++) { @@ -88,8 +89,11 @@ main_loop(void) /* closing and releasing resources */ rte_flow_flush(port_id, &error); - rte_eth_dev_stop(port_id); + ret = rte_eth_dev_stop(port_id); + if (ret < 0) + printf("Failed to stop port %u", port_id); rte_eth_dev_close(port_id); + return ret; } #define CHECK_INTERVAL 1000 /* 100ms */ @@ -254,7 +258,5 @@ main(int argc, char **argv) rte_exit(EXIT_FAILURE, "error in creating flow"); } - main_loop(); - - return 0; + return main_loop(); } diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c index 8cf606e25b..73edb5da27 100644 --- a/examples/ioat/ioatfwd.c +++ b/examples/ioat/ioatfwd.c @@ -995,7 +995,10 @@ main(int argc, char **argv) uint32_t j; for (i = 0; i < cfg.nb_ports; i++) { printf("Closing port %d\n", cfg.ports[i].rxtx_port); - rte_eth_dev_stop(cfg.ports[i].rxtx_port); + ret = rte_eth_dev_stop(cfg.ports[i].rxtx_port); + if (ret != 0) + rte_exit(EXIT_FAILURE, "rte_eth_dev_stop: err=%s, port=%d\n", + rte_strerror(-ret), cfg.ports[i].rxtx_port); rte_eth_dev_close(cfg.ports[i].rxtx_port); if (copy_mode == COPY_MODE_IOAT_NUM) { for (j = 0; j < cfg.ports[i].nb_queues; j++) { diff --git a/examples/ipsec-secgw/event_helper.c b/examples/ipsec-secgw/event_helper.c index 865dc911b8..ce4dbdc085 100644 --- a/examples/ipsec-secgw/event_helper.c +++ b/examples/ipsec-secgw/event_helper.c @@ -1583,7 +1583,12 @@ eh_devs_init(struct eh_conf *conf) if ((conf->eth_portmask & (1 << port_id)) == 0) continue; - rte_eth_dev_stop(port_id); + ret = rte_eth_dev_stop(port_id); + if (ret != 0) { + EH_LOG_ERR("Failed to stop port %u, err: %d", + port_id, ret); + return ret; + } } /* Setup eventdev */ diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index 60132c4bd7..d83d9d8d5d 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -3032,7 +3032,11 @@ main(int32_t argc, char **argv) " for port %u, err msg: %s\n", portid, err.message); } - rte_eth_dev_stop(portid); + ret = rte_eth_dev_stop(portid); + if (ret != 0) + rte_exit(EXIT_FAILURE, "rte_eth_dev_stop: err=%s, port=%d\n", + rte_strerror(-ret), portid); + rte_eth_dev_close(portid); printf(" Done\n"); } diff --git a/examples/kni/main.c b/examples/kni/main.c index 2223bd367d..4998111d2c 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c @@ -782,7 +782,11 @@ kni_change_mtu_(uint16_t port_id, unsigned int new_mtu) RTE_LOG(INFO, APP, "Change MTU of port %d to %u\n", port_id, new_mtu); /* Stop specific port */ - rte_eth_dev_stop(port_id); + ret = rte_eth_dev_stop(port_id); + if (ret != 0) { + RTE_LOG(ERR, APP, "Failed to stop port %d\n", port_id); + return ret; + } memcpy(&conf, &port_conf, sizeof(conf)); /* Set new MTU */ @@ -875,10 +879,19 @@ kni_config_network_interface(uint16_t port_id, uint8_t if_up) rte_atomic32_inc(&kni_pause); if (if_up != 0) { /* Configure network interface up */ - rte_eth_dev_stop(port_id); + ret = rte_eth_dev_stop(port_id); + if (ret != 0) { + RTE_LOG(ERR, APP, "Failed to stop port %d\n", port_id); + return ret; + } ret = rte_eth_dev_start(port_id); - } else /* Configure network interface down */ - rte_eth_dev_stop(port_id); + } else { /* Configure network interface down */ + ret = rte_eth_dev_stop(port_id); + if (ret != 0) { + RTE_LOG(ERR, APP, "Failed to stop port %d\n", port_id); + return ret; + } + } rte_atomic32_dec(&kni_pause); @@ -998,6 +1011,7 @@ static int kni_free_kni(uint16_t port_id) { uint8_t i; + int ret; struct kni_port_params **p = kni_port_params_array; if (port_id >= RTE_MAX_ETHPORTS || !p[port_id]) @@ -1008,7 +1022,11 @@ kni_free_kni(uint16_t port_id) printf("Fail to release kni\n"); p[port_id]->kni[i] = NULL; } - rte_eth_dev_stop(port_id); + ret = rte_eth_dev_stop(port_id); + if (ret != 0) { + RTE_LOG(ERR, APP, "Failed to stop port %d\n", port_id); + return ret; + } return 0; } diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c index 9f831b1266..ed60240083 100644 --- a/examples/l2fwd-event/main.c +++ b/examples/l2fwd-event/main.c @@ -683,7 +683,10 @@ main(int argc, char **argv) if ((rsrc->enabled_port_mask & (1 << port_id)) == 0) continue; - rte_eth_dev_stop(port_id); + ret = rte_eth_dev_stop(port_id); + if (ret < 0) + rte_panic("rte_eth_dev_stop:err=%d, port=%u\n", + ret, port_id); } rte_eal_mp_wait_lcore(); @@ -705,7 +708,10 @@ main(int argc, char **argv) (1 << port_id)) == 0) continue; printf("Closing port %d...", port_id); - rte_eth_dev_stop(port_id); + ret = rte_eth_dev_stop(port_id); + if (ret < 0) + rte_panic("rte_eth_dev_stop:err=%d, port=%u\n", + ret, port_id); rte_eth_dev_close(port_id); printf(" Done\n"); } diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 7e3078788e..8d6c7ec237 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -896,7 +896,10 @@ main(int argc, char **argv) if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) continue; printf("Closing port %d...", portid); - rte_eth_dev_stop(portid); + ret = rte_eth_dev_stop(portid); + if (ret != 0) + rte_exit(EXIT_FAILURE, "rte_eth_dev_stop: err=%d, port=%d\n", + ret, portid); rte_eth_dev_close(portid); printf(" Done\n"); } diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c index 2306ba9b07..fbe680aa5d 100644 --- a/examples/l3fwd-graph/main.c +++ b/examples/l3fwd-graph/main.c @@ -1116,7 +1116,11 @@ main(int argc, char **argv) if ((enabled_port_mask & (1 << portid)) == 0) continue; printf("Closing port %d...", portid); - rte_eth_dev_stop(portid); + ret = rte_eth_dev_stop(portid); + if (ret != 0) { + printf("Failed to stop port %u: %s\n", + portid, rte_strerror(-ret)); + } rte_eth_dev_close(portid); printf(" Done\n"); } diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index d0e6c9bd77..b1535b2749 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -2805,7 +2805,11 @@ main(int argc, char **argv) if ((enabled_port_mask & (1 << portid)) == 0) continue; - rte_eth_dev_stop(portid); + ret = rte_eth_dev_stop(portid); + if (ret != 0) + RTE_LOG(ERR, L3FWD_POWER, "rte_eth_dev_stop: err=%d, port=%u\n", + ret, portid); + rte_eth_dev_close(portid); } diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 80f3434ec2..9094cbc4e2 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -1284,7 +1284,10 @@ main(int argc, char **argv) RTE_ETH_FOREACH_DEV(portid) { if ((enabled_port_mask & (1 << portid)) == 0) continue; - rte_eth_dev_stop(portid); + ret = rte_eth_dev_stop(portid); + if (ret != 0) + printf("rte_eth_dev_stop: err=%d, port=%u\n", + ret, portid); } rte_eal_mp_wait_lcore(); @@ -1304,7 +1307,10 @@ main(int argc, char **argv) if ((enabled_port_mask & (1 << portid)) == 0) continue; printf("Closing port %d...", portid); - rte_eth_dev_stop(portid); + ret = rte_eth_dev_stop(portid); + if (ret != 0) + printf("rte_eth_dev_stop: err=%d, port=%u\n", + ret, portid); rte_eth_dev_close(portid); printf(" Done\n"); } -- 2.17.1