net: add rte prefix to ether functions
[dpdk.git] / examples / ip_fragmentation / main.c
index 1376e6a..8d82a64 100644 (file)
@@ -1,34 +1,5 @@
-/*-
- *   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
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * 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
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdio.h>
 #include <rte_log.h>
 #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>
 #include <rte_per_lcore.h>
 #include <rte_branch_prediction.h>
 #include <rte_interrupts.h>
-#include <rte_pci.h>
 #include <rte_random.h>
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_lpm.h>
+#include <rte_lpm6.h>
 #include <rte_ip.h>
+#include <rte_string_fns.h>
 
-#include "rte_ip_frag.h"
-#include "main.h"
+#include <rte_ip_frag.h>
 
-/*
- * Default byte size for the IPv4 Maximum Transfer Unit (MTU).
- * This value includes the size of IPv4 header.
- */
-#define        IPV4_MTU_DEFAULT        ETHER_MTU
-
-/*
- * Default payload in bytes for the IPv4 packet.
- */
-#define        IPV4_DEFAULT_PAYLOAD    (IPV4_MTU_DEFAULT - sizeof(struct ipv4_hdr))
-
-#define RTE_LOGTYPE_L3FWD RTE_LOGTYPE_USER1
-
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
+#define RTE_LOGTYPE_IP_FRAG RTE_LOGTYPE_USER1
 
 /* allow max jumbo frame 9.5 KB */
 #define JUMBO_FRAME_MAX_SIZE   0x2600
 #define        ROUNDUP_DIV(a, b)       (((a) + (b) - 1) / (b))
 
 /*
- * Max number of fragments per packet expected.
+ * Default byte size for the IPv6 Maximum Transfer Unit (MTU).
+ * This value includes the size of IPv6 header.
  */
-#define        MAX_PACKET_FRAG ROUNDUP_DIV(JUMBO_FRAME_MAX_SIZE, IPV4_DEFAULT_PAYLOAD)
+#define        IPV4_MTU_DEFAULT        ETHER_MTU
+#define        IPV6_MTU_DEFAULT        ETHER_MTU
 
-#define NB_MBUF   8192
+/*
+ * The overhead from max frame size to MTU.
+ * We have to consider the max possible overhead.
+ */
+#define MTU_OVERHEAD   \
+       (ETHER_HDR_LEN + ETHER_CRC_LEN + 2 * sizeof(struct rte_vlan_hdr))
 
 /*
- * 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.
+ * Default payload in bytes for the IPv6 packet.
  */
-#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. */
+#define        IPV4_DEFAULT_PAYLOAD    (IPV4_MTU_DEFAULT - sizeof(struct ipv4_hdr))
+#define        IPV6_DEFAULT_PAYLOAD    (IPV6_MTU_DEFAULT - sizeof(struct ipv6_hdr))
 
 /*
- * 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.
+ * Max number of fragments per packet expected - defined by config file.
  */
-#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_PACKET_FRAG RTE_LIBRTE_IP_FRAG_MAX_FRAG
+
+#define NB_MBUF   8192
 
 #define MAX_PKT_BURST  32
 #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
 /*
  * Configurable number of RX/TX ring descriptors
  */
-#define RTE_TEST_RX_DESC_DEFAULT 128
-#define RTE_TEST_TX_DESC_DEFAULT 512
+#define RTE_TEST_RX_DESC_DEFAULT 1024
+#define RTE_TEST_TX_DESC_DEFAULT 1024
 static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
 static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
 
 /* ethernet addresses of ports */
-static struct ether_addr ports_eth_addr[RTE_MAX_ETHPORTS];
-static struct ether_addr remote_eth_addr =
-       {{0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}};
+static struct rte_ether_addr ports_eth_addr[RTE_MAX_ETHPORTS];
+
+#ifndef IPv4_BYTES
+#define IPv4_BYTES_FMT "%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8
+#define IPv4_BYTES(addr) \
+               (uint8_t) (((addr) >> 24) & 0xFF),\
+               (uint8_t) (((addr) >> 16) & 0xFF),\
+               (uint8_t) (((addr) >> 8) & 0xFF),\
+               (uint8_t) ((addr) & 0xFF)
+#endif
+
+#ifndef IPv6_BYTES
+#define IPv6_BYTES_FMT "%02x%02x:%02x%02x:%02x%02x:%02x%02x:"\
+                       "%02x%02x:%02x%02x:%02x%02x:%02x%02x"
+#define IPv6_BYTES(addr) \
+       addr[0],  addr[1], addr[2],  addr[3], \
+       addr[4],  addr[5], addr[6],  addr[7], \
+       addr[8],  addr[9], addr[10], addr[11],\
+       addr[12], addr[13],addr[14], addr[15]
+#endif
+
+#define IPV6_ADDR_LEN 16
 
 /* mask of enabled ports */
 static int enabled_port_mask = 0;
@@ -151,75 +125,98 @@ struct mbuf_table {
        struct rte_mbuf *m_table[MBUF_TABLE_SIZE];
 };
 
