apps: use helper to create mbuf pools

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

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index ac8d4f7..c702fdd 100644 (file)
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -49,7 +49,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>
@@ -75,11 +74,9 @@
 
 #include <rte_ip_frag.h>
 
-#include "main.h"
-
 #define RTE_LOGTYPE_IP_FRAG RTE_LOGTYPE_USER1
 
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
+#define MBUF_SIZE (2048 + RTE_PKTMBUF_HEADROOM)
 
 /* allow max jumbo frame 9.5 KB */
 #define JUMBO_FRAME_MAX_SIZE   0x2600
@@ -106,25 +103,6 @@
 
 #define NB_MBUF   8192
 
-/*
- * RX and TX Prefetch, Host, and Write-back threshold values should be
- * carefully set for optimal performance. Consult the network
- * controller's datasheet and supporting DPDK documentation for guidance
- * on how these parameters should be set.
- */
-#define RX_PTHRESH 8 /**< Default values of RX prefetch threshold reg. */
-#define RX_HTHRESH 8 /**< Default values of RX host threshold reg. */
-#define RX_WTHRESH 4 /**< Default values of RX write-back threshold reg. */
-
-/*
- * These default values are optimized for use with the Intel(R) 82599 10 GbE
- * Controller and the DPDK ixgbe PMD. Consider using other values for other
- * network controllers and/or network drivers.
- */
-#define TX_PTHRESH 36 /**< Default values of TX prefetch threshold reg. */
-#define TX_HTHRESH 0  /**< Default values of TX host threshold reg. */
-#define TX_WTHRESH 0  /**< Default values of TX write-back threshold reg. */
-
 #define MAX_PKT_BURST  32
 #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
 
@@ -208,24 +186,6 @@ static const struct rte_eth_conf port_conf = {
        },
 };
 
-static const struct rte_eth_rxconf rx_conf = {
-       .rx_thresh = {
-               .pthresh = RX_PTHRESH,
-               .hthresh = RX_HTHRESH,
-               .wthresh = RX_WTHRESH,
-       },
-};
-
-static const struct rte_eth_txconf tx_conf = {
-       .tx_thresh = {
-               .pthresh = TX_PTHRESH,
-               .hthresh = TX_HTHRESH,
-               .wthresh = TX_WTHRESH,
-       },
-       .tx_free_thresh = 0, /* Use PMD default values */
-       .tx_rs_thresh = 0, /* Use PMD default values */
-};
-
 /*
  * IPv4 forwarding table
  */
@@ -413,7 +373,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                        rte_panic("No headroom in mbuf.\n");
                }
 
-               m->vlan_macip.f.l2_len = sizeof(struct ether_hdr);
+               m->l2_len = sizeof(struct ether_hdr);
 
                /* 02:00:00:00:00:xx */
                d_addr_bytes = &eth_hdr->d_addr.addr_bytes[0];
@@ -637,13 +597,9 @@ parse_args(int argc, char **argv)
 static void
 print_ethaddr(const char *name, struct ether_addr *eth_addr)
 {
-       printf("%s%02X:%02X:%02X:%02X:%02X:%02X", name,
-              eth_addr->addr_bytes[0],
-              eth_addr->addr_bytes[1],
-              eth_addr->addr_bytes[2],
-              eth_addr->addr_bytes[3],
-              eth_addr->addr_bytes[4],
-              eth_addr->addr_bytes[5]);
+       char buf[ETHER_ADDR_FMT_SIZE];
+       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       printf("%s%s", name, buf);
 }
 
 /* Check the link status of all ports in up to 9s, and print them finally */
@@ -788,12 +744,8 @@ init_mem(void)
                                        socket);
                        snprintf(buf, sizeof(buf), "pool_direct_%i", socket);
 
-                       mp = rte_mempool_create(buf, NB_MBUF,
-                                                  MBUF_SIZE, 32,
-                                                  sizeof(struct rte_pktmbuf_pool_private),
-                                                  rte_pktmbuf_pool_init, NULL,
-                                                  rte_pktmbuf_init, NULL,
-                                                  socket, 0);
+                       mp = rte_pktmbuf_pool_create(buf, NB_MBUF, 32,
+                               0, MBUF_DATA_SIZE, socket);
                        if (mp == NULL) {
                                RTE_LOG(ERR, IP_FRAG, "Cannot create direct mempool\n");
                                return -1;
@@ -806,12 +758,8 @@ init_mem(void)
                                        socket);
                        snprintf(buf, sizeof(buf), "pool_indirect_%i", socket);
 
-                       mp = rte_mempool_create(buf, NB_MBUF,
-                                                          sizeof(struct rte_mbuf), 32,
-                                                          0,
-                                                          NULL, NULL,
-                                                          rte_pktmbuf_init, NULL,
-                                                          socket, 0);
+                       mp = rte_pktmbuf_pool_create(buf, NB_MBUF, 32, 0, 0,
+                               socket);
                        if (mp == NULL) {
                                RTE_LOG(ERR, IP_FRAG, "Cannot create indirect mempool\n");
                                return -1;
@@ -848,9 +796,11 @@ init_mem(void)
 }
 
 int
-MAIN(int argc, char **argv)
+main(int argc, char **argv)
 {
        struct lcore_queue_conf *qconf;
+       struct rte_eth_dev_info dev_info;
+       struct rte_eth_txconf *txconf;
        struct rx_queue *rxq;
        int socket, ret;
        unsigned nb_ports;
@@ -871,9 +821,6 @@ MAIN(int argc, char **argv)
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Invalid arguments");
 
-       if (rte_eal_pci_probe() < 0)
-               rte_panic("Cannot probe PCI\n");
-
        nb_ports = rte_eth_dev_count();
        if (nb_ports > RTE_MAX_ETHPORTS)
                nb_ports = RTE_MAX_ETHPORTS;
@@ -942,7 +889,7 @@ MAIN(int argc, char **argv)
 
                /* init one RX queue */
                ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
-                                            socket, &rx_conf,
+                                            socket, NULL,
                                             socket_direct_pool[socket]);
                if (ret < 0) {
                        printf("\n");
@@ -964,8 +911,12 @@ MAIN(int argc, char **argv)
                        socket = (int) rte_lcore_to_socket_id(lcore_id);
                        printf("txq=%u,%d ", lcore_id, queueid);
                        fflush(stdout);
+
+                       rte_eth_dev_info_get(portid, &dev_info);
+                       txconf = &dev_info.default_txconf;
+                       txconf->txq_flags = 0;
                        ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd,
-                                                    socket, &tx_conf);
+                                                    socket, txconf);
                        if (ret < 0) {
                                printf("\n");
                                rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: "