update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / examples / server_node_efd / server / init.c

diff --git a/ceph/src/spdk/dpdk/examples/server_node_efd/server/init.c b/ceph/src/spdk/dpdk/examples/server_node_efd/server/init.c
index af5a18e285d6021248ea65e8bb443df43efe6a00..378a74fa5c66b4718fa9f8b5152fb0fac110e282 100644 (file)
--- a/ceph/src/spdk/dpdk/examples/server_node_efd/server/init.c
+++ b/ceph/src/spdk/dpdk/examples/server_node_efd/server/init.c
@@ -111,7 +111,10 @@ init_port(uint16_t port_num)
        printf("Port %u init ... ", port_num);
        fflush(stdout);
 
-       rte_eth_dev_info_get(port_num, &dev_info);
+       retval = rte_eth_dev_info_get(port_num, &dev_info);
+       if (retval != 0)
+               return retval;
+
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                port_conf.txmode.offloads |=
                        DEV_TX_OFFLOAD_MBUF_FAST_FREE;
@@ -147,7 +150,9 @@ init_port(uint16_t port_num)
                        return retval;
        }
 
-       rte_eth_promiscuous_enable(port_num);
+       retval = rte_eth_promiscuous_enable(port_num);
+       if (retval != 0)
+               return retval;
 
        retval = rte_eth_dev_start(port_num);
        if (retval < 0)
@@ -241,6 +246,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
        uint8_t count, all_ports_up, print_flag = 0;
        uint16_t portid;
        struct rte_eth_link link;
+       int ret;
 
        printf("\nChecking link status");
        fflush(stdout);
@@ -250,7 +256,14 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
                        if ((port_mask & (1 << info->id[portid])) == 0)
                                continue;
                        memset(&link, 0, sizeof(link));
-                       rte_eth_link_get_nowait(info->id[portid], &link);
+                       ret = rte_eth_link_get_nowait(info->id[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)
@@ -259,7 +272,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
                                                info->id[portid],
                                                link.link_speed,
                                (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-                                       ("full-duplex") : ("half-duplex\n"));
+                                       ("full-duplex") : ("half-duplex"));
                                else
                                        printf("Port %d Link Down\n",
                                                info->id[portid]);