examples: remove auto-generation of examples list

[dpdk.git] / examples / bond / main.c

diff --git a/examples/bond/main.c b/examples/bond/main.c
index 01e5eda..ef86194 100644 (file)
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -91,8 +91,8 @@
 /*
  * Configurable number of RX/TX ring descriptors
  */
-#define RTE_RX_DESC_DEFAULT 128
-#define RTE_TX_DESC_DEFAULT 512
+#define RTE_RX_DESC_DEFAULT 1024
+#define RTE_TX_DESC_DEFAULT 1024
 
 #define BOND_IP_1      7
 #define BOND_IP_2      0
@@ -122,8 +122,6 @@ static struct rte_eth_conf port_conf = {
                .mq_mode = ETH_MQ_RX_NONE,
                .max_rx_pkt_len = ETHER_MAX_LEN,
                .split_hdr_size = 0,
-               .ignore_offload_bitfield = 1,
-               .offloads = DEV_RX_OFFLOAD_CRC_STRIP,
        },
        .rx_adv_conf = {
                .rss_conf = {
@@ -147,13 +145,25 @@ slave_port_init(uint16_t portid, struct rte_mempool *mbuf_pool)
        struct rte_eth_txconf txq_conf;
        struct rte_eth_conf local_port_conf = port_conf;
 
-       if (portid >= rte_eth_dev_count())
+       if (!rte_eth_dev_is_valid_port(portid))
                rte_exit(EXIT_FAILURE, "Invalid port\n");
 
        rte_eth_dev_info_get(portid, &dev_info);
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                local_port_conf.txmode.offloads |=
                        DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+
+       local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
+               dev_info.flow_type_rss_offloads;
+       if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
+                       port_conf.rx_adv_conf.rss_conf.rss_hf) {
+               printf("Port %u modified RSS hash function based on hardware support,"
+                       "requested:%#"PRIx64" configured:%#"PRIx64"\n",
+                       portid,
+                       port_conf.rx_adv_conf.rss_conf.rss_hf,
+                       local_port_conf.rx_adv_conf.rss_conf.rss_hf);
+       }
+
        retval = rte_eth_dev_configure(portid, 1, 1, &local_port_conf);
        if (retval != 0)
                rte_exit(EXIT_FAILURE, "port %u: configuration failed (res=%d)\n",
@@ -177,7 +187,6 @@ slave_port_init(uint16_t portid, struct rte_mempool *mbuf_pool)
 
        /* TX setup */
        txq_conf = dev_info.default_txconf;
-       txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
        txq_conf.offloads = local_port_conf.txmode.offloads;
        retval = rte_eth_tx_queue_setup(portid, 0, nb_txd,
                                rte_eth_dev_socket_id(portid), &txq_conf);
@@ -211,8 +220,9 @@ 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("bond0", BONDING_MODE_ALB,
+       retval = rte_eth_bond_create("net_bonding0", BONDING_MODE_ALB,
                        0 /*SOCKET_ID_ANY*/);
        if (retval < 0)
                rte_exit(EXIT_FAILURE,
@@ -234,6 +244,13 @@ bond_port_init(struct rte_mempool *mbuf_pool)
                rte_exit(EXIT_FAILURE, "port %u: rte_eth_dev_adjust_nb_rx_tx_desc "
                                "failed (res=%d)\n", BOND_PORT, retval);
 
+       for (i = 0; i < slaves_count; i++) {
+               if (rte_eth_bond_slave_add(BOND_PORT, slaves[i]) == -1)
+                       rte_exit(-1, "Oooops! adding slave (%u) to bond (%u) failed!\n",
+                                       slaves[i], BOND_PORT);
+
+       }
+
        /* RX setup */
        rxq_conf = dev_info.default_rxconf;
        rxq_conf.offloads = local_port_conf.rxmode.offloads;
@@ -246,7 +263,6 @@ bond_port_init(struct rte_mempool *mbuf_pool)
 
        /* TX setup */
        txq_conf = dev_info.default_txconf;
-       txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
        txq_conf.offloads = local_port_conf.txmode.offloads;
        retval = rte_eth_tx_queue_setup(BOND_PORT, 0, nb_txd,
                                rte_eth_dev_socket_id(BOND_PORT), &txq_conf);
@@ -255,17 +271,24 @@ bond_port_init(struct rte_mempool *mbuf_pool)
                rte_exit(retval, "port %u: TX queue 0 setup failed (res=%d)",
                                BOND_PORT, retval);
 
-       for (i = 0; i < slaves_count; i++) {
-               if (rte_eth_bond_slave_add(BOND_PORT, slaves[i]) == -1)
-                       rte_exit(-1, "Oooops! adding slave (%u) to bond (%u) failed!\n",
-                                       slaves[i], BOND_PORT);
-
-       }
-
        retval  = rte_eth_dev_start(BOND_PORT);
        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;
@@ -441,6 +464,11 @@ static void cmd_obj_send_parsed(void *parsed_result,
                                (BOND_IP_3 << 16) | (BOND_IP_4 << 24);
 
        created_pkt = rte_pktmbuf_alloc(mbuf_pool);
+       if (created_pkt == NULL) {
+               cmdline_printf(cl, "Failed to allocate mbuf\n");
+               return;
+       }
+
        pkt_size = sizeof(struct ether_hdr) + sizeof(struct arp_hdr);
        created_pkt->data_len = pkt_size;
        created_pkt->pkt_len = pkt_size;
@@ -733,17 +761,17 @@ int
 main(int argc, char *argv[])
 {
        int ret;
-       uint8_t nb_ports, i;
+       uint16_t nb_ports, i;
 
        /* init EAL */
        ret = rte_eal_init(argc, argv);
-       rte_eal_devargs_dump(stdout);
+       rte_devargs_dump(stdout);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Error with EAL initialization\n");
        argc -= ret;
        argv += ret;
 
-       nb_ports = rte_eth_dev_count();
+       nb_ports = rte_eth_dev_count_avail();
        if (nb_ports == 0)
                rte_exit(EXIT_FAILURE, "Give at least one port\n");
        else if (nb_ports > MAX_PORTS)
@@ -756,7 +784,7 @@ main(int argc, char *argv[])
 
        /* initialize all ports */
        slaves_count = nb_ports;
-       for (i = 0; i < nb_ports; i++) {
+       RTE_ETH_FOREACH_DEV(i) {
                slave_port_init(i, mbuf_pool);
                slaves[i] = i;
        }