+struct rx_queue {
+       struct rte_mempool *direct_pool;
+       struct rte_mempool *indirect_pool;
+       struct rte_lpm *lpm;
+       struct rte_lpm6 *lpm6;
+       uint16_t portid;
+};
+
 #define MAX_RX_QUEUE_PER_LCORE 16
 #define MAX_TX_QUEUE_PER_PORT 16
 struct lcore_queue_conf {
        uint16_t n_rx_queue;
-       uint8_t rx_queue_list[MAX_RX_QUEUE_PER_LCORE];
        uint16_t tx_queue_id[RTE_MAX_ETHPORTS];
+       struct rx_queue rx_queue_list[MAX_RX_QUEUE_PER_LCORE];
        struct mbuf_table tx_mbufs[RTE_MAX_ETHPORTS];
-
 } __rte_cache_aligned;
 struct lcore_queue_conf lcore_queue_conf[RTE_MAX_LCORE];
 
-static const struct rte_eth_conf port_conf = {
+static struct rte_eth_conf port_conf = {
        .rxmode = {
                .max_rx_pkt_len = JUMBO_FRAME_MAX_SIZE,
                .split_hdr_size = 0,
-               .header_split   = 0, /**< Header Split disabled */
-               .hw_ip_checksum = 0, /**< IP checksum offload disabled */
-               .hw_vlan_filter = 0, /**< VLAN filtering disabled */
-               .jumbo_frame    = 1, /**< Jumbo Frame Support enabled */
-               .hw_strip_crc   = 0, /**< CRC stripped by hardware */
+               .offloads = (DEV_RX_OFFLOAD_CHECKSUM |
+                            DEV_RX_OFFLOAD_SCATTER |
+                            DEV_RX_OFFLOAD_JUMBO_FRAME),
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
+               .offloads = (DEV_TX_OFFLOAD_IPV4_CKSUM |
+                            DEV_TX_OFFLOAD_MULTI_SEGS),
        },
 };
 
-static const struct rte_eth_rxconf rx_conf = {
-       .rx_thresh = {
-               .pthresh = RX_PTHRESH,
-               .hthresh = RX_HTHRESH,
-               .wthresh = RX_WTHRESH,
-       },
+/*
+ * IPv4 forwarding table
+ */
+struct l3fwd_ipv4_route {
+       uint32_t ip;
+       uint8_t  depth;
+       uint8_t  if_out;
 };
 
-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 */
+struct l3fwd_ipv4_route l3fwd_ipv4_route_array[] = {
+               {IPv4(100,10,0,0), 16, 0},
+               {IPv4(100,20,0,0), 16, 1},
+               {IPv4(100,30,0,0), 16, 2},
+               {IPv4(100,40,0,0), 16, 3},
+               {IPv4(100,50,0,0), 16, 4},
+               {IPv4(100,60,0,0), 16, 5},
+               {IPv4(100,70,0,0), 16, 6},
+               {IPv4(100,80,0,0), 16, 7},
 };
 
-struct rte_mempool *pool_direct = NULL, *pool_indirect = NULL;
+/*
+ * IPv6 forwarding table
+ */
 
-struct l3fwd_route {
-       uint32_t ip;
-       uint8_t  depth;
-       uint8_t  if_out;
+struct l3fwd_ipv6_route {
+       uint8_t ip[IPV6_ADDR_LEN];
+       uint8_t depth;
+       uint8_t if_out;
 };
 
-struct l3fwd_route l3fwd_route_array[] = {
-       {IPv4(100,10,0,0), 16, 2},
-       {IPv4(100,20,0,0), 16, 2},
-       {IPv4(100,30,0,0), 16, 0},
-       {IPv4(100,40,0,0), 16, 0},
+static struct l3fwd_ipv6_route l3fwd_ipv6_route_array[] = {
+       {{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, 48, 0},
+       {{2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, 48, 1},
+       {{3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, 48, 2},
+       {{4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, 48, 3},
+       {{5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, 48, 4},
+       {{6,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, 48, 5},
+       {{7,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, 48, 6},
+       {{8,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, 48, 7},
 };
 
-#define L3FWD_NUM_ROUTES \
-       (sizeof(l3fwd_route_array) / sizeof(l3fwd_route_array[0]))
+#define LPM_MAX_RULES         1024
+#define LPM6_MAX_RULES         1024
+#define LPM6_NUMBER_TBL8S (1 << 16)
 
-#define L3FWD_LPM_MAX_RULES     1024
+struct rte_lpm6_config lpm6_config = {
+               .max_rules = LPM6_MAX_RULES,
+               .number_tbl8s = LPM6_NUMBER_TBL8S,
+               .flags = 0
+};
 
-struct rte_lpm *l3fwd_lpm = NULL;
+static struct rte_mempool *socket_direct_pool[RTE_MAX_NUMA_NODES];
+static struct rte_mempool *socket_indirect_pool[RTE_MAX_NUMA_NODES];
+static struct rte_lpm *socket_lpm[RTE_MAX_NUMA_NODES];
+static struct rte_lpm6 *socket_lpm6[RTE_MAX_NUMA_NODES];
 
 /* Send burst of packets on an output interface */
 static inline int
-send_burst(struct lcore_queue_conf *qconf, uint16_t n, uint8_t port)
+send_burst(struct lcore_queue_conf *qconf, uint16_t n, uint16_t port)
 {
        struct rte_mbuf **m_table;
        int ret;
@@ -239,66 +236,130 @@ send_burst(struct lcore_queue_conf *qconf, uint16_t n, uint8_t port)
 }
 
 static inline void
-l3fwd_simple_forward(struct rte_mbuf *m, uint8_t port_in)
+l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
+               uint8_t queueid, uint16_t port_in)
 {
-       struct lcore_queue_conf *qconf;
-       struct ipv4_hdr *ip_hdr;
-       uint32_t i, len, lcore_id, ip_dst;
-       uint8_t next_hop, port_out;
+       struct rx_queue *rxq;
+       uint32_t i, len, next_hop;
+       uint8_t ipv6;
+       uint16_t port_out;
        int32_t len2;
 
-       lcore_id = rte_lcore_id();
-       qconf = &lcore_queue_conf[lcore_id];
-
-       /* Remove the Ethernet header and trailer from the input packet */
-       rte_pktmbuf_adj(m, (uint16_t)sizeof(struct ether_hdr));
+       ipv6 = 0;
+       rxq = &qconf->rx_queue_list[queueid];
 
-       /* Read the lookup key (i.e. ip_dst) from the input packet */
-       ip_hdr = rte_pktmbuf_mtod(m, struct ipv4_hdr *);
-       ip_dst = rte_be_to_cpu_32(ip_hdr->dst_addr);
+       /* by default, send everything back to the source port */
+       port_out = port_in;
 
-       /* Find destination port */
-       if (rte_lpm_lookup(l3fwd_lpm, ip_dst, &next_hop) == 0 &&
-                       (enabled_port_mask & 1 << next_hop) != 0)
-               port_out = next_hop;
-       else
-               port_out = port_in;
+       /* Remove the Ethernet header and trailer from the input packet */
+       rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));
 
        /* Build transmission burst */
        len = qconf->tx_mbufs[port_out].len;
 
-       /* if we don't need to do any fragmentation */
-       if (likely (IPV4_MTU_DEFAULT  >= m->pkt.pkt_len)) {
+       /* if this is an IPv4 packet */
+       if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {
+               struct ipv4_hdr *ip_hdr;
+               uint32_t ip_dst;
+               /* Read the lookup key (i.e. ip_dst) from the input packet */
+               ip_hdr = rte_pktmbuf_mtod(m, struct ipv4_hdr *);
+               ip_dst = rte_be_to_cpu_32(ip_hdr->dst_addr);
+
+               /* Find destination port */
+               if (rte_lpm_lookup(rxq->lpm, ip_dst, &next_hop) == 0 &&
+                               (enabled_port_mask & 1 << next_hop) != 0) {
+                       port_out = next_hop;
+
+                       /* Build transmission burst for new port */
+                       len = qconf->tx_mbufs[port_out].len;
+               }
+
+               /* if we don't need to do any fragmentation */
+               if (likely (IPV4_MTU_DEFAULT >= m->pkt_len)) {
+                       qconf->tx_mbufs[port_out].m_table[len] = m;
+                       len2 = 1;
+               } else {
+                       len2 = rte_ipv4_fragment_packet(m,
+                               &qconf->tx_mbufs[port_out].m_table[len],
+                               (uint16_t)(MBUF_TABLE_SIZE - len),
+                               IPV4_MTU_DEFAULT,
+                               rxq->direct_pool, rxq->indirect_pool);
+
+                       /* Free input packet */
+                       rte_pktmbuf_free(m);
+
+                       /* If we fail to fragment the packet */
+                       if (unlikely (len2 < 0))
+                               return;
+               }
+       } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
+               /* if this is an IPv6 packet */
+               struct ipv6_hdr *ip_hdr;
+
+               ipv6 = 1;
+
+               /* Read the lookup key (i.e. ip_dst) from the input packet */
+               ip_hdr = rte_pktmbuf_mtod(m, struct ipv6_hdr *);
+
+               /* Find destination port */
+               if (rte_lpm6_lookup(rxq->lpm6, ip_hdr->dst_addr,
+                                               &next_hop) == 0 &&
+                               (enabled_port_mask & 1 << next_hop) != 0) {
+                       port_out = next_hop;
+
+                       /* Build transmission burst for new port */
+                       len = qconf->tx_mbufs[port_out].len;
+               }
+
+               /* if we don't need to do any fragmentation */
+               if (likely (IPV6_MTU_DEFAULT >= m->pkt_len)) {
+                       qconf->tx_mbufs[port_out].m_table[len] = m;
+                       len2 = 1;
+               } else {
+                       len2 = rte_ipv6_fragment_packet(m,
+                               &qconf->tx_mbufs[port_out].m_table[len],
+                               (uint16_t)(MBUF_TABLE_SIZE - len),
+                               IPV6_MTU_DEFAULT,
+                               rxq->direct_pool, rxq->indirect_pool);
+
+                       /* Free input packet */
+                       rte_pktmbuf_free(m);
+
+                       /* If we fail to fragment the packet */
+                       if (unlikely (len2 < 0))
+                               return;
+               }
+       }
+       /* else, just forward the packet */
+       else {
                qconf->tx_mbufs[port_out].m_table[len] = m;
                len2 = 1;
-       } else {
-               len2 = rte_ipv4_fragment_packet(m,
-                       &qconf->tx_mbufs[port_out].m_table[len],
-                       (uint16_t)(MBUF_TABLE_SIZE - len),
-                       IPV4_MTU_DEFAULT,
-                       pool_direct, pool_indirect);
-
-               /* Free input packet */
-               rte_pktmbuf_free(m);
-
-               /* If we fail to fragment the packet */
-               if (unlikely (len2 < 0))
-                       return;
        }
 
        for (i = len; i < len + len2; i ++) {
+               void *d_addr_bytes;
+
                m = qconf->tx_mbufs[port_out].m_table[i];
-               struct ether_hdr *eth_hdr = (struct ether_hdr *)
-                       rte_pktmbuf_prepend(m, (uint16_t)sizeof(struct ether_hdr));
+               struct rte_ether_hdr *eth_hdr = (struct rte_ether_hdr *)
+                       rte_pktmbuf_prepend(m,
+                               (uint16_t)sizeof(struct rte_ether_hdr));
                if (eth_hdr == NULL) {
                        rte_panic("No headroom in mbuf.\n");
                }
 
-               m->pkt.vlan_macip.f.l2_len = sizeof(struct ether_hdr);
+               m->l2_len = sizeof(struct rte_ether_hdr);
 
-               ether_addr_copy(&remote_eth_addr, &eth_hdr->d_addr);
-               ether_addr_copy(&ports_eth_addr[port_out], &eth_hdr->s_addr);
-               eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
+               /* 02:00:00:00:00:xx */
+               d_addr_bytes = &eth_hdr->d_addr.addr_bytes[0];
+               *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)port_out << 40);
+
+               /* src addr */
+               rte_ether_addr_copy(&ports_eth_addr[port_out],
+                               &eth_hdr->s_addr);
+               if (ipv6)
+                       eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv6);
+               else
+                       eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
        }
 
        len += len2;
@@ -321,7 +382,7 @@ main_loop(__attribute__((unused)) void *dummy)
        unsigned lcore_id;
        uint64_t prev_tsc, diff_tsc, cur_tsc;
        int i, j, nb_rx;
-       uint8_t portid;
+       uint16_t portid;
        struct lcore_queue_conf *qconf;
        const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) / US_PER_S * BURST_TX_DRAIN_US;
 
@@ -331,17 +392,17 @@ main_loop(__attribute__((unused)) void *dummy)
        qconf = &lcore_queue_conf[lcore_id];
 
        if (qconf->n_rx_queue == 0) {
-               RTE_LOG(INFO, L3FWD, "lcore %u has nothing to do\n", lcore_id);
+               RTE_LOG(INFO, IP_FRAG, "lcore %u has nothing to do\n", lcore_id);
                return 0;
        }
 
-       RTE_LOG(INFO, L3FWD, "entering main loop on lcore %u\n", lcore_id);
+       RTE_LOG(INFO, IP_FRAG, "entering main loop on lcore %u\n", lcore_id);
 
        for (i = 0; i < qconf->n_rx_queue; i++) {
 
-               portid = qconf->rx_queue_list[i];
-               RTE_LOG(INFO, L3FWD, " -- lcoreid=%u portid=%d\n", lcore_id,
-                       (int) portid);
+               portid = qconf->rx_queue_list[i].portid;
+               RTE_LOG(INFO, IP_FRAG, " -- lcoreid=%u portid=%d\n", lcore_id,
+                               portid);
        }
 
        while (1) {
@@ -375,7 +436,7 @@ main_loop(__attribute__((unused)) void *dummy)
                 */
                for (i = 0; i < qconf->n_rx_queue; i++) {
 
-                       portid = qconf->rx_queue_list[i];
+                       portid = qconf->rx_queue_list[i].portid;
                        nb_rx = rte_eth_rx_burst(portid, 0, pkts_burst,
                                                 MAX_PKT_BURST);
 
@@ -389,12 +450,12 @@ main_loop(__attribute__((unused)) void *dummy)
                        for (j = 0; j < (nb_rx - PREFETCH_OFFSET); j++) {
                                rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[
                                                j + PREFETCH_OFFSET], void *));
-                               l3fwd_simple_forward(pkts_burst[j], portid);
+                               l3fwd_simple_forward(pkts_burst[j], qconf, i, portid);
                        }
 
                        /* Forward remaining prefetched packets */
                        for (; j < nb_rx; j++) {
-                               l3fwd_simple_forward(pkts_burst[j], portid);
+                               l3fwd_simple_forward(pkts_burst[j], qconf, i, portid);
                        }
                }
        }
@@ -504,36 +565,33 @@ parse_args(int argc, char **argv)
                argv[optind-1] = prgname;
 
        ret = optind-1;
-       optind = 0; /* reset getopt lib */
+       optind = 1; /* reset getopt lib */
        return ret;
 }
 
 static void
-print_ethaddr(const char *name, struct ether_addr *eth_addr)
+print_ethaddr(const char *name, struct rte_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];
+       rte_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 */
 static void
-check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
+check_all_ports_link_status(uint32_t port_mask)
 {
 #define CHECK_INTERVAL 100 /* 100ms */
 #define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */
-       uint8_t portid, count, all_ports_up, print_flag = 0;
+       uint16_t portid;
+       uint8_t count, all_ports_up, print_flag = 0;
        struct rte_eth_link link;
 
        printf("\nChecking link status");
        fflush(stdout);
        for (count = 0; count <= MAX_CHECK_TIME; count++) {
                all_ports_up = 1;
-               for (portid = 0; portid < port_num; portid++) {
+               RTE_ETH_FOREACH_DEV(portid) {
                        if ((port_mask & (1 << portid)) == 0)
                                continue;
                        memset(&link, 0, sizeof(link));
@@ -541,18 +599,17 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
                        /* print link status if flag set */
                        if (print_flag == 1) {
                                if (link.link_status)
-                                       printf("Port %d Link Up - speed %u "
-                                               "Mbps - %s\n", (uint8_t)portid,
-                                               (unsigned)link.link_speed,
+                                       printf(
+                                       "Port%d Link Up .Speed %u Mbps - %s\n",
+                                               portid, link.link_speed,
                                (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
                                        ("full-duplex") : ("half-duplex\n"));
                                else
-                                       printf("Port %d Link Down\n",
-                                                       (uint8_t)portid);
+                                       printf("Port %d Link Down\n", portid);
                                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;
                        }
@@ -570,21 +627,235 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
                /* set the print_flag if all ports up or timeout */
                if (all_ports_up == 1 || count == (MAX_CHECK_TIME - 1)) {
                        print_flag = 1;
-                       printf("done\n");
+                       printf("\ndone\n");
                }
        }
 }
 
+/* Check L3 packet type detection capablity of the NIC port */
+static int
+check_ptype(int portid)
+{
+       int i, ret;
+       int ptype_l3_ipv4 = 0, ptype_l3_ipv6 = 0;
+       uint32_t ptype_mask = RTE_PTYPE_L3_MASK;
+
+       ret = rte_eth_dev_get_supported_ptypes(portid, ptype_mask, NULL, 0);
+       if (ret <= 0)
+               return 0;
+
+       uint32_t ptypes[ret];
+
+       ret = rte_eth_dev_get_supported_ptypes(portid, ptype_mask, ptypes, ret);
+       for (i = 0; i < ret; ++i) {
+               if (ptypes[i] & RTE_PTYPE_L3_IPV4)
+                       ptype_l3_ipv4 = 1;
+               if (ptypes[i] & RTE_PTYPE_L3_IPV6)
+                       ptype_l3_ipv6 = 1;
+       }
+
+       if (ptype_l3_ipv4 == 0)
+               printf("port %d cannot parse RTE_PTYPE_L3_IPV4\n", portid);
+
+       if (ptype_l3_ipv6 == 0)
+               printf("port %d cannot parse RTE_PTYPE_L3_IPV6\n", portid);
+
+       if (ptype_l3_ipv4 && ptype_l3_ipv6)
+               return 1;
+
+       return 0;
+
+}
+
+/* Parse packet type of a packet by SW */
+static inline void
+parse_ptype(struct rte_mbuf *m)
+{
+       struct rte_ether_hdr *eth_hdr;
+       uint32_t packet_type = RTE_PTYPE_UNKNOWN;
+       uint16_t ether_type;
+
+       eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
+       ether_type = eth_hdr->ether_type;
+       if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4))
+               packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
+       else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv6))
+               packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
+
+       m->packet_type = packet_type;
+}
+
+/* callback function to detect packet type for a queue of a port */
+static uint16_t
+cb_parse_ptype(uint16_t port __rte_unused, uint16_t queue __rte_unused,
+                  struct rte_mbuf *pkts[], uint16_t nb_pkts,
+                  uint16_t max_pkts __rte_unused,
+                  void *user_param __rte_unused)
+{
+       uint16_t i;
+
+       for (i = 0; i < nb_pkts; ++i)
+               parse_ptype(pkts[i]);
+
+       return nb_pkts;
+}
+
+static int
+init_routing_table(void)
+{
+       struct rte_lpm *lpm;
+       struct rte_lpm6 *lpm6;
+       int socket, ret;
+       unsigned i;
+
+       for (socket = 0; socket < RTE_MAX_NUMA_NODES; socket++) {
+               if (socket_lpm[socket]) {
+                       lpm = socket_lpm[socket];
+                       /* populate the LPM table */
+                       for (i = 0; i < RTE_DIM(l3fwd_ipv4_route_array); i++) {
+                               ret = rte_lpm_add(lpm,
+                                       l3fwd_ipv4_route_array[i].ip,
+                                       l3fwd_ipv4_route_array[i].depth,
+                                       l3fwd_ipv4_route_array[i].if_out);
+
+                               if (ret < 0) {
+                                       RTE_LOG(ERR, IP_FRAG, "Unable to add entry %i to the l3fwd "
+                                               "LPM table\n", i);
+                                       return -1;
+                               }
+
+                               RTE_LOG(INFO, IP_FRAG, "Socket %i: adding route " IPv4_BYTES_FMT
+                                               "/%d (port %d)\n",
+                                       socket,
+                                       IPv4_BYTES(l3fwd_ipv4_route_array[i].ip),
+                                       l3fwd_ipv4_route_array[i].depth,
+                                       l3fwd_ipv4_route_array[i].if_out);
+                       }
+               }
+
+               if (socket_lpm6[socket]) {
+                       lpm6 = socket_lpm6[socket];
+                       /* populate the LPM6 table */
+                       for (i = 0; i < RTE_DIM(l3fwd_ipv6_route_array); i++) {
+                               ret = rte_lpm6_add(lpm6,
+                                       l3fwd_ipv6_route_array[i].ip,
+                                       l3fwd_ipv6_route_array[i].depth,
+                                       l3fwd_ipv6_route_array[i].if_out);
+
+                               if (ret < 0) {
+                                       RTE_LOG(ERR, IP_FRAG, "Unable to add entry %i to the l3fwd "
+                                               "LPM6 table\n", i);
+                                       return -1;
+                               }
+
+                               RTE_LOG(INFO, IP_FRAG, "Socket %i: adding route " IPv6_BYTES_FMT
+                                               "/%d (port %d)\n",
+                                       socket,
+                                       IPv6_BYTES(l3fwd_ipv6_route_array[i].ip),
+                                       l3fwd_ipv6_route_array[i].depth,
+                                       l3fwd_ipv6_route_array[i].if_out);
+                       }
+               }
+       }
+       return 0;
+}
+
+static int
+init_mem(void)
+{
+       char buf[PATH_MAX];
+       struct rte_mempool *mp;
+       struct rte_lpm *lpm;
+       struct rte_lpm6 *lpm6;
+       struct rte_lpm_config lpm_config;
+       int socket;
+       unsigned lcore_id;
+
+       /* traverse through lcores and initialize structures on each socket */
+
+       for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
+
+               if (rte_lcore_is_enabled(lcore_id) == 0)
+                       continue;
+
+               socket = rte_lcore_to_socket_id(lcore_id);
+
+               if (socket == SOCKET_ID_ANY)
+                       socket = 0;
+
+               if (socket_direct_pool[socket] == NULL) {
+                       RTE_LOG(INFO, IP_FRAG, "Creating direct mempool on socket %i\n",
+                                       socket);
+                       snprintf(buf, sizeof(buf), "pool_direct_%i", socket);
+
+                       mp = rte_pktmbuf_pool_create(buf, NB_MBUF, 32,
+                               0, RTE_MBUF_DEFAULT_BUF_SIZE, socket);
+                       if (mp == NULL) {
+                               RTE_LOG(ERR, IP_FRAG, "Cannot create direct mempool\n");
+                               return -1;
+                       }
+                       socket_direct_pool[socket] = mp;
+               }
+
+               if (socket_indirect_pool[socket] == NULL) {
+                       RTE_LOG(INFO, IP_FRAG, "Creating indirect mempool on socket %i\n",
+                                       socket);
+                       snprintf(buf, sizeof(buf), "pool_indirect_%i", socket);
+
+                       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;
+                       }
+                       socket_indirect_pool[socket] = mp;
+               }
+
+               if (socket_lpm[socket] == NULL) {
+                       RTE_LOG(INFO, IP_FRAG, "Creating LPM table on socket %i\n", socket);
+                       snprintf(buf, sizeof(buf), "IP_FRAG_LPM_%i", socket);
+
+                       lpm_config.max_rules = LPM_MAX_RULES;
+                       lpm_config.number_tbl8s = 256;
+                       lpm_config.flags = 0;
+
+                       lpm = rte_lpm_create(buf, socket, &lpm_config);
+                       if (lpm == NULL) {
+                               RTE_LOG(ERR, IP_FRAG, "Cannot create LPM table\n");
+                               return -1;
+                       }
+                       socket_lpm[socket] = lpm;
+               }
+
+               if (socket_lpm6[socket] == NULL) {
+                       RTE_LOG(INFO, IP_FRAG, "Creating LPM6 table on socket %i\n", socket);
+                       snprintf(buf, sizeof(buf), "IP_FRAG_LPM_%i", socket);
+
+                       lpm6 = rte_lpm6_create(buf, socket, &lpm6_config);
+                       if (lpm6 == NULL) {
+                               RTE_LOG(ERR, IP_FRAG, "Cannot create LPM table\n");
+                               return -1;
+                       }
+                       socket_lpm6[socket] = lpm6;
+               }
+       }
+
+       return 0;
+}
+
 int
-MAIN(int argc, char **argv)
+main(int argc, char **argv)
 {
        struct lcore_queue_conf *qconf;
-       int ret;
-       unsigned nb_ports, i;
+       struct rte_eth_dev_info dev_info;
+       struct rte_eth_txconf *txconf;
+       struct rx_queue *rxq;
+       int socket, ret;
+       uint16_t nb_ports;
        uint16_t queueid = 0;
        unsigned lcore_id = 0, rx_lcore_id = 0;
        uint32_t n_tx_queue, nb_lcores;
-       uint8_t portid;
+       uint16_t portid;
 
        /* init EAL */
        ret = rte_eal_init(argc, argv);
@@ -598,38 +869,25 @@ MAIN(int argc, char **argv)
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Invalid arguments");
 
-       /* create the mbuf pools */
-       pool_direct =
-               rte_mempool_create("pool_direct", NB_MBUF,
-                                  MBUF_SIZE, 32,
-                                  sizeof(struct rte_pktmbuf_pool_private),
-                                  rte_pktmbuf_pool_init, NULL,
-                                  rte_pktmbuf_init, NULL,
-                                  rte_socket_id(), 0);
-       if (pool_direct == NULL)
-               rte_panic("Cannot init direct mbuf pool\n");
-
-       pool_indirect =
-               rte_mempool_create("pool_indirect", NB_MBUF,
-                                  sizeof(struct rte_mbuf), 32,
-                                  0,
-                                  NULL, NULL,
-                                  rte_pktmbuf_init, NULL,
-                                  rte_socket_id(), 0);
-       if (pool_indirect == NULL)
-               rte_panic("Cannot init indirect mbuf pool\n");
-
-       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;
+       nb_ports = rte_eth_dev_count_avail();
+       if (nb_ports == 0)
+               rte_exit(EXIT_FAILURE, "No ports found!\n");
 
        nb_lcores = rte_lcore_count();
 
+       /* initialize structures (mempools, lpm etc.) */
+       if (init_mem() < 0)
+               rte_panic("Cannot initialize memory structures!\n");
+
+       /* check if portmask has non-existent ports */
+       if (enabled_port_mask & ~(RTE_LEN2MASK(nb_ports, unsigned)))
+               rte_exit(EXIT_FAILURE, "Non-existent ports in portmask!\n");
+
        /* initialize all ports */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
+               struct rte_eth_conf local_port_conf = port_conf;
+               struct rte_eth_rxconf rxq_conf;
+
                /* skip ports that are not enabled */
                if ((enabled_port_mask & (1 << portid)) == 0) {
                        printf("Skipping disabled port %d\n", portid);
@@ -638,6 +896,12 @@ MAIN(int argc, char **argv)
 
                qconf = &lcore_queue_conf[rx_lcore_id];
 
+               /* limit the frame size to the maximum supported by NIC */
+               rte_eth_dev_info_get(portid, &dev_info);
+               local_port_conf.rxmode.max_rx_pkt_len = RTE_MIN(
+                   dev_info.max_rx_pktlen,
+                   local_port_conf.rxmode.max_rx_pkt_len);
+
                /* get the lcore_id for this port */
                while (rte_lcore_is_enabled(rx_lcore_id) == 0 ||
                       qconf->n_rx_queue == (unsigned)rx_queue_per_lcore) {
@@ -648,96 +912,129 @@ MAIN(int argc, char **argv)
 
                        qconf = &lcore_queue_conf[rx_lcore_id];
                }
-               qconf->rx_queue_list[qconf->n_rx_queue] = portid;
+
+               socket = (int) rte_lcore_to_socket_id(rx_lcore_id);
+               if (socket == SOCKET_ID_ANY)
+                       socket = 0;
+
+               rxq = &qconf->rx_queue_list[qconf->n_rx_queue];
+               rxq->portid = portid;
+               rxq->direct_pool = socket_direct_pool[socket];
+               rxq->indirect_pool = socket_indirect_pool[socket];
+               rxq->lpm = socket_lpm[socket];
+               rxq->lpm6 = socket_lpm6[socket];
                qconf->n_rx_queue++;
 
                /* init port */
-               printf("Initializing port %d on lcore %u... ", portid,
+               printf("Initializing port %d on lcore %u...", portid,
                       rx_lcore_id);
                fflush(stdout);
 
                n_tx_queue = nb_lcores;
                if (n_tx_queue > MAX_TX_QUEUE_PER_PORT)
                        n_tx_queue = MAX_TX_QUEUE_PER_PORT;
+               if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+                       local_port_conf.txmode.offloads |=
+                               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
                ret = rte_eth_dev_configure(portid, 1, (uint16_t)n_tx_queue,
-                                           &port_conf);
-               if (ret < 0)
+                                           &local_port_conf);
+               if (ret < 0) {
+                       printf("\n");
                        rte_exit(EXIT_FAILURE, "Cannot configure device: "
                                "err=%d, port=%d\n",
                                ret, portid);
+               }
 
-               rte_eth_macaddr_get(portid, &ports_eth_addr[portid]);
-               print_ethaddr(" Address:", &ports_eth_addr[portid]);
-               printf(", ");
+               /* set the mtu to the maximum received packet size */
+               ret = rte_eth_dev_set_mtu(portid,
+                       local_port_conf.rxmode.max_rx_pkt_len - MTU_OVERHEAD);
+               if (ret < 0) {
+                       printf("\n");
+                       rte_exit(EXIT_FAILURE, "Set MTU failed: "
+                               "err=%d, port=%d\n",
+                       ret, portid);
+               }
+
+               ret = rte_eth_dev_adjust_nb_rx_tx_desc(portid, &nb_rxd,
+                                           &nb_txd);
+               if (ret < 0) {
+                       printf("\n");
+                       rte_exit(EXIT_FAILURE, "Cannot adjust number of "
+                               "descriptors: err=%d, port=%d\n", ret, portid);
+               }
 
                /* init one RX queue */
-               queueid = 0;
-               printf("rxq=%d ", queueid);
-               fflush(stdout);
-               ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
-                                            rte_eth_dev_socket_id(portid), &rx_conf,
-                                            pool_direct);
-               if (ret < 0)
-                       rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: "
+               rxq_conf = dev_info.default_rxconf;
+               rxq_conf.offloads = local_port_conf.rxmode.offloads;
+               ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
+                                            socket, &rxq_conf,
+                                            socket_direct_pool[socket]);
+               if (ret < 0) {
+                       printf("\n");
+                       rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup: "
                                "err=%d, port=%d\n",
                                ret, portid);
+               }
+
+               rte_eth_macaddr_get(portid, &ports_eth_addr[portid]);
+               print_ethaddr(" Address:", &ports_eth_addr[portid]);
+               printf("\n");
 
                /* init one TX queue per couple (lcore,port) */
                queueid = 0;
                for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
                        if (rte_lcore_is_enabled(lcore_id) == 0)
                                continue;
