examples/bond: fix crash when there is no active slave
authorRadu Nicolau <radu.nicolau@intel.com>
Wed, 14 Nov 2018 12:19:09 +0000 (12:19 +0000)
committerFerruh Yigit <ferruh.yigit@intel.com>
Thu, 13 Dec 2018 16:32:10 +0000 (16:32 +0000)
If bond_ethdev_rx_burst() called more times with no active slaves
the active slave index will point out of bounds, resulting in a
segfault.
The configured slaves needs to be checked, and if none became active
there is no point going further.

Do not start the packet processing threads until all configured
slaves become active.

Fixes: cc7e8ae84faa ("examples/bond: add example application for link bonding mode 6")
Cc: stable@dpdk.org
Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
Acked-by: Chas Williams <chas3@att.com>
examples/bond/main.c

index 65f3c39..ef86194 100644 (file)
@@ -220,6 +220,7 @@ bond_port_init(struct rte_mempool *mbuf_pool)
        struct rte_eth_rxconf rxq_conf;
        struct rte_eth_txconf txq_conf;
        struct rte_eth_conf local_port_conf = port_conf;
+       uint16_t wait_counter = 20;
 
        retval = rte_eth_bond_create("net_bonding0", BONDING_MODE_ALB,
                        0 /*SOCKET_ID_ANY*/);
@@ -274,6 +275,20 @@ bond_port_init(struct rte_mempool *mbuf_pool)
        if (retval < 0)
                rte_exit(retval, "Start port %d failed (res=%d)", BOND_PORT, retval);
 
+       printf("Waiting for slaves to become active...");
+       while (wait_counter) {
+               uint16_t act_slaves[16] = {0};
+               if (rte_eth_bond_active_slaves_get(BOND_PORT, act_slaves, 16) ==
+                               slaves_count) {
+                       printf("\n");
+                       break;
+               }
+               sleep(1);
+               printf("...");
+               if (--wait_counter == 0)
+                       rte_exit(-1, "\nFailed to activate slaves\n");
+       }
+
        rte_eth_promiscuous_enable(BOND_PORT);
 
        struct ether_addr addr;