examples: remove duplicate includes
[dpdk.git] / examples / load_balancer / init.c
index 2f00a70..717232e 100644 (file)
@@ -48,9 +48,7 @@
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
-#include <rte_per_lcore.h>
 #include <rte_launch.h>
 #include <rte_atomic.h>
 #include <rte_cycles.h>
@@ -82,7 +80,7 @@ static struct rte_eth_conf port_conf = {
                .hw_ip_checksum = 1, /**< IP checksum offload enabled */
                .hw_vlan_filter = 0, /**< VLAN filtering disabled */
                .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 0, /**< CRC stripped by hardware */
+               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
        },
        .rx_adv_conf = {
                .rss_conf = {
@@ -95,26 +93,6 @@ static struct rte_eth_conf port_conf = {
        },
 };
 
-static struct rte_eth_rxconf rx_conf = {
-       .rx_thresh = {
-               .pthresh = APP_DEFAULT_NIC_RX_PTHRESH,
-               .hthresh = APP_DEFAULT_NIC_RX_HTHRESH,
-               .wthresh = APP_DEFAULT_NIC_RX_WTHRESH,
-       },
-       .rx_free_thresh = APP_DEFAULT_NIC_RX_FREE_THRESH,
-       .rx_drop_en = APP_DEFAULT_NIC_RX_DROP_EN,
-};
-
-static struct rte_eth_txconf tx_conf = {
-       .tx_thresh = {
-               .pthresh = APP_DEFAULT_NIC_TX_PTHRESH,
-               .hthresh = APP_DEFAULT_NIC_TX_HTHRESH,
-               .wthresh = APP_DEFAULT_NIC_TX_WTHRESH,
-       },
-       .tx_free_thresh = APP_DEFAULT_NIC_TX_FREE_THRESH,
-       .tx_rs_thresh = APP_DEFAULT_NIC_TX_RS_THRESH,
-};
-
 static void
 app_assign_worker_ids(void)
 {
@@ -148,16 +126,10 @@ app_init_mbuf_pools(void)
 
                snprintf(name, sizeof(name), "mbuf_pool_%u", socket);
                printf("Creating the mbuf pool for socket %u ...\n", socket);
-               app.pools[socket] = rte_mempool_create(
-                       name,
-                       APP_DEFAULT_MEMPOOL_BUFFERS,
-                       APP_DEFAULT_MBUF_SIZE,
+               app.pools[socket] = rte_pktmbuf_pool_create(
+                       name, APP_DEFAULT_MEMPOOL_BUFFERS,
                        APP_DEFAULT_MEMPOOL_CACHE_SIZE,
-                       sizeof(struct rte_pktmbuf_pool_private),
-                       rte_pktmbuf_pool_init, NULL,
-                       rte_pktmbuf_init, NULL,
-                       socket,
-                       0);
+                       0, APP_DEFAULT_MBUF_DATA_SIZE, socket);
                if (app.pools[socket] == NULL) {
                        rte_panic("Cannot create mbuf pool on socket %u\n", socket);
                }
@@ -187,13 +159,17 @@ app_init_lpm_tables(void)
                        continue;
                }
 
+               struct rte_lpm_config lpm_config;
+
+               lpm_config.max_rules = APP_MAX_LPM_RULES;
+               lpm_config.number_tbl8s = 256;
+               lpm_config.flags = 0;
                snprintf(name, sizeof(name), "lpm_table_%u", socket);
                printf("Creating the LPM table for socket %u ...\n", socket);
                app.lpm_tables[socket] = rte_lpm_create(
                        name,
                        socket,
-                       APP_MAX_LPM_RULES,
-                       0);
+                       &lpm_config);
                if (app.lpm_tables[socket] == NULL) {
                        rte_panic("Unable to create LPM table on socket %u\n", socket);
                }
@@ -418,7 +394,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
                                continue;
                        }
                        /* clear all_ports_up flag if any link down */
-                       if (link.link_status == 0) {
+                       if (link.link_status == ETH_LINK_DOWN) {
                                all_ports_up = 0;
                                break;
                        }
@@ -450,13 +426,11 @@ app_init_nics(void)
        int ret;
        uint32_t n_rx_queues, n_tx_queues;
 
-       if (rte_eal_pci_probe() < 0) {
-               rte_panic("Cannot probe PCI\n");
-       }
-
        /* Init NIC ports and queues, then start the ports */
        for (port = 0; port < APP_MAX_NIC_PORTS; port ++) {
                struct rte_mempool *pool;
+               uint16_t nic_rx_ring_size;
+               uint16_t nic_tx_ring_size;
 
                n_rx_queues = app_get_nic_rx_queues_per_port(port);
                n_tx_queues = app.nic_tx_port_mask[port];
@@ -477,6 +451,17 @@ app_init_nics(void)
                }
                rte_eth_promiscuous_enable(port);
 
+               nic_rx_ring_size = app.nic_rx_ring_size;
+               nic_tx_ring_size = app.nic_tx_ring_size;
+               ret = rte_eth_dev_adjust_nb_rx_tx_desc(
+                       port, &nic_rx_ring_size, &nic_tx_ring_size);
+               if (ret < 0) {
+                       rte_panic("Cannot adjust number of descriptors for port %u (%d)\n",
+                               (unsigned) port, ret);
+               }
+               app.nic_rx_ring_size = nic_rx_ring_size;
+               app.nic_tx_ring_size = nic_tx_ring_size;
+
                /* Init RX queues */
                for (queue = 0; queue < APP_MAX_RX_QUEUES_PER_NIC_PORT; queue ++) {
                        if (app.nic_rx_queue_mask[port][queue] == 0) {
@@ -495,7 +480,7 @@ app_init_nics(void)
                                queue,
                                (uint16_t) app.nic_rx_ring_size,
                                socket,
-                               &rx_conf,
+                               NULL,
                                pool);
                        if (ret < 0) {
                                rte_panic("Cannot init RX queue %u for port %u (%d)\n",
@@ -516,7 +501,7 @@ app_init_nics(void)
                                0,
                                (uint16_t) app.nic_tx_ring_size,
                                socket,
-                               &tx_conf);
+                               NULL);
                        if (ret < 0) {
                                rte_panic("Cannot init TX queue 0 for port %d (%d)\n",
                                        port,