+
+                       socket = (int) rte_lcore_to_socket_id(lcore_id);
                        printf("txq=%u,%d ", lcore_id, queueid);
                        fflush(stdout);
+
+                       txconf = &dev_info.default_txconf;
+                       txconf->offloads = local_port_conf.txmode.offloads;
                        ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd,
-                                                    rte_eth_dev_socket_id(portid), &tx_conf);
-                       if (ret < 0)
+                                                    socket, txconf);
+                       if (ret < 0) {
+                               printf("\n");
                                rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: "
                                        "err=%d, port=%d\n", ret, portid);
+                       }
 
                        qconf = &lcore_queue_conf[lcore_id];
                        qconf->tx_queue_id[portid] = queueid;
                        queueid++;
                }
 
+               printf("\n");
+       }
+
+       printf("\n");
+
+       /* start ports */
+       RTE_ETH_FOREACH_DEV(portid) {
+               if ((enabled_port_mask & (1 << portid)) == 0) {
+                       continue;
+               }
                /* Start device */
                ret = rte_eth_dev_start(portid);
                if (ret < 0)
-                       rte_exit(EXIT_FAILURE, "rte_eth_dev_start: "
-                               "err=%d, port=%d\n",
+                       rte_exit(EXIT_FAILURE, "rte_eth_dev_start: err=%d, port=%d\n",
                                ret, portid);
 
-               printf("done: ");
-
-               /* Set port in promiscuous mode */
                rte_eth_promiscuous_enable(portid);
-       }
-
-       check_all_ports_link_status((uint8_t)nb_ports, enabled_port_mask);
-
-       /* create the LPM table */
-       l3fwd_lpm = rte_lpm_create("L3FWD_LPM", rte_socket_id(), L3FWD_LPM_MAX_RULES, 0);
-       if (l3fwd_lpm == NULL)
-               rte_panic("Unable to create the l3fwd LPM table\n");
 
-       /* populate the LPM table */
-       for (i = 0; i < L3FWD_NUM_ROUTES; i++) {
-               ret = rte_lpm_add(l3fwd_lpm,
-                       l3fwd_route_array[i].ip,
-                       l3fwd_route_array[i].depth,
-                       l3fwd_route_array[i].if_out);
-
-               if (ret < 0) {
-                       rte_panic("Unable to add entry %u to the l3fwd "
-                               "LPM table\n", i);
+               if (check_ptype(portid) == 0) {
+                       rte_eth_add_rx_callback(portid, 0, cb_parse_ptype, NULL);
+                       printf("Add Rx callback function to detect L3 packet type by SW :"
+                               " port = %d\n", portid);
                }
-
-               printf("Adding route 0x%08x / %d (%d)\n",
-                       (unsigned) l3fwd_route_array[i].ip,
-                       l3fwd_route_array[i].depth,
-                       l3fwd_route_array[i].if_out);
        }
 
+       if (init_routing_table() < 0)
+               rte_exit(EXIT_FAILURE, "Cannot init routing table\n");
+
+       check_all_ports_link_status(enabled_port_mask);
+
        /* launch per-lcore init on every lcore */
        rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
        RTE_LCORE_FOREACH_SLAVE(lcore_id) {