[dpdk-dev] [PATCH 08/18] app/test: check status of getting link info
Andrew Rybchenko
arybchenko at solarflare.com
Tue Sep 10 10:25:48 CEST 2019
From: Igor Romanov <igor.romanov at oktetlabs.ru>
The return value of rte_eth_link_get() and rte_eth_link_get_nowait()
was changed from void to int. Update the usage of the functions
according to the new return type.
Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
app/test/test_link_bonding.c | 12 ++++++++++--
app/test/test_pmd_perf.c | 11 ++++++++++-
app/test/test_pmd_ring.c | 8 +++++++-
3 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index cbbbc98a1..d0d6fc23d 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -554,6 +554,7 @@ test_start_bonded_device(void)
int current_slave_count, current_bonding_mode, primary_port;
uint16_t slaves[RTE_MAX_ETHPORTS];
+ int retval;
/* Add slave to bonded device*/
TEST_ASSERT_SUCCESS(test_add_slave_to_bonded_device(),
@@ -590,7 +591,10 @@ test_start_bonded_device(void)
"Primary port (%d) is not expected value (%d).",
primary_port, test_params->slave_port_ids[0]);
- rte_eth_link_get(test_params->bonded_port_id, &link_status);
+ retval = rte_eth_link_get(test_params->bonded_port_id, &link_status);
+ TEST_ASSERT(retval >= 0,
+ "Bonded port (%d) link get failed: %s\n",
+ test_params->bonded_port_id, rte_strerror(-retval));
TEST_ASSERT_EQUAL(link_status.link_status, 1,
"Bonded port (%d) status (%d) is not expected value (%d).\n",
test_params->bonded_port_id, link_status.link_status, 1);
@@ -605,10 +609,14 @@ test_stop_bonded_device(void)
uint16_t slaves[RTE_MAX_ETHPORTS];
struct rte_eth_link link_status;
+ int retval;
rte_eth_dev_stop(test_params->bonded_port_id);
- rte_eth_link_get(test_params->bonded_port_id, &link_status);
+ retval = rte_eth_link_get(test_params->bonded_port_id, &link_status);
+ TEST_ASSERT(retval >= 0,
+ "Bonded port (%d) link get failed: %s\n",
+ test_params->bonded_port_id, rte_strerror(-retval));
TEST_ASSERT_EQUAL(link_status.link_status, 0,
"Bonded port (%d) status (%d) is not expected value (%d).",
test_params->bonded_port_id, link_status.link_status, 0);
diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c
index 85ef11899..36b06ce5d 100644
--- a/app/test/test_pmd_perf.c
+++ b/app/test/test_pmd_perf.c
@@ -125,6 +125,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
uint16_t portid;
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
+ int ret;
printf("Checking link statuses...\n");
fflush(stdout);
@@ -134,7 +135,15 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
if ((port_mask & (1 << portid)) == 0)
continue;
memset(&link, 0, sizeof(link));
- rte_eth_link_get_nowait(portid, &link);
+ ret = rte_eth_link_get_nowait(portid, &link);
+ if (ret < 0) {
+ all_ports_up = 0;
+ if (print_flag == 1)
+ printf("Port %u link get failed: %s\n",
+ portid, rte_strerror(-ret));
+ continue;
+ }
+
/* print link status if flag set */
if (print_flag == 1) {
if (link.link_status) {
diff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c
index 65ab6e7e0..02873f26a 100644
--- a/app/test/test_pmd_ring.c
+++ b/app/test/test_pmd_ring.c
@@ -24,6 +24,7 @@ test_ethdev_configure_port(int port)
{
struct rte_eth_conf null_conf;
struct rte_eth_link link;
+ int ret;
memset(&null_conf, 0, sizeof(struct rte_eth_conf));
@@ -54,7 +55,12 @@ test_ethdev_configure_port(int port)
return -1;
}
- rte_eth_link_get(port, &link);
+ ret = rte_eth_link_get(port, &link);
+ if (ret < 0) {
+ printf("Link get failed for port %u: %s",
+ port, rte_strerror(-ret));
+ return -1;
+ }
return 0;
}
--
2.17.1
More information about the dev
mailing list