apps: use helper to create mbuf pools

[dpdk.git] / examples / load_balancer / init.c

diff --git a/examples/load_balancer/init.c b/examples/load_balancer/init.c
index 5b225c7..5a56078 100644 (file)
--- a/examples/load_balancer/init.c
+++ b/examples/load_balancer/init.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -48,7 +48,6 @@
 #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>
@@ -76,6 +75,7 @@
 
 static struct rte_eth_conf port_conf = {
        .rxmode = {
+               .mq_mode        = ETH_MQ_RX_RSS,
                .split_hdr_size = 0,
                .header_split   = 0, /**< Header Split disabled */
                .hw_ip_checksum = 1, /**< IP checksum offload enabled */
@@ -86,7 +86,7 @@ static struct rte_eth_conf port_conf = {
        .rx_adv_conf = {
                .rss_conf = {
                        .rss_key = NULL,
-                       .rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6,
+                       .rss_hf = ETH_RSS_IP,
                },
        },
        .txmode = {
@@ -94,26 +94,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)
 {
@@ -145,18 +125,12 @@ app_init_mbuf_pools(void)
                        continue;
                }
 
-               rte_snprintf(name, sizeof(name), "mbuf_pool_%u", socket);
+               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);
                }
@@ -186,7 +160,7 @@ app_init_lpm_tables(void)
                        continue;
                }
 
-               rte_snprintf(name, sizeof(name), "lpm_table_%u", socket);
+               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,
@@ -258,7 +232,7 @@ app_init_rings_rx(void)
                                lcore,
                                socket_io,
                                lcore_worker);
-                       rte_snprintf(name, sizeof(name), "app_ring_rx_s%u_io%u_w%u",
+                       snprintf(name, sizeof(name), "app_ring_rx_s%u_io%u_w%u",
                                socket_io,
                                lcore,
                                lcore_worker);
@@ -341,7 +315,7 @@ app_init_rings_tx(void)
 
                        printf("Creating ring to connect worker lcore %u with TX port %u (through I/O lcore %u) (socket %u) ...\n",
                                lcore, port, (unsigned)lcore_io, (unsigned)socket_io);
-                       rte_snprintf(name, sizeof(name), "app_ring_tx_s%u_w%u_p%u", socket_io, lcore, port);
+                       snprintf(name, sizeof(name), "app_ring_tx_s%u_w%u_p%u", socket_io, lcore, port);
                        ring = rte_ring_create(
                                name,
                                app.ring_tx_size,
@@ -449,16 +423,6 @@ app_init_nics(void)
        int ret;
        uint32_t n_rx_queues, n_tx_queues;
 
-       /* Init driver */
-       printf("Initializing the PMD driver ...\n");
-       if (rte_pmd_init_all() < 0) {
-               rte_panic("Cannot init PMD\n");
-       }
-
-       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;
@@ -500,7 +464,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",
@@ -521,7 +485,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,