net: add rte prefix to ether structures
[dpdk.git] / examples / l3fwd / main.c
old mode 100755 (executable)
new mode 100644 (file)
index bef409a..b0a700a
@@ -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-2016 Intel Corporation
  */
 
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <getopt.h>
+#include <signal.h>
+#include <stdbool.h>
 
 #include <rte_common.h>
-#include <rte_common_vect.h>
+#include <rte_vect.h>
 #include <rte_byteorder.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_ip.h>
 #include <rte_tcp.h>
 #include <rte_udp.h>
 #include <rte_string_fns.h>
+#include <rte_cpuflags.h>
 
-#include "main.h"
-
-#define APP_LOOKUP_EXACT_MATCH          0
-#define APP_LOOKUP_LPM                  1
-#define DO_RFC_1812_CHECKS
-
-#ifndef APP_LOOKUP_METHOD
-#define APP_LOOKUP_METHOD             APP_LOOKUP_LPM
-#endif
-
-/*
- *  When set to zero, simple forwaring path is eanbled.
- *  When set to one, optimized forwarding path is enabled.
- *  Note that LPM optimisation path uses SSE4.1 instructions.
- */
-#if ((APP_LOOKUP_METHOD == APP_LOOKUP_LPM) && !defined(__SSE4_1__))
-#define ENABLE_MULTI_BUFFER_OPTIMIZE   0
-#else
-#define ENABLE_MULTI_BUFFER_OPTIMIZE   1
-#endif
-
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
-#include <rte_hash.h>
-#elif (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
-#include <rte_lpm.h>
-#include <rte_lpm6.h>
-#else
-#error "APP_LOOKUP_METHOD set to incorrect value"
-#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 RTE_LOGTYPE_L3FWD RTE_LOGTYPE_USER1
-
-#define MAX_JUMBO_PKT_LEN  9600
-
-#define IPV6_ADDR_LEN 16
-
-#define MEMPOOL_CACHE_SIZE 256
-
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
-
-/*
- * This expression is used to calculate the number of mbufs needed depending on user input, taking
- *  into account memory for rx and tx hardware rings, cache per lcore and mtable per port per lcore.
- *  RTE_MAX is used to ensure that NB_MBUF never goes below a minimum value of 8192
- */
-
-#define NB_MBUF RTE_MAX        (                                                                                                                                       \
-                               (nb_ports*nb_rx_queue*RTE_TEST_RX_DESC_DEFAULT +                                                        \
-                               nb_ports*nb_lcores*MAX_PKT_BURST +                                                                                      \
-                               nb_ports*n_tx_queue*RTE_TEST_TX_DESC_DEFAULT +                                                          \
-                               nb_lcores*MEMPOOL_CACHE_SIZE),                                                                                          \
-                               (unsigned)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 */
-
-/*
- * Try to avoid TX buffering if we have at least MAX_TX_BURST packets to send.
- */
-#define        MAX_TX_BURST    (MAX_PKT_BURST / 2)
-
-#define NB_SOCKETS 8
-
-/* Configure how many packets ahead to prefetch, when reading packets */
-#define PREFETCH_OFFSET        3
+#include <cmdline_parse.h>
+#include <cmdline_parse_etheraddr.h>
 
-/* Used to mark destination port as 'invalid'. */
-#define        BAD_PORT        ((uint16_t)-1)
-
-#define FWDSTEP        4
+#include "l3fwd.h"
 
 /*
  * Configurable number of RX/TX ring descriptors
  */
-#define RTE_TEST_RX_DESC_DEFAULT 128
-#define RTE_TEST_TX_DESC_DEFAULT 512
-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 __m128i val_eth[RTE_MAX_ETHPORTS];
-
-/* replace first 12B of the ethernet header. */
-#define        MASK_ETH        0x3f
-
-/* mask of enabled ports */
-static uint32_t enabled_port_mask = 0;
-static int promiscuous_on = 0; /**< Ports set in promiscuous mode off by default. */
-static int numa_on = 1; /**< NUMA is enabled by default. */
-
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
-static int ipv6 = 0; /**< ipv6 is false by default. */
-#endif
-
-struct mbuf_table {
-       uint16_t len;
-       struct rte_mbuf *m_table[MAX_PKT_BURST];
-};
-
-struct lcore_rx_queue {
-       uint8_t port_id;
-       uint8_t queue_id;
-} __rte_cache_aligned;
+#define RTE_TEST_RX_DESC_DEFAULT 1024
+#define RTE_TEST_TX_DESC_DEFAULT 1024
 
-#define MAX_RX_QUEUE_PER_LCORE 16
 #define MAX_TX_QUEUE_PER_PORT RTE_MAX_ETHPORTS
 #define MAX_RX_QUEUE_PER_PORT 128
 
 #define MAX_LCORE_PARAMS 1024
-struct lcore_params {
-       uint8_t port_id;
-       uint8_t queue_id;
-       uint8_t lcore_id;
-} __rte_cache_aligned;
-
-static struct lcore_params lcore_params_array[MAX_LCORE_PARAMS];
-static struct lcore_params lcore_params_array_default[] = {
-       {0, 0, 2},
-       {0, 1, 2},
-       {0, 2, 2},
-       {1, 0, 2},
-       {1, 1, 2},
-       {1, 2, 2},
-       {2, 0, 2},
-       {3, 0, 3},
-       {3, 1, 3},
-};
-
-static struct lcore_params * lcore_params = lcore_params_array_default;
-static uint16_t nb_lcore_params = sizeof(lcore_params_array_default) /
-                               sizeof(lcore_params_array_default[0]);
-
-static struct rte_eth_conf port_conf = {
-       .rxmode = {
-               .mq_mode = ETH_MQ_RX_RSS,
-               .max_rx_pkt_len = ETHER_MAX_LEN,
-               .split_hdr_size = 0,
-               .header_split   = 0, /**< Header Split disabled */
-               .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 */
-       },
-       .rx_adv_conf = {
-               .rss_conf = {
-                       .rss_key = NULL,
-                       .rss_hf = ETH_RSS_IP,
-               },
-       },
-       .txmode = {
-               .mq_mode = ETH_MQ_TX_NONE,
-       },
-};
-
-static const struct rte_eth_rxconf rx_conf = {
-       .rx_thresh = {
-               .pthresh = RX_PTHRESH,
-               .hthresh = RX_HTHRESH,
-               .wthresh = RX_WTHRESH,
-       },
-       .rx_free_thresh = 32,
-};
-
-static 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 */
-       .txq_flags = (ETH_TXQ_FLAGS_NOMULTSEGS |
-                       ETH_TXQ_FLAGS_NOVLANOFFL |
-                       ETH_TXQ_FLAGS_NOXSUMSCTP |
-                       ETH_TXQ_FLAGS_NOXSUMUDP |
-                       ETH_TXQ_FLAGS_NOXSUMTCP)
-
-};
-
-static struct rte_mempool * pktmbuf_pool[NB_SOCKETS];
-
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
-
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
-#include <rte_hash_crc.h>
-#define DEFAULT_HASH_FUNC       rte_hash_crc
-#else
-#include <rte_jhash.h>
-#define DEFAULT_HASH_FUNC       rte_jhash
-#endif
-
-struct ipv4_5tuple {
-        uint32_t ip_dst;
-        uint32_t ip_src;
-        uint16_t port_dst;
-        uint16_t port_src;
-        uint8_t  proto;
-} __attribute__((__packed__));
-
-union ipv4_5tuple_host {
-       struct {
-               uint8_t  pad0;
-               uint8_t  proto;
-               uint16_t pad1;
-               uint32_t ip_src;
-               uint32_t ip_dst;
-               uint16_t port_src;
-               uint16_t port_dst;
-       };
-       __m128i xmm;
-};
-
-#define XMM_NUM_IN_IPV6_5TUPLE 3
-
-struct ipv6_5tuple {
-        uint8_t  ip_dst[IPV6_ADDR_LEN];
-        uint8_t  ip_src[IPV6_ADDR_LEN];
-        uint16_t port_dst;
-        uint16_t port_src;
-        uint8_t  proto;
-} __attribute__((__packed__));
-
-union ipv6_5tuple_host {
-       struct {
-               uint16_t pad0;
-               uint8_t  proto;
-               uint8_t  pad1;
-               uint8_t  ip_src[IPV6_ADDR_LEN];
-               uint8_t  ip_dst[IPV6_ADDR_LEN];
-               uint16_t port_src;
-               uint16_t port_dst;
-               uint64_t reserve;
-       };
-       __m128i xmm[XMM_NUM_IN_IPV6_5TUPLE];
-};
-
-struct ipv4_l3fwd_route {
-       struct ipv4_5tuple key;
-       uint8_t if_out;
-};
-
-struct ipv6_l3fwd_route {
-       struct ipv6_5tuple key;
-       uint8_t if_out;
-};
-
-static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
-       {{IPv4(101,0,0,0), IPv4(100,10,0,1),  101, 11, IPPROTO_TCP}, 0},
-       {{IPv4(201,0,0,0), IPv4(200,20,0,1),  102, 12, IPPROTO_TCP}, 1},
-       {{IPv4(111,0,0,0), IPv4(100,30,0,1),  101, 11, IPPROTO_TCP}, 2},
-       {{IPv4(211,0,0,0), IPv4(200,40,0,1),  102, 12, IPPROTO_TCP}, 3},
-};
-
-static struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
-       {{
-       {0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-       {0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05},
-       101, 11, IPPROTO_TCP}, 0},
-
-       {{
-       {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-       {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05},
-       102, 12, IPPROTO_TCP}, 1},
-
-       {{
-       {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-       {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05},
-       101, 11, IPPROTO_TCP}, 2},
-
-       {{
-       {0xfe, 0xb0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-       {0xfe, 0xb0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05},
-       102, 12, IPPROTO_TCP}, 3},
-};
-
-typedef struct rte_hash lookup_struct_t;
-static lookup_struct_t *ipv4_l3fwd_lookup_struct[NB_SOCKETS];
-static lookup_struct_t *ipv6_l3fwd_lookup_struct[NB_SOCKETS];
-
-#ifdef RTE_ARCH_X86_64
-/* default to 4 million hash entries (approx) */
-#define L3FWD_HASH_ENTRIES             1024*1024*4
-#else
-/* 32-bit has less address-space for hugepage memory, limit to 1M entries */
-#define L3FWD_HASH_ENTRIES             1024*1024*1
-#endif
-#define HASH_ENTRY_NUMBER_DEFAULT      4
-
-static uint32_t hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
-
-static inline uint32_t
-ipv4_hash_crc(const void *data, __rte_unused uint32_t data_len,
-       uint32_t init_val)
-{
-       const union ipv4_5tuple_host *k;
-       uint32_t t;
-       const uint32_t *p;
-
-       k = data;
-       t = k->proto;
-       p = (const uint32_t *)&k->port_src;
-
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
-       init_val = rte_hash_crc_4byte(t, init_val);
-       init_val = rte_hash_crc_4byte(k->ip_src, init_val);
-       init_val = rte_hash_crc_4byte(k->ip_dst, init_val);
-       init_val = rte_hash_crc_4byte(*p, init_val);
-#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
-       init_val = rte_jhash_1word(t, init_val);
-       init_val = rte_jhash_1word(k->ip_src, init_val);
-       init_val = rte_jhash_1word(k->ip_dst, init_val);
-       init_val = rte_jhash_1word(*p, init_val);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
-       return (init_val);
-}
-
-static inline uint32_t
-ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len, uint32_t init_val)
-{
-       const union ipv6_5tuple_host *k;
-       uint32_t t;
-       const uint32_t *p;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
-       const uint32_t  *ip_src0, *ip_src1, *ip_src2, *ip_src3;
-       const uint32_t  *ip_dst0, *ip_dst1, *ip_dst2, *ip_dst3;
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
-
-       k = data;
-       t = k->proto;
-       p = (const uint32_t *)&k->port_src;
-
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
-       ip_src0 = (const uint32_t *) k->ip_src;
-       ip_src1 = (const uint32_t *)(k->ip_src+4);
-       ip_src2 = (const uint32_t *)(k->ip_src+8);
-       ip_src3 = (const uint32_t *)(k->ip_src+12);
-       ip_dst0 = (const uint32_t *) k->ip_dst;
-       ip_dst1 = (const uint32_t *)(k->ip_dst+4);
-       ip_dst2 = (const uint32_t *)(k->ip_dst+8);
-       ip_dst3 = (const uint32_t *)(k->ip_dst+12);
-       init_val = rte_hash_crc_4byte(t, init_val);
-       init_val = rte_hash_crc_4byte(*ip_src0, init_val);
-       init_val = rte_hash_crc_4byte(*ip_src1, init_val);
-       init_val = rte_hash_crc_4byte(*ip_src2, init_val);
-       init_val = rte_hash_crc_4byte(*ip_src3, init_val);
-       init_val = rte_hash_crc_4byte(*ip_dst0, init_val);
-       init_val = rte_hash_crc_4byte(*ip_dst1, init_val);
-       init_val = rte_hash_crc_4byte(*ip_dst2, init_val);
-       init_val = rte_hash_crc_4byte(*ip_dst3, init_val);
-       init_val = rte_hash_crc_4byte(*p, init_val);
-#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
-       init_val = rte_jhash_1word(t, init_val);
-       init_val = rte_jhash(k->ip_src, sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
-       init_val = rte_jhash(k->ip_dst, sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
-       init_val = rte_jhash_1word(*p, init_val);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
-       return (init_val);
-}
-
-#define IPV4_L3FWD_NUM_ROUTES \
-       (sizeof(ipv4_l3fwd_route_array) / sizeof(ipv4_l3fwd_route_array[0]))
-
-#define IPV6_L3FWD_NUM_ROUTES \
-       (sizeof(ipv6_l3fwd_route_array) / sizeof(ipv6_l3fwd_route_array[0]))
-
-static uint8_t ipv4_l3fwd_out_if[L3FWD_HASH_ENTRIES] __rte_cache_aligned;
-static uint8_t ipv6_l3fwd_out_if[L3FWD_HASH_ENTRIES] __rte_cache_aligned;
-
-#endif
-
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
-struct ipv4_l3fwd_route {
-       uint32_t ip;
-       uint8_t  depth;
-       uint8_t  if_out;
-};
-
-struct ipv6_l3fwd_route {
-       uint8_t ip[16];
-       uint8_t  depth;
-       uint8_t  if_out;
-};
-
-static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
-       {IPv4(1,1,1,0), 24, 0},
-       {IPv4(2,1,1,0), 24, 1},
-       {IPv4(3,1,1,0), 24, 2},
-       {IPv4(4,1,1,0), 24, 3},
-       {IPv4(5,1,1,0), 24, 4},
-       {IPv4(6,1,1,0), 24, 5},
-       {IPv4(7,1,1,0), 24, 6},
-       {IPv4(8,1,1,0), 24, 7},
-};
-
-static struct ipv6_l3fwd_route ipv6_l3fwd_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 IPV4_L3FWD_NUM_ROUTES \
-       (sizeof(ipv4_l3fwd_route_array) / sizeof(ipv4_l3fwd_route_array[0]))
-#define IPV6_L3FWD_NUM_ROUTES \
-       (sizeof(ipv6_l3fwd_route_array) / sizeof(ipv6_l3fwd_route_array[0]))
-
-#define IPV4_L3FWD_LPM_MAX_RULES         1024
-#define IPV6_L3FWD_LPM_MAX_RULES         1024
-#define IPV6_L3FWD_LPM_NUMBER_TBL8S (1 << 16)
-
-typedef struct rte_lpm lookup_struct_t;
-typedef struct rte_lpm6 lookup6_struct_t;
-static lookup_struct_t *ipv4_l3fwd_lookup_struct[NB_SOCKETS];
-static lookup6_struct_t *ipv6_l3fwd_lookup_struct[NB_SOCKETS];
-#endif
-
-struct lcore_conf {
-       uint16_t n_rx_queue;
-       struct lcore_rx_queue rx_queue_list[MAX_RX_QUEUE_PER_LCORE];
-       uint16_t tx_queue_id[RTE_MAX_ETHPORTS];
-       struct mbuf_table tx_mbufs[RTE_MAX_ETHPORTS];
-       lookup_struct_t * ipv4_lookup_struct;
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
-       lookup6_struct_t * ipv6_lookup_struct;
-#else
-       lookup_struct_t * ipv6_lookup_struct;
-#endif
-} __rte_cache_aligned;
-
-static struct lcore_conf lcore_conf[RTE_MAX_LCORE];
-
-/* Send burst of packets on an output interface */
-static inline int
-send_burst(struct lcore_conf *qconf, uint16_t n, uint8_t port)
-{
-       struct rte_mbuf **m_table;
-       int ret;
-       uint16_t queueid;
-
-       queueid = qconf->tx_queue_id[port];
-       m_table = (struct rte_mbuf **)qconf->tx_mbufs[port].m_table;
-
-       ret = rte_eth_tx_burst(port, queueid, m_table, n);
-       if (unlikely(ret < n)) {
-               do {
-                       rte_pktmbuf_free(m_table[ret]);
-               } while (++ret < n);
-       }
-
-       return 0;
-}
-
-/* Enqueue a single packet, and send burst if queue is filled */
-static inline int
-send_single_packet(struct rte_mbuf *m, uint8_t port)
-{
-       uint32_t lcore_id;
-       uint16_t len;
-       struct lcore_conf *qconf;
-
-       lcore_id = rte_lcore_id();
-
-       qconf = &lcore_conf[lcore_id];
-       len = qconf->tx_mbufs[port].len;
-       qconf->tx_mbufs[port].m_table[len] = m;
-       len++;
-
-       /* enough pkts to be sent */
-       if (unlikely(len == MAX_PKT_BURST)) {
-               send_burst(qconf, MAX_PKT_BURST, port);
-               len = 0;
-       }
-
-       qconf->tx_mbufs[port].len = len;
-       return 0;
-}
-
-static inline __attribute__((always_inline)) void
-send_packetsx4(struct lcore_conf *qconf, uint8_t port,
-       struct rte_mbuf *m[], uint32_t num)
-{
-       uint32_t len, j, n;
-
-       len = qconf->tx_mbufs[port].len;
-
-       /*
-        * If TX buffer for that queue is empty, and we have enough packets,
-        * then send them straightway.
-        */
-       if (num >= MAX_TX_BURST && len == 0) {
-               n = rte_eth_tx_burst(port, qconf->tx_queue_id[port], m, num);
-               if (unlikely(n < num)) {
-                       do {
-                               rte_pktmbuf_free(m[n]);
-                       } while (++n < num);
-               }
-               return;
-       }
-
-       /*
-        * Put packets into TX buffer for that queue.
-        */
-
-       n = len + num;
-       n = (n > MAX_PKT_BURST) ? MAX_PKT_BURST - len : num;
-
-       j = 0;
-       switch (n % FWDSTEP) {
-       while (j < n) {
-       case 0:
-               qconf->tx_mbufs[port].m_table[len + j] = m[j];
-               j++;
-       case 3:
-               qconf->tx_mbufs[port].m_table[len + j] = m[j];
-               j++;
-       case 2:
-               qconf->tx_mbufs[port].m_table[len + j] = m[j];
-               j++;
-       case 1:
-               qconf->tx_mbufs[port].m_table[len + j] = m[j];
-               j++;
-       }
-       }
-
-       len += n;
-
-       /* enough pkts to be sent */
-       if (unlikely(len == MAX_PKT_BURST)) {
-
-               send_burst(qconf, MAX_PKT_BURST, port);
-
-               /* copy rest of the packets into the TX buffer. */
-               len = num - n;
-               j = 0;
-               switch (len % FWDSTEP) {
-               while (j < len) {
-               case 0:
-                       qconf->tx_mbufs[port].m_table[j] = m[n + j];
-                       j++;
-               case 3:
-                       qconf->tx_mbufs[port].m_table[j] = m[n + j];
-                       j++;
-               case 2:
-                       qconf->tx_mbufs[port].m_table[j] = m[n + j];
-                       j++;
-               case 1:
-                       qconf->tx_mbufs[port].m_table[j] = m[n + j];
-                       j++;
-               }
-               }
-       }
-
-       qconf->tx_mbufs[port].len = len;
-}
-
-#ifdef DO_RFC_1812_CHECKS
-static inline int
-is_valid_ipv4_pkt(struct ipv4_hdr *pkt, uint32_t link_len)
-{
-       /* From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2 */
-       /*
-        * 1. The packet length reported by the Link Layer must be large
-        * enough to hold the minimum length legal IP datagram (20 bytes).
-        */
-       if (link_len < sizeof(struct ipv4_hdr))
-               return -1;
-
-       /* 2. The IP checksum must be correct. */
-       /* this is checked in H/W */
-
-       /*
-        * 3. The IP version number must be 4. If the version number is not 4
-        * then the packet may be another version of IP, such as IPng or
-        * ST-II.
-        */
-       if (((pkt->version_ihl) >> 4) != 4)
-               return -3;
-       /*
-        * 4. The IP header length field must be large enough to hold the
-        * minimum length legal IP datagram (20 bytes = 5 words).
-        */
-       if ((pkt->version_ihl & 0xf) < 5)
-               return -4;
-
-       /*
-        * 5. The IP total length field must be large enough to hold the IP
-        * datagram header, whose length is specified in the IP header length
-        * field.
-        */
-       if (rte_cpu_to_be_16(pkt->total_length) < sizeof(struct ipv4_hdr))
-               return -5;
-
-       return 0;
-}
-#endif
-
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
-
-static __m128i mask0;
-static __m128i mask1;
-static __m128i mask2;
-static inline uint8_t
-get_ipv4_dst_port(void *ipv4_hdr, uint8_t portid, lookup_struct_t * ipv4_l3fwd_lookup_struct)
-{
-       int ret = 0;
-       union ipv4_5tuple_host key;
-
-       ipv4_hdr = (uint8_t *)ipv4_hdr + offsetof(struct ipv4_hdr, time_to_live);
-       __m128i data = _mm_loadu_si128((__m128i*)(ipv4_hdr));
-       /* Get 5 tuple: dst port, src port, dst IP address, src IP address and protocol */
-       key.xmm = _mm_and_si128(data, mask0);
-       /* Find destination port */
-       ret = rte_hash_lookup(ipv4_l3fwd_lookup_struct, (const void *)&key);
-       return (uint8_t)((ret < 0)? portid : ipv4_l3fwd_out_if[ret]);
-}
-
-static inline uint8_t
-get_ipv6_dst_port(void *ipv6_hdr,  uint8_t portid, lookup_struct_t * ipv6_l3fwd_lookup_struct)
-{
-       int ret = 0;
-       union ipv6_5tuple_host key;
-
-       ipv6_hdr = (uint8_t *)ipv6_hdr + offsetof(struct ipv6_hdr, payload_len);
-       __m128i data0 = _mm_loadu_si128((__m128i*)(ipv6_hdr));
-       __m128i data1 = _mm_loadu_si128((__m128i*)(((uint8_t*)ipv6_hdr)+sizeof(__m128i)));
-       __m128i data2 = _mm_loadu_si128((__m128i*)(((uint8_t*)ipv6_hdr)+sizeof(__m128i)+sizeof(__m128i)));
-       /* Get part of 5 tuple: src IP address lower 96 bits and protocol */
-       key.xmm[0] = _mm_and_si128(data0, mask1);
-       /* Get part of 5 tuple: dst IP address lower 96 bits and src IP address higher 32 bits */
-       key.xmm[1] = data1;
-       /* Get part of 5 tuple: dst port and src port and dst IP address higher 32 bits */
-       key.xmm[2] = _mm_and_si128(data2, mask2);
-
-       /* Find destination port */
-       ret = rte_hash_lookup(ipv6_l3fwd_lookup_struct, (const void *)&key);
-       return (uint8_t)((ret < 0)? portid : ipv6_l3fwd_out_if[ret]);
-}
-#endif
-
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
-
-static inline uint8_t
-get_ipv4_dst_port(void *ipv4_hdr,  uint8_t portid, lookup_struct_t * ipv4_l3fwd_lookup_struct)
-{
-       uint8_t next_hop;
-
-       return (uint8_t) ((rte_lpm_lookup(ipv4_l3fwd_lookup_struct,
-               rte_be_to_cpu_32(((struct ipv4_hdr *)ipv4_hdr)->dst_addr),
-               &next_hop) == 0) ? next_hop : portid);
-}
 
-static inline uint8_t
-get_ipv6_dst_port(void *ipv6_hdr,  uint8_t portid, lookup6_struct_t * ipv6_l3fwd_lookup_struct)
-{
-       uint8_t next_hop;
-       return (uint8_t) ((rte_lpm6_lookup(ipv6_l3fwd_lookup_struct,
-                       ((struct ipv6_hdr*)ipv6_hdr)->dst_addr, &next_hop) == 0)?
-                       next_hop : portid);
-}
-#endif
-
-#if ((APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) && \
-       (ENABLE_MULTI_BUFFER_OPTIMIZE == 1))
-static inline void l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconf);
-
-#define MASK_ALL_PKTS    0xf
-#define EXECLUDE_1ST_PKT 0xe
-#define EXECLUDE_2ND_PKT 0xd
-#define EXECLUDE_3RD_PKT 0xb
-#define EXECLUDE_4TH_PKT 0x7
-
-static inline void
-simple_ipv4_fwd_4pkts(struct rte_mbuf* m[4], uint8_t portid, struct lcore_conf *qconf)
-{
-       struct ether_hdr *eth_hdr[4];
-       struct ipv4_hdr *ipv4_hdr[4];
-       void *d_addr_bytes[4];
-       uint8_t dst_port[4];
-       int32_t ret[4];
-       union ipv4_5tuple_host key[4];
-       __m128i data[4];
-
-       eth_hdr[0] = rte_pktmbuf_mtod(m[0], struct ether_hdr *);
-       eth_hdr[1] = rte_pktmbuf_mtod(m[1], struct ether_hdr *);
-       eth_hdr[2] = rte_pktmbuf_mtod(m[2], struct ether_hdr *);
-       eth_hdr[3] = rte_pktmbuf_mtod(m[3], struct ether_hdr *);
-
-       /* Handle IPv4 headers.*/
-       ipv4_hdr[0] = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m[0], unsigned char *) +
-                       sizeof(struct ether_hdr));
-       ipv4_hdr[1] = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m[1], unsigned char *) +
-                       sizeof(struct ether_hdr));
-       ipv4_hdr[2] = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m[2], unsigned char *) +
-                       sizeof(struct ether_hdr));
-       ipv4_hdr[3] = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m[3], unsigned char *) +
-                       sizeof(struct ether_hdr));
-
-#ifdef DO_RFC_1812_CHECKS
-       /* Check to make sure the packet is valid (RFC1812) */
-       uint8_t valid_mask = MASK_ALL_PKTS;
-       if (is_valid_ipv4_pkt(ipv4_hdr[0], m[0]->pkt.pkt_len) < 0) {
-               rte_pktmbuf_free(m[0]);
-               valid_mask &= EXECLUDE_1ST_PKT;
-       }
-       if (is_valid_ipv4_pkt(ipv4_hdr[1], m[1]->pkt.pkt_len) < 0) {
-               rte_pktmbuf_free(m[1]);
-               valid_mask &= EXECLUDE_2ND_PKT;
-       }
-       if (is_valid_ipv4_pkt(ipv4_hdr[2], m[2]->pkt.pkt_len) < 0) {
-               rte_pktmbuf_free(m[2]);
-               valid_mask &= EXECLUDE_3RD_PKT;
-       }
-       if (is_valid_ipv4_pkt(ipv4_hdr[3], m[3]->pkt.pkt_len) < 0) {
-               rte_pktmbuf_free(m[3]);
-               valid_mask &= EXECLUDE_4TH_PKT;
-       }
-       if (unlikely(valid_mask != MASK_ALL_PKTS)) {
-               if (valid_mask == 0){
-                       return;
-               } else {
-                       uint8_t i = 0;
-                       for (i = 0; i < 4; i++) {
-                               if ((0x1 << i) & valid_mask) {
-                                       l3fwd_simple_forward(m[i], portid, qconf);
-                               }
-                       }
-                       return;
-               }
-       }
-#endif // End of #ifdef DO_RFC_1812_CHECKS
-
-       data[0] = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m[0], unsigned char *) +
-               sizeof(struct ether_hdr) + offsetof(struct ipv4_hdr, time_to_live)));
-       data[1] = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m[1], unsigned char *) +
-               sizeof(struct ether_hdr) + offsetof(struct ipv4_hdr, time_to_live)));
-       data[2] = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m[2], unsigned char *) +
-               sizeof(struct ether_hdr) + offsetof(struct ipv4_hdr, time_to_live)));
-       data[3] = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m[3], unsigned char *) +
-               sizeof(struct ether_hdr) + offsetof(struct ipv4_hdr, time_to_live)));
-
-       key[0].xmm = _mm_and_si128(data[0], mask0);
-       key[1].xmm = _mm_and_si128(data[1], mask0);
-       key[2].xmm = _mm_and_si128(data[2], mask0);
-       key[3].xmm = _mm_and_si128(data[3], mask0);
-
-       const void *key_array[4] = {&key[0], &key[1], &key[2],&key[3]};
-       rte_hash_lookup_multi(qconf->ipv4_lookup_struct, &key_array[0], 4, ret);
-       dst_port[0] = (uint8_t) ((ret[0] < 0) ? portid : ipv4_l3fwd_out_if[ret[0]]);
-       dst_port[1] = (uint8_t) ((ret[1] < 0) ? portid : ipv4_l3fwd_out_if[ret[1]]);
-       dst_port[2] = (uint8_t) ((ret[2] < 0) ? portid : ipv4_l3fwd_out_if[ret[2]]);
-       dst_port[3] = (uint8_t) ((ret[3] < 0) ? portid : ipv4_l3fwd_out_if[ret[3]]);
-
-       if (dst_port[0] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[0]) == 0)
-               dst_port[0] = portid;
-       if (dst_port[1] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[1]) == 0)
-               dst_port[1] = portid;
-       if (dst_port[2] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[2]) == 0)
-               dst_port[2] = portid;
-       if (dst_port[3] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[3]) == 0)
-               dst_port[3] = portid;
-
-       /* 02:00:00:00:00:xx */
-       d_addr_bytes[0] = &eth_hdr[0]->d_addr.addr_bytes[0];
-       d_addr_bytes[1] = &eth_hdr[1]->d_addr.addr_bytes[0];
-       d_addr_bytes[2] = &eth_hdr[2]->d_addr.addr_bytes[0];
-       d_addr_bytes[3] = &eth_hdr[3]->d_addr.addr_bytes[0];
-       *((uint64_t *)d_addr_bytes[0]) = 0x000000000002 + ((uint64_t)dst_port[0] << 40);
-       *((uint64_t *)d_addr_bytes[1]) = 0x000000000002 + ((uint64_t)dst_port[1] << 40);
-       *((uint64_t *)d_addr_bytes[2]) = 0x000000000002 + ((uint64_t)dst_port[2] << 40);
-       *((uint64_t *)d_addr_bytes[3]) = 0x000000000002 + ((uint64_t)dst_port[3] << 40);
-
-#ifdef DO_RFC_1812_CHECKS
-       /* Update time to live and header checksum */
-       --(ipv4_hdr[0]->time_to_live);
-       --(ipv4_hdr[1]->time_to_live);
-       --(ipv4_hdr[2]->time_to_live);
-       --(ipv4_hdr[3]->time_to_live);
-       ++(ipv4_hdr[0]->hdr_checksum);
-       ++(ipv4_hdr[1]->hdr_checksum);
-       ++(ipv4_hdr[2]->hdr_checksum);
-       ++(ipv4_hdr[3]->hdr_checksum);
-#endif
-
-       /* src addr */
-       ether_addr_copy(&ports_eth_addr[dst_port[0]], &eth_hdr[0]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[1]], &eth_hdr[1]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[2]], &eth_hdr[2]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[3]], &eth_hdr[3]->s_addr);
-
-       send_single_packet(m[0], (uint8_t)dst_port[0]);
-       send_single_packet(m[1], (uint8_t)dst_port[1]);
-       send_single_packet(m[2], (uint8_t)dst_port[2]);
-       send_single_packet(m[3], (uint8_t)dst_port[3]);
-
-}
-
-static inline void get_ipv6_5tuple(struct rte_mbuf* m0, __m128i mask0, __m128i mask1,
-                                union ipv6_5tuple_host * key)
-{
-        __m128i tmpdata0 = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m0, unsigned char *)
-                       + sizeof(struct ether_hdr) + offsetof(struct ipv6_hdr, payload_len)));
-        __m128i tmpdata1 = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m0, unsigned char *)
-                       + sizeof(struct ether_hdr) + offsetof(struct ipv6_hdr, payload_len)
-                       +  sizeof(__m128i)));
-        __m128i tmpdata2 = _mm_loadu_si128((__m128i*)(rte_pktmbuf_mtod(m0, unsigned char *)
-                       + sizeof(struct ether_hdr) + offsetof(struct ipv6_hdr, payload_len)
-                       + sizeof(__m128i) + sizeof(__m128i)));
-        key->xmm[0] = _mm_and_si128(tmpdata0, mask0);
-        key->xmm[1] = tmpdata1;
-        key->xmm[2] = _mm_and_si128(tmpdata2, mask1);
-       return;
-}
-
-static inline void
-simple_ipv6_fwd_4pkts(struct rte_mbuf* m[4], uint8_t portid, struct lcore_conf *qconf)
-{
-       struct ether_hdr *eth_hdr[4];
-       __attribute__((unused)) struct ipv6_hdr *ipv6_hdr[4];
-       void *d_addr_bytes[4];
-       uint8_t dst_port[4];
-       int32_t ret[4];
-       union ipv6_5tuple_host key[4];
-
-       eth_hdr[0] = rte_pktmbuf_mtod(m[0], struct ether_hdr *);
-       eth_hdr[1] = rte_pktmbuf_mtod(m[1], struct ether_hdr *);
-       eth_hdr[2] = rte_pktmbuf_mtod(m[2], struct ether_hdr *);
-       eth_hdr[3] = rte_pktmbuf_mtod(m[3], struct ether_hdr *);
-
-       /* Handle IPv6 headers.*/
-       ipv6_hdr[0] = (struct ipv6_hdr *)(rte_pktmbuf_mtod(m[0], unsigned char *) +
-                       sizeof(struct ether_hdr));
-       ipv6_hdr[1] = (struct ipv6_hdr *)(rte_pktmbuf_mtod(m[1], unsigned char *) +
-                       sizeof(struct ether_hdr));
-       ipv6_hdr[2] = (struct ipv6_hdr *)(rte_pktmbuf_mtod(m[2], unsigned char *) +
-                       sizeof(struct ether_hdr));
-       ipv6_hdr[3] = (struct ipv6_hdr *)(rte_pktmbuf_mtod(m[3], unsigned char *) +
-                       sizeof(struct ether_hdr));
-
-       get_ipv6_5tuple(m[0], mask1, mask2, &key[0]);
-       get_ipv6_5tuple(m[1], mask1, mask2, &key[1]);
-       get_ipv6_5tuple(m[2], mask1, mask2, &key[2]);
-       get_ipv6_5tuple(m[3], mask1, mask2, &key[3]);
-
-       const void *key_array[4] = {&key[0], &key[1], &key[2],&key[3]};
-       rte_hash_lookup_multi(qconf->ipv6_lookup_struct, &key_array[0], 4, ret);
-       dst_port[0] = (uint8_t) ((ret[0] < 0)? portid:ipv6_l3fwd_out_if[ret[0]]);
-       dst_port[1] = (uint8_t) ((ret[1] < 0)? portid:ipv6_l3fwd_out_if[ret[1]]);
-       dst_port[2] = (uint8_t) ((ret[2] < 0)? portid:ipv6_l3fwd_out_if[ret[2]]);
-       dst_port[3] = (uint8_t) ((ret[3] < 0)? portid:ipv6_l3fwd_out_if[ret[3]]);
-
-       if (dst_port[0] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[0]) == 0)
-               dst_port[0] = portid;
-       if (dst_port[1] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[1]) == 0)
-               dst_port[1] = portid;
-       if (dst_port[2] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[2]) == 0)
-               dst_port[2] = portid;
-       if (dst_port[3] >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port[3]) == 0)
-               dst_port[3] = portid;
-
-       /* 02:00:00:00:00:xx */
-       d_addr_bytes[0] = &eth_hdr[0]->d_addr.addr_bytes[0];
-       d_addr_bytes[1] = &eth_hdr[1]->d_addr.addr_bytes[0];
-       d_addr_bytes[2] = &eth_hdr[2]->d_addr.addr_bytes[0];
-       d_addr_bytes[3] = &eth_hdr[3]->d_addr.addr_bytes[0];
-       *((uint64_t *)d_addr_bytes[0]) = 0x000000000002 + ((uint64_t)dst_port[0] << 40);
-       *((uint64_t *)d_addr_bytes[1]) = 0x000000000002 + ((uint64_t)dst_port[1] << 40);
-       *((uint64_t *)d_addr_bytes[2]) = 0x000000000002 + ((uint64_t)dst_port[2] << 40);
-       *((uint64_t *)d_addr_bytes[3]) = 0x000000000002 + ((uint64_t)dst_port[3] << 40);
-
-       /* src addr */
-       ether_addr_copy(&ports_eth_addr[dst_port[0]], &eth_hdr[0]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[1]], &eth_hdr[1]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[2]], &eth_hdr[2]->s_addr);
-       ether_addr_copy(&ports_eth_addr[dst_port[3]], &eth_hdr[3]->s_addr);
-
-       send_single_packet(m[0], (uint8_t)dst_port[0]);
-       send_single_packet(m[1], (uint8_t)dst_port[1]);
-       send_single_packet(m[2], (uint8_t)dst_port[2]);
-       send_single_packet(m[3], (uint8_t)dst_port[3]);
-
-}
-#endif /* APP_LOOKUP_METHOD */
-
-static inline __attribute__((always_inline)) void
-l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qconf)
-{
-       struct ether_hdr *eth_hdr;
-       struct ipv4_hdr *ipv4_hdr;
-       void *d_addr_bytes;
-       uint8_t dst_port;
-
-       eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
-
-       if (m->ol_flags & PKT_RX_IPV4_HDR) {
-               /* Handle IPv4 headers.*/
-               ipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char *) +
-                               sizeof(struct ether_hdr));
-
-#ifdef DO_RFC_1812_CHECKS
-               /* Check to make sure the packet is valid (RFC1812) */
-               if (is_valid_ipv4_pkt(ipv4_hdr, m->pkt.pkt_len) < 0) {
-                       rte_pktmbuf_free(m);
-                       return;
-               }
-#endif
-
-                dst_port = get_ipv4_dst_port(ipv4_hdr, portid,
-                       qconf->ipv4_lookup_struct);
-               if (dst_port >= RTE_MAX_ETHPORTS ||
-                               (enabled_port_mask & 1 << dst_port) == 0)
-                       dst_port = portid;
-
-               /* 02:00:00:00:00:xx */
-               d_addr_bytes = &eth_hdr->d_addr.addr_bytes[0];
-               *((uint64_t *)d_addr_bytes) = ETHER_LOCAL_ADMIN_ADDR +
-                       ((uint64_t)dst_port << 40);
-
-#ifdef DO_RFC_1812_CHECKS
-               /* Update time to live and header checksum */
-               --(ipv4_hdr->time_to_live);
-               ++(ipv4_hdr->hdr_checksum);
-#endif
-
-               /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
-
-               send_single_packet(m, dst_port);
-
-       } else {
-               /* Handle IPv6 headers.*/
-               struct ipv6_hdr *ipv6_hdr;
-
-               ipv6_hdr = (struct ipv6_hdr *)(rte_pktmbuf_mtod(m, unsigned char *) +
-                               sizeof(struct ether_hdr));
-
-               dst_port = get_ipv6_dst_port(ipv6_hdr, portid, qconf->ipv6_lookup_struct);
-
-               if (dst_port >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port) == 0)
-                       dst_port = portid;
-
-               /* 02:00:00:00:00:xx */
-               d_addr_bytes = &eth_hdr->d_addr.addr_bytes[0];
-               *((uint64_t *)d_addr_bytes) = ETHER_LOCAL_ADMIN_ADDR +
-                       ((uint64_t)dst_port << 40);
-
-               /* src addr */
-               ether_addr_copy(&ports_eth_addr[dst_port], &eth_hdr->s_addr);
-
-               send_single_packet(m, dst_port);
-       }
-
-}
-
-#ifdef DO_RFC_1812_CHECKS
-
-#define        IPV4_MIN_VER_IHL        0x45
-#define        IPV4_MAX_VER_IHL        0x4f
-#define        IPV4_MAX_VER_IHL_DIFF   (IPV4_MAX_VER_IHL - IPV4_MIN_VER_IHL)
-
-/* Minimum value of IPV4 total length (20B) in network byte order. */
-#define        IPV4_MIN_LEN_BE (sizeof(struct ipv4_hdr) << 8)
-
-/*
- * From http://www.rfc-editor.org/rfc/rfc1812.txt section 5.2.2:
- * - The IP version number must be 4.
- * - The IP header length field must be large enough to hold the
- *    minimum length legal IP datagram (20 bytes = 5 words).
- * - The IP total length field must be large enough to hold the IP
- *   datagram header, whose length is specified in the IP header length
- *   field.
- * If we encounter invalid IPV4 packet, then set destination port for it
- * to BAD_PORT value.
- */
-static inline __attribute__((always_inline)) void
-rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags)
-{
-       uint8_t ihl;
-
-       if ((flags & PKT_RX_IPV4_HDR) != 0) {
-
-               ihl = ipv4_hdr->version_ihl - IPV4_MIN_VER_IHL;
-
-               ipv4_hdr->time_to_live--;
-               ipv4_hdr->hdr_checksum++;
-
-               if (ihl > IPV4_MAX_VER_IHL_DIFF ||
-                               ((uint8_t)ipv4_hdr->total_length == 0 &&
-                               ipv4_hdr->total_length < IPV4_MIN_LEN_BE)) {
-                       dp[0] = BAD_PORT;
-               }
-       }
-}
-
-#else
-#define        rfc1812_process(mb, dp) do { } while (0)
-#endif /* DO_RFC_1812_CHECKS */
-
-
-#if ((APP_LOOKUP_METHOD == APP_LOOKUP_LPM) && \
-       (ENABLE_MULTI_BUFFER_OPTIMIZE == 1))
-
-static inline __attribute__((always_inline)) uint16_t
-get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,
-       uint32_t dst_ipv4, uint8_t portid)
-{
-       uint8_t next_hop;
-       struct ipv6_hdr *ipv6_hdr;
-       struct ether_hdr *eth_hdr;
-
-       if (pkt->ol_flags & PKT_RX_IPV4_HDR) {
-               if (rte_lpm_lookup(qconf->ipv4_lookup_struct, dst_ipv4,
-                               &next_hop) != 0)
-                       next_hop = portid;
-       } else if (pkt->ol_flags & PKT_RX_IPV6_HDR) {
-               eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
-               ipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);
-               if (rte_lpm6_lookup(qconf->ipv6_lookup_struct,
-                               ipv6_hdr->dst_addr, &next_hop) != 0)
-                       next_hop = portid;
-       } else {
-               next_hop = portid;
-       }
-
-       return next_hop;
-}
-
-static inline void
-process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt,
-       uint16_t *dst_port, uint8_t portid)
-{
-       struct ether_hdr *eth_hdr;
-       struct ipv4_hdr *ipv4_hdr;
-       uint32_t dst_ipv4;
-       uint16_t dp;
-       __m128i te, ve;
-
-       eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
-       ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
-
-       dst_ipv4 = ipv4_hdr->dst_addr;
-       dst_ipv4 = rte_be_to_cpu_32(dst_ipv4);
-       dp = get_dst_port(qconf, pkt, dst_ipv4, portid);
-
-       te = _mm_load_si128((__m128i *)eth_hdr);
-       ve = val_eth[dp];
-
-       dst_port[0] = dp;
-       rfc1812_process(ipv4_hdr, dst_port, pkt->ol_flags);
-
-       te =  _mm_blend_epi16(te, ve, MASK_ETH);
-       _mm_store_si128((__m128i *)eth_hdr, te);
-}
-
-/*
- * Read ol_flags and destination IPV4 addresses from 4 mbufs.
- */
-static inline void
-processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag)
-{
-       struct ipv4_hdr *ipv4_hdr;
-       struct ether_hdr *eth_hdr;
-       uint32_t x0, x1, x2, x3;
-
-       eth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *);
-       ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
-       x0 = ipv4_hdr->dst_addr;
-       flag[0] = pkt[0]->ol_flags & PKT_RX_IPV4_HDR;
-
-       eth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *);
-       ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
-       x1 = ipv4_hdr->dst_addr;
-       flag[0] &= pkt[1]->ol_flags;
-
-       eth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *);
-       ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
-       x2 = ipv4_hdr->dst_addr;
-       flag[0] &= pkt[2]->ol_flags;
-
-       eth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *);
-       ipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
-       x3 = ipv4_hdr->dst_addr;
-       flag[0] &= pkt[3]->ol_flags;
-
-       dip[0] = _mm_set_epi32(x3, x2, x1, x0);
-}
-
-/*
- * Lookup into LPM for destination port.
- * If lookup fails, use incoming port (portid) as destination port.
- */
-static inline void
-processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag,
-       uint8_t portid, struct rte_mbuf *pkt[FWDSTEP], uint16_t dprt[FWDSTEP])
-{
-       rte_xmm_t dst;
-       const  __m128i bswap_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, 11,
-                                               4, 5, 6, 7, 0, 1, 2, 3);
-
-       /* Byte swap 4 IPV4 addresses. */
-       dip = _mm_shuffle_epi8(dip, bswap_mask);
-
-       /* if all 4 packets are IPV4. */
-       if (likely(flag != 0)) {
-               rte_lpm_lookupx4(qconf->ipv4_lookup_struct, dip, dprt, portid);
-       } else {
-               dst.m = dip;
-               dprt[0] = get_dst_port(qconf, pkt[0], dst.u32[0], portid);
-               dprt[1] = get_dst_port(qconf, pkt[1], dst.u32[1], portid);
-               dprt[2] = get_dst_port(qconf, pkt[2], dst.u32[2], portid);
-               dprt[3] = get_dst_port(qconf, pkt[3], dst.u32[3], portid);
-       }
-}
-
-/*
- * Update source and destination MAC addresses in the ethernet header.
- * Perform RFC1812 checks and updates for IPV4 packets.
- */
-static inline void
-processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])
-{
-       __m128i te[FWDSTEP];
-       __m128i ve[FWDSTEP];
-       __m128i *p[FWDSTEP];
-
-       p[0] = (rte_pktmbuf_mtod(pkt[0], __m128i *));
-       p[1] = (rte_pktmbuf_mtod(pkt[1], __m128i *));
-       p[2] = (rte_pktmbuf_mtod(pkt[2], __m128i *));
-       p[3] = (rte_pktmbuf_mtod(pkt[3], __m128i *));
-
-       ve[0] = val_eth[dst_port[0]];
-       te[0] = _mm_load_si128(p[0]);
-
-       ve[1] = val_eth[dst_port[1]];
-       te[1] = _mm_load_si128(p[1]);
-
-       ve[2] = val_eth[dst_port[2]];
-       te[2] = _mm_load_si128(p[2]);
-
-       ve[3] = val_eth[dst_port[3]];
-       te[3] = _mm_load_si128(p[3]);
-
-       /* Update first 12 bytes, keep rest bytes intact. */
-       te[0] =  _mm_blend_epi16(te[0], ve[0], MASK_ETH);
-       te[1] =  _mm_blend_epi16(te[1], ve[1], MASK_ETH);
-       te[2] =  _mm_blend_epi16(te[2], ve[2], MASK_ETH);
-       te[3] =  _mm_blend_epi16(te[3], ve[3], MASK_ETH);
-
-       _mm_store_si128(p[0], te[0]);
-       _mm_store_si128(p[1], te[1]);
-       _mm_store_si128(p[2], te[2]);
-       _mm_store_si128(p[3], te[3]);
-
-       rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[0] + 1),
-               &dst_port[0], pkt[0]->ol_flags);
-       rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[1] + 1),
-               &dst_port[1], pkt[1]->ol_flags);
-       rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[2] + 1),
-               &dst_port[2], pkt[2]->ol_flags);
-       rfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[3] + 1),
-               &dst_port[3], pkt[3]->ol_flags);
-}
-
-/*
- * We group consecutive packets with the same destionation port into one burst.
- * To avoid extra latency this is done together with some other packet
- * processing, but after we made a final decision about packet's destination.
- * To do this we maintain:
- * pnum - array of number of consecutive packets with the same dest port for
- * each packet in the input burst.
- * lp - pointer to the last updated element in the pnum.
- * dlp - dest port value lp corresponds to.
- */
-
-#define        GRPSZ   (1 << FWDSTEP)
-#define        GRPMSK  (GRPSZ - 1)
-
-#define GROUP_PORT_STEP(dlp, dcp, lp, pn, idx) do { \
-       if (likely((dlp) == (dcp)[(idx)])) {         \
-               (lp)[0]++;                           \
-       } else {                                     \
-               (dlp) = (dcp)[idx];                  \
-               (lp) = (pn) + (idx);                 \
-               (lp)[0] = 1;                         \
-       }                                            \
-} while (0)
-
-/*
- * Group consecutive packets with the same destination port in bursts of 4.
- * Suppose we have array of destionation ports:
- * dst_port[] = {a, b, c, d,, e, ... }
- * dp1 should contain: <a, b, c, d>, dp2: <b, c, d, e>.
- * We doing 4 comparisions at once and the result is 4 bit mask.
- * This mask is used as an index into prebuild array of pnum values.
- */
-static inline uint16_t *
-port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, __m128i dp1, __m128i dp2)
-{
-       static const struct {
-               uint64_t pnum; /* prebuild 4 values for pnum[]. */
-               int32_t  idx;  /* index for new last updated elemnet. */
-               uint16_t lpv;  /* add value to the last updated element. */
-       } gptbl[GRPSZ] = {
-       {
-               /* 0: a != b, b != c, c != d, d != e */
-               .pnum = UINT64_C(0x0001000100010001),
-               .idx = 4,
-               .lpv = 0,
-       },
-       {
-               /* 1: a == b, b != c, c != d, d != e */
-               .pnum = UINT64_C(0x0001000100010002),
-               .idx = 4,
-               .lpv = 1,
-       },
-       {
-               /* 2: a != b, b == c, c != d, d != e */
-               .pnum = UINT64_C(0x0001000100020001),
-               .idx = 4,
-               .lpv = 0,
-       },
-       {
-               /* 3: a == b, b == c, c != d, d != e */
-               .pnum = UINT64_C(0x0001000100020003),
-               .idx = 4,
-               .lpv = 2,
-       },
-       {
-               /* 4: a != b, b != c, c == d, d != e */
-               .pnum = UINT64_C(0x0001000200010001),
-               .idx = 4,
-               .lpv = 0,
-       },
-       {
-               /* 5: a == b, b != c, c == d, d != e */
-               .pnum = UINT64_C(0x0001000200010002),
-               .idx = 4,
-               .lpv = 1,
-       },
-       {
-               /* 6: a != b, b == c, c == d, d != e */
-               .pnum = UINT64_C(0x0001000200030001),
-               .idx = 4,
-               .lpv = 0,
-       },
-       {
-               /* 7: a == b, b == c, c == d, d != e */
-               .pnum = UINT64_C(0x0001000200030004),
-               .idx = 4,
-               .lpv = 3,
-       },
-       {
-               /* 8: a != b, b != c, c != d, d == e */
-               .pnum = UINT64_C(0x0002000100010001),
-               .idx = 3,
-               .lpv = 0,
-       },
-       {
-               /* 9: a == b, b != c, c != d, d == e */
-               .pnum = UINT64_C(0x0002000100010002),
-               .idx = 3,
-               .lpv = 1,
-       },
-       {
-               /* 0xa: a != b, b == c, c != d, d == e */
-               .pnum = UINT64_C(0x0002000100020001),
-               .idx = 3,
-               .lpv = 0,
-       },
-       {
-               /* 0xb: a == b, b == c, c != d, d == e */
-               .pnum = UINT64_C(0x0002000100020003),
-               .idx = 3,
-               .lpv = 2,
-       },
-       {
-               /* 0xc: a != b, b != c, c == d, d == e */
-               .pnum = UINT64_C(0x0002000300010001),
-               .idx = 2,
-               .lpv = 0,
-       },
-       {
-               /* 0xd: a == b, b != c, c == d, d == e */
-               .pnum = UINT64_C(0x0002000300010002),
-               .idx = 2,
-               .lpv = 1,
-       },
-       {
-               /* 0xe: a != b, b == c, c == d, d == e */
-               .pnum = UINT64_C(0x0002000300040001),
-               .idx = 1,
-               .lpv = 0,
-       },
-       {
-               /* 0xf: a == b, b == c, c == d, d == e */
-               .pnum = UINT64_C(0x0002000300040005),
-               .idx = 0,
-               .lpv = 4,
-       },
-       };
-
-       union {
-               uint16_t u16[FWDSTEP + 1];
-               uint64_t u64;
-       } *pnum = (void *)pn;
-
-       int32_t v;
-
-       dp1 = _mm_cmpeq_epi16(dp1, dp2);
-       dp1 = _mm_unpacklo_epi16(dp1, dp1);
-       v = _mm_movemask_ps((__m128)dp1);
-
-       /* update last port counter. */
-       lp[0] += gptbl[v].lpv;
-
-       /* if dest port value has changed. */
-       if (v != GRPMSK) {
-               lp = pnum->u16 + gptbl[v].idx;
-               lp[0] = 1;
-               pnum->u64 = gptbl[v].pnum;
-       }
-
-       return lp;
-}
-
-#endif /* APP_LOOKUP_METHOD */
-
-/* main processing loop */
-static int
-main_loop(__attribute__((unused)) void *dummy)
-{
-       struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
-       unsigned lcore_id;
-       uint64_t prev_tsc, diff_tsc, cur_tsc;
-       int i, j, nb_rx;
-       uint8_t portid, queueid;
-       struct lcore_conf *qconf;
-       const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) /
-               US_PER_S * BURST_TX_DRAIN_US;
-
-#if ((APP_LOOKUP_METHOD == APP_LOOKUP_LPM) && \
-       (ENABLE_MULTI_BUFFER_OPTIMIZE == 1))
-       int32_t k;
-       uint16_t dlp;
-       uint16_t *lp;
-       uint16_t dst_port[MAX_PKT_BURST];
-       __m128i dip[MAX_PKT_BURST / FWDSTEP];
-       uint32_t flag[MAX_PKT_BURST / FWDSTEP];
-       uint16_t pnum[MAX_PKT_BURST + 1];
-#endif
-
-       prev_tsc = 0;
-
-       lcore_id = rte_lcore_id();
-       qconf = &lcore_conf[lcore_id];
-
-       if (qconf->n_rx_queue == 0) {
-               RTE_LOG(INFO, L3FWD, "lcore %u has nothing to do\n", lcore_id);
-               return 0;
-       }
-
-       RTE_LOG(INFO, L3FWD, "entering main loop on lcore %u\n", lcore_id);
-
-       for (i = 0; i < qconf->n_rx_queue; i++) {
-
-               portid = qconf->rx_queue_list[i].port_id;
-               queueid = qconf->rx_queue_list[i].queue_id;
-               RTE_LOG(INFO, L3FWD, " -- lcoreid=%u portid=%hhu rxqueueid=%hhu\n", lcore_id,
-                       portid, queueid);
-       }
+/* Static global variables used within this file. */
+static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
+static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
 
-       while (1) {
+/**< Ports set in promiscuous mode off by default. */
+static int promiscuous_on;
 
-               cur_tsc = rte_rdtsc();
+/* Select Longest-Prefix or Exact match. */
+static int l3fwd_lpm_on;
+static int l3fwd_em_on;
 
-               /*
-                * TX burst queue drain
-                */
-               diff_tsc = cur_tsc - prev_tsc;
-               if (unlikely(diff_tsc > drain_tsc)) {
+/* Global variables. */
 
-                       /*
-                        * This could be optimized (use queueid instead of
-                        * portid), but it is not called so often
-                        */
-                       for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) {
-                               if (qconf->tx_mbufs[portid].len == 0)
-                                       continue;
-                               send_burst(qconf,
-                                       qconf->tx_mbufs[portid].len,
-                                       portid);
-                               qconf->tx_mbufs[portid].len = 0;
-                       }
-
-                       prev_tsc = cur_tsc;
-               }
-
-               /*
-                * Read packet from RX queues
-                */
-               for (i = 0; i < qconf->n_rx_queue; ++i) {
-                       portid = qconf->rx_queue_list[i].port_id;
-                       queueid = qconf->rx_queue_list[i].queue_id;
-                       nb_rx = rte_eth_rx_burst(portid, queueid, pkts_burst,
-                               MAX_PKT_BURST);
-                       if (nb_rx == 0)
-                               continue;
+static int numa_on = 1; /**< NUMA is enabled by default. */
+static int parse_ptype; /**< Parse packet type using rx callback, and */
+                       /**< disabled by default */
+static int per_port_pool; /**< Use separate buffer pools per port; disabled */
+                         /**< by default */
 
-#if (ENABLE_MULTI_BUFFER_OPTIMIZE == 1)
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
-                       {
-                               /*
-                                * Send nb_rx - nb_rx%4 packets
-                                * in groups of 4.
-                                */
-                               int32_t n = RTE_ALIGN_FLOOR(nb_rx, 4);
-                               for (j = 0; j < n ; j+=4) {
-                                       uint32_t ol_flag = pkts_burst[j]->ol_flags
-                                                       & pkts_burst[j+1]->ol_flags
-                                                       & pkts_burst[j+2]->ol_flags
-                                                       & pkts_burst[j+3]->ol_flags;
-                                       if (ol_flag & PKT_RX_IPV4_HDR ) {
-                                               simple_ipv4_fwd_4pkts(&pkts_burst[j],
-                                                                       portid, qconf);
-                                       } else if (ol_flag & PKT_RX_IPV6_HDR) {
-                                               simple_ipv6_fwd_4pkts(&pkts_burst[j],
-                                                                       portid, qconf);
-                                       } else {
-                                               l3fwd_simple_forward(pkts_burst[j],
-                                                                       portid, qconf);
-                                               l3fwd_simple_forward(pkts_burst[j+1],
-                                                                       portid, qconf);
-                                               l3fwd_simple_forward(pkts_burst[j+2],
-                                                                       portid, qconf);
-                                               l3fwd_simple_forward(pkts_burst[j+3],
-                                                                       portid, qconf);
-                                       }
-                               }
-                               for (; j < nb_rx ; j++) {
-                                       l3fwd_simple_forward(pkts_burst[j],
-                                                               portid, qconf);
-                               }
-                       }
-#elif (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
+volatile bool force_quit;
 
-                       k = RTE_ALIGN_FLOOR(nb_rx, FWDSTEP);
-                       for (j = 0; j != k; j += FWDSTEP) {
-                               processx4_step1(&pkts_burst[j],
-                                       &dip[j / FWDSTEP],
-                                       &flag[j / FWDSTEP]);
-                       }
+/* ethernet addresses of ports */
+uint64_t dest_eth_addr[RTE_MAX_ETHPORTS];
+struct rte_ether_addr ports_eth_addr[RTE_MAX_ETHPORTS];
 
-                       k = RTE_ALIGN_FLOOR(nb_rx, FWDSTEP);
-                       for (j = 0; j != k; j += FWDSTEP) {
-                               processx4_step2(qconf, dip[j / FWDSTEP],
-                                       flag[j / FWDSTEP], portid,
-                                       &pkts_burst[j], &dst_port[j]);
-                       }
+xmm_t val_eth[RTE_MAX_ETHPORTS];
 
-                       /*
-                        * Finish packet processing and group consecutive
-                        * packets with the same destination port.
-                        */
-                       k = RTE_ALIGN_FLOOR(nb_rx, FWDSTEP);
-                       if (k != 0) {
-                               __m128i dp1, dp2;
-
-                               lp = pnum;
-                               lp[0] = 1;
-
-                               processx4_step3(pkts_burst, dst_port);
-
-                               /* dp1: <d[0], d[1], d[2], d[3], ... > */
-                               dp1 = _mm_loadu_si128((__m128i *)dst_port);
-
-                               for (j = FWDSTEP; j != k; j += FWDSTEP) {
-                                       processx4_step3(&pkts_burst[j],
-                                               &dst_port[j]);
-
-                                       /*
-                                        * dp2:
-                                        * <d[j-3], d[j-2], d[j-1], d[j], ... >
-                                        */
-                                       dp2 = _mm_loadu_si128((__m128i *)
-                                               &dst_port[j - FWDSTEP + 1]);
-                                       lp  = port_groupx4(&pnum[j - FWDSTEP],
-                                               lp, dp1, dp2);
-
-                                       /*
-                                        * dp1:
-                                        * <d[j], d[j+1], d[j+2], d[j+3], ... >
-                                        */
-                                       dp1 = _mm_srli_si128(dp2,
-                                               (FWDSTEP - 1) *
-                                               sizeof(dst_port[0]));
-                               }
+/* mask of enabled ports */
+uint32_t enabled_port_mask;
 
-                               /*
-                                * dp2: <d[j-3], d[j-2], d[j-1], d[j-1], ... >
-                                */
-                               dp2 = _mm_shufflelo_epi16(dp1, 0xf9);
-                               lp  = port_groupx4(&pnum[j - FWDSTEP], lp,
-                                       dp1, dp2);
-
-                               /*
-                                * remove values added by the last repeated
-                                * dst port.
-                                */
-                               lp[0]--;
-                               dlp = dst_port[j - 1];
-                       } else {
-                               /* set dlp and lp to the never used values. */
-                               dlp = BAD_PORT - 1;
-                               lp = pnum + MAX_PKT_BURST;
-                       }
+/* Used only in exact match mode. */
+int ipv6; /**< ipv6 is false by default. */
+uint32_t hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
 
-                       /* Process up to last 3 packets one by one. */
-                       switch (nb_rx % FWDSTEP) {
-                       case 3:
-                               process_packet(qconf, pkts_burst[j],
-                                       dst_port + j, portid);
-                               GROUP_PORT_STEP(dlp, dst_port, lp, pnum, j);
-                               j++;
-                       case 2:
-                               process_packet(qconf, pkts_burst[j],
-                                       dst_port + j, portid);
-                               GROUP_PORT_STEP(dlp, dst_port, lp, pnum, j);
-                               j++;
-                       case 1:
-                               process_packet(qconf, pkts_burst[j],
-                                       dst_port + j, portid);
-                               GROUP_PORT_STEP(dlp, dst_port, lp, pnum, j);
-                               j++;
-                       }
+struct lcore_conf lcore_conf[RTE_MAX_LCORE];
 
-                       /*
-                        * Send packets out, through destination port.
-                        * Consecuteve pacekts with the same destination port
-                        * are already grouped together.
-                        * If destination port for the packet equals BAD_PORT,
-                        * then free the packet without sending it out.
-                        */
-                       for (j = 0; j < nb_rx; j += k) {
+struct lcore_params {
+       uint16_t port_id;
+       uint8_t queue_id;
+       uint8_t lcore_id;
+} __rte_cache_aligned;
+
+static struct lcore_params lcore_params_array[MAX_LCORE_PARAMS];
+static struct lcore_params lcore_params_array_default[] = {
+       {0, 0, 2},
+       {0, 1, 2},
+       {0, 2, 2},
+       {1, 0, 2},
+       {1, 1, 2},
+       {1, 2, 2},
+       {2, 0, 2},
+       {3, 0, 3},
+       {3, 1, 3},
+};
 
-                               int32_t m;
-                               uint16_t pn;
+static struct lcore_params * lcore_params = lcore_params_array_default;
+static uint16_t nb_lcore_params = sizeof(lcore_params_array_default) /
+                               sizeof(lcore_params_array_default[0]);
 
-                               pn = dst_port[j];
-                               k = pnum[j];
+static struct rte_eth_conf port_conf = {
+       .rxmode = {
+               .mq_mode = ETH_MQ_RX_RSS,
+               .max_rx_pkt_len = ETHER_MAX_LEN,
+               .split_hdr_size = 0,
+               .offloads = DEV_RX_OFFLOAD_CHECKSUM,
+       },
+       .rx_adv_conf = {
+               .rss_conf = {
+                       .rss_key = NULL,
+                       .rss_hf = ETH_RSS_IP,
+               },
+       },
+       .txmode = {
+               .mq_mode = ETH_MQ_TX_NONE,
+       },
+};
 
-                               if (likely(pn != BAD_PORT)) {
-                                       send_packetsx4(qconf, pn,
-                                               pkts_burst + j, k);
-                               } else {
-                                       for (m = j; m != j + k; m++)
-                                               rte_pktmbuf_free(pkts_burst[m]);
-                               }
-                       }
+static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_SOCKETS];
+static uint8_t lkp_per_socket[NB_SOCKETS];
 
-#endif /* APP_LOOKUP_METHOD */
-#else /* ENABLE_MULTI_BUFFER_OPTIMIZE == 0 */
+struct l3fwd_lkp_mode {
+       void  (*setup)(int);
+       int   (*check_ptype)(int);
+       rte_rx_callback_fn cb_parse_ptype;
+       int   (*main_loop)(void *);
+       void* (*get_ipv4_lookup_struct)(int);
+       void* (*get_ipv6_lookup_struct)(int);
+};
 
-                       /* Prefetch first packets */
-                       for (j = 0; j < PREFETCH_OFFSET && j < nb_rx; j++) {
-                               rte_prefetch0(rte_pktmbuf_mtod(
-                                               pkts_burst[j], void *));
-                       }
+static struct l3fwd_lkp_mode l3fwd_lkp;
 
-                       /* Prefetch and forward already prefetched packets */
-                       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,
-                                       qconf);
-                       }
+static struct l3fwd_lkp_mode l3fwd_em_lkp = {
+       .setup                  = setup_hash,
+       .check_ptype            = em_check_ptype,
+       .cb_parse_ptype         = em_cb_parse_ptype,
+       .main_loop              = em_main_loop,
+       .get_ipv4_lookup_struct = em_get_ipv4_l3fwd_lookup_struct,
+       .get_ipv6_lookup_struct = em_get_ipv6_l3fwd_lookup_struct,
+};
 
-                       /* Forward remaining prefetched packets */
-                       for (; j < nb_rx; j++) {
-                               l3fwd_simple_forward(pkts_burst[j], portid,
-                                       qconf);
-                       }
-#endif /* ENABLE_MULTI_BUFFER_OPTIMIZE */
+static struct l3fwd_lkp_mode l3fwd_lpm_lkp = {
+       .setup                  = setup_lpm,
+       .check_ptype            = lpm_check_ptype,
+       .cb_parse_ptype         = lpm_cb_parse_ptype,
+       .main_loop              = lpm_main_loop,
+       .get_ipv4_lookup_struct = lpm_get_ipv4_l3fwd_lookup_struct,
+       .get_ipv6_lookup_struct = lpm_get_ipv6_l3fwd_lookup_struct,
+};
 
-               }
-       }
+/*
+ * Setup lookup methods for forwarding.
+ * Currently exact-match and longest-prefix-match
+ * are supported ones.
+ */
+static void
+setup_l3fwd_lookup_tables(void)
+{
+       /* Setup HASH lookup functions. */
+       if (l3fwd_em_on)
+               l3fwd_lkp = l3fwd_em_lkp;
+       /* Setup LPM lookup functions. */
+       else
+               l3fwd_lkp = l3fwd_lpm_lkp;
 }
 
 static int
@@ -1723,9 +211,9 @@ check_lcore_params(void)
 }
 
 static int
-check_port_config(const unsigned nb_ports)
+check_port_config(void)
 {
-       unsigned portid;
+       uint16_t portid;
        uint16_t i;
 
        for (i = 0; i < nb_lcore_params; ++i) {
@@ -1734,7 +222,7 @@ check_port_config(const unsigned nb_ports)
                        printf("port %u is not enabled in port mask\n", portid);
                        return -1;
                }
-               if (portid >= nb_ports) {
+               if (!rte_eth_dev_is_valid_port(portid)) {
                        printf("port %u is not present on the board\n", portid);
                        return -1;
                }
@@ -1743,14 +231,20 @@ check_port_config(const unsigned nb_ports)
 }
 
 static uint8_t
-get_port_n_rx_queues(const uint8_t port)
+get_port_n_rx_queues(const uint16_t port)
 {
        int queue = -1;
        uint16_t i;
 
        for (i = 0; i < nb_lcore_params; ++i) {
-               if (lcore_params[i].port_id == port && lcore_params[i].queue_id > queue)
-                       queue = lcore_params[i].queue_id;
+               if (lcore_params[i].port_id == port) {
+                       if (lcore_params[i].queue_id == queue+1)
+                               queue = lcore_params[i].queue_id;
+                       else
+                               rte_exit(EXIT_FAILURE, "queue ids of the port %d must be"
+                                               " in sequence and must start with 0\n",
+                                               lcore_params[i].port_id);
+               }
        }
        return (uint8_t)(++queue);
 }
@@ -1783,21 +277,39 @@ init_lcore_rx_queues(void)
 static void
 print_usage(const char *prgname)
 {
-       printf ("%s [EAL options] -- -p PORTMASK -P"
-               "  [--config (port,queue,lcore)[,(port,queue,lcore]]"
-               "  [--enable-jumbo [--max-pkt-len PKTLEN]]\n"
-               "  -p PORTMASK: hexadecimal bitmask of ports to configure\n"
-               "  -P : enable promiscuous mode\n"
-               "  --config (port,queue,lcore): rx queues configuration\n"
-               "  --no-numa: optional, disable numa awareness\n"
-               "  --ipv6: optional, specify it if running ipv6 packets\n"
-               "  --enable-jumbo: enable jumbo frame"
-               " which max packet len is PKTLEN in decimal (64-9600)\n"
-               "  --hash-entry-num: specify the hash entry number in hexadecimal to be setup\n",
+       fprintf(stderr, "%s [EAL options] --"
+               " -p PORTMASK"
+               " [-P]"
+               " [-E]"
+               " [-L]"
+               " --config (port,queue,lcore)[,(port,queue,lcore)]"
+               " [--eth-dest=X,MM:MM:MM:MM:MM:MM]"
+               " [--enable-jumbo [--max-pkt-len PKTLEN]]"
+               " [--no-numa]"
+               " [--hash-entry-num]"
+               " [--ipv6]"
+               " [--parse-ptype]"
+               " [--per-port-pool]\n\n"
+
+               "  -p PORTMASK: Hexadecimal bitmask of ports to configure\n"
+               "  -P : Enable promiscuous mode\n"
+               "  -E : Enable exact match\n"
+               "  -L : Enable longest prefix match (default)\n"
+               "  --config (port,queue,lcore): Rx queue configuration\n"
+               "  --eth-dest=X,MM:MM:MM:MM:MM:MM: Ethernet destination for port X\n"
+               "  --enable-jumbo: Enable jumbo frames\n"
+               "  --max-pkt-len: Under the premise of enabling jumbo,\n"
+               "                 maximum packet length in decimal (64-9600)\n"
+               "  --no-numa: Disable numa awareness\n"
+               "  --hash-entry-num: Specify the hash entry number in hexadecimal to be setup\n"
+               "  --ipv6: Set if running ipv6 packets\n"
+               "  --parse-ptype: Set to use software to analyze packet type\n"
+               "  --per-port-pool: Use separate buffer pool per port\n\n",
                prgname);
 }
 
-static int parse_max_pkt_len(const char *pktlen)
+static int
+parse_max_pkt_len(const char *pktlen)
 {
        char *end = NULL;
        unsigned long len;
@@ -1830,7 +342,6 @@ parse_portmask(const char *portmask)
        return pm;
 }
 
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
 static int
 parse_hash_entry_number(const char *hash_entry_num)
 {
@@ -1846,7 +357,6 @@ parse_hash_entry_number(const char *hash_entry_num)
 
        return hash_en;
 }
-#endif
 
 static int
 parse_config(const char *q_arg)
@@ -1890,20 +400,105 @@ parse_config(const char *q_arg)
                                nb_lcore_params);
                        return -1;
                }
-               lcore_params_array[nb_lcore_params].port_id = (uint8_t)int_fld[FLD_PORT];
-               lcore_params_array[nb_lcore_params].queue_id = (uint8_t)int_fld[FLD_QUEUE];
-               lcore_params_array[nb_lcore_params].lcore_id = (uint8_t)int_fld[FLD_LCORE];
+               lcore_params_array[nb_lcore_params].port_id =
+                       (uint8_t)int_fld[FLD_PORT];
+               lcore_params_array[nb_lcore_params].queue_id =
+                       (uint8_t)int_fld[FLD_QUEUE];
+               lcore_params_array[nb_lcore_params].lcore_id =
+                       (uint8_t)int_fld[FLD_LCORE];
                ++nb_lcore_params;
        }
        lcore_params = lcore_params_array;
        return 0;
 }
 
+static void
+parse_eth_dest(const char *optarg)
+{
+       uint16_t portid;
+       char *port_end;
+       uint8_t c, *dest, peer_addr[6];
+
+       errno = 0;
+       portid = strtoul(optarg, &port_end, 10);
+       if (errno != 0 || port_end == optarg || *port_end++ != ',')
+               rte_exit(EXIT_FAILURE,
+               "Invalid eth-dest: %s", optarg);
+       if (portid >= RTE_MAX_ETHPORTS)
+               rte_exit(EXIT_FAILURE,
+               "eth-dest: port %d >= RTE_MAX_ETHPORTS(%d)\n",
+               portid, RTE_MAX_ETHPORTS);
+
+       if (cmdline_parse_etheraddr(NULL, port_end,
+               &peer_addr, sizeof(peer_addr)) < 0)
+               rte_exit(EXIT_FAILURE,
+               "Invalid ethernet address: %s\n",
+               port_end);
+       dest = (uint8_t *)&dest_eth_addr[portid];
+       for (c = 0; c < 6; c++)
+               dest[c] = peer_addr[c];
+       *(uint64_t *)(val_eth + portid) = dest_eth_addr[portid];
+}
+
+#define MAX_JUMBO_PKT_LEN  9600
+#define MEMPOOL_CACHE_SIZE 256
+
+static const char short_options[] =
+       "p:"  /* portmask */
+       "P"   /* promiscuous */
+       "L"   /* enable long prefix match */
+       "E"   /* enable exact match */
+       ;
+
 #define CMD_LINE_OPT_CONFIG "config"
+#define CMD_LINE_OPT_ETH_DEST "eth-dest"
 #define CMD_LINE_OPT_NO_NUMA "no-numa"
 #define CMD_LINE_OPT_IPV6 "ipv6"
 #define CMD_LINE_OPT_ENABLE_JUMBO "enable-jumbo"
 #define CMD_LINE_OPT_HASH_ENTRY_NUM "hash-entry-num"
+#define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype"
+#define CMD_LINE_OPT_PER_PORT_POOL "per-port-pool"
+enum {
+       /* long options mapped to a short option */
+
+       /* first long only option value must be >= 256, so that we won't
+        * conflict with short options */
+       CMD_LINE_OPT_MIN_NUM = 256,
+       CMD_LINE_OPT_CONFIG_NUM,
+       CMD_LINE_OPT_ETH_DEST_NUM,
+       CMD_LINE_OPT_NO_NUMA_NUM,
+       CMD_LINE_OPT_IPV6_NUM,
+       CMD_LINE_OPT_ENABLE_JUMBO_NUM,
+       CMD_LINE_OPT_HASH_ENTRY_NUM_NUM,
+       CMD_LINE_OPT_PARSE_PTYPE_NUM,
+       CMD_LINE_OPT_PARSE_PER_PORT_POOL,
+};
+
+static const struct option lgopts[] = {
+       {CMD_LINE_OPT_CONFIG, 1, 0, CMD_LINE_OPT_CONFIG_NUM},
+       {CMD_LINE_OPT_ETH_DEST, 1, 0, CMD_LINE_OPT_ETH_DEST_NUM},
+       {CMD_LINE_OPT_NO_NUMA, 0, 0, CMD_LINE_OPT_NO_NUMA_NUM},
+       {CMD_LINE_OPT_IPV6, 0, 0, CMD_LINE_OPT_IPV6_NUM},
+       {CMD_LINE_OPT_ENABLE_JUMBO, 0, 0, CMD_LINE_OPT_ENABLE_JUMBO_NUM},
+       {CMD_LINE_OPT_HASH_ENTRY_NUM, 1, 0, CMD_LINE_OPT_HASH_ENTRY_NUM_NUM},
+       {CMD_LINE_OPT_PARSE_PTYPE, 0, 0, CMD_LINE_OPT_PARSE_PTYPE_NUM},
+       {CMD_LINE_OPT_PER_PORT_POOL, 0, 0, CMD_LINE_OPT_PARSE_PER_PORT_POOL},
+       {NULL, 0, 0, 0}
+};
+
+/*
+ * This expression is used to calculate the number of mbufs needed
+ * depending on user input, taking  into account memory for rx and
+ * tx hardware rings, cache per lcore and mtable per port per lcore.
+ * RTE_MAX is used to ensure that NB_MBUF never goes below a minimum
+ * value of 8192
+ */
+#define NB_MBUF(nports) RTE_MAX(       \
+       (nports*nb_rx_queue*nb_rxd +            \
+       nports*nb_lcores*MAX_PKT_BURST +        \
+       nports*n_tx_queue*nb_txd +              \
+       nb_lcores*MEMPOOL_CACHE_SIZE),          \
+       (unsigned)8192)
 
 /* Parse the argument given in the command line of the application */
 static int
@@ -1913,18 +508,11 @@ parse_args(int argc, char **argv)
        char **argvopt;
        int option_index;
        char *prgname = argv[0];
-       static struct option lgopts[] = {
-               {CMD_LINE_OPT_CONFIG, 1, 0, 0},
-               {CMD_LINE_OPT_NO_NUMA, 0, 0, 0},
-               {CMD_LINE_OPT_IPV6, 0, 0, 0},
-               {CMD_LINE_OPT_ENABLE_JUMBO, 0, 0, 0},
-               {CMD_LINE_OPT_HASH_ENTRY_NUM, 1, 0, 0},
-               {NULL, 0, 0, 0}
-       };
 
        argvopt = argv;
 
-       while ((opt = getopt_long(argc, argvopt, "p:P",
+       /* Error or normal output strings. */
+       while ((opt = getopt_long(argc, argvopt, short_options,
                                lgopts, &option_index)) != EOF) {
 
                switch (opt) {
@@ -1932,417 +520,142 @@ parse_args(int argc, char **argv)
                case 'p':
                        enabled_port_mask = parse_portmask(optarg);
                        if (enabled_port_mask == 0) {
-                               printf("invalid portmask\n");
+                               fprintf(stderr, "Invalid portmask\n");
                                print_usage(prgname);
                                return -1;
                        }
                        break;
+
                case 'P':
-                       printf("Promiscuous mode selected\n");
                        promiscuous_on = 1;
                        break;
 
+               case 'E':
+                       l3fwd_em_on = 1;
+                       break;
+
+               case 'L':
+                       l3fwd_lpm_on = 1;
+                       break;
+
                /* long options */
-               case 0:
-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_CONFIG,
-                               sizeof (CMD_LINE_OPT_CONFIG))) {
-                               ret = parse_config(optarg);
-                               if (ret) {
-                                       printf("invalid config\n");
-                                       print_usage(prgname);
-                                       return -1;
-                               }
+               case CMD_LINE_OPT_CONFIG_NUM:
+                       ret = parse_config(optarg);
+                       if (ret) {
+                               fprintf(stderr, "Invalid config\n");
+                               print_usage(prgname);
+                               return -1;
                        }
+                       break;
 
-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_NO_NUMA,
-                               sizeof(CMD_LINE_OPT_NO_NUMA))) {
-                               printf("numa is disabled \n");
-                               numa_on = 0;
-                       }
+               case CMD_LINE_OPT_ETH_DEST_NUM:
+                       parse_eth_dest(optarg);
+                       break;
 
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_IPV6,
-                               sizeof(CMD_LINE_OPT_IPV6))) {
-                               printf("ipv6 is specified \n");
-                               ipv6 = 1;
-                       }
-#endif
-
-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ENABLE_JUMBO,
-                               sizeof (CMD_LINE_OPT_ENABLE_JUMBO))) {
-                               struct option lenopts = {"max-pkt-len", required_argument, 0, 0};
-
-                               printf("jumbo frame is enabled - disabling simple TX path\n");
-                               port_conf.rxmode.jumbo_frame = 1;
-                               tx_conf.txq_flags = 0;
-
-                               /* if no max-pkt-len set, use the default value ETHER_MAX_LEN */
-                               if (0 == getopt_long(argc, argvopt, "", &lenopts, &option_index)) {
-                                       ret = parse_max_pkt_len(optarg);
-                                       if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN)){
-                                               printf("invalid packet length\n");
-                                               print_usage(prgname);
-                                               return -1;
-                                       }
-                                       port_conf.rxmode.max_rx_pkt_len = ret;
-                               }
-                               printf("set jumbo frame max packet length to %u\n",
-                                               (unsigned int)port_conf.rxmode.max_rx_pkt_len);
-                       }
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
-                       if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_HASH_ENTRY_NUM,
-                               sizeof(CMD_LINE_OPT_HASH_ENTRY_NUM))) {
-                               ret = parse_hash_entry_number(optarg);
-                               if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) {
-                                       hash_entry_number = ret;
-                               } else {
-                                       printf("invalid hash entry number\n");
+               case CMD_LINE_OPT_NO_NUMA_NUM:
+                       numa_on = 0;
+                       break;
+
+               case CMD_LINE_OPT_IPV6_NUM:
+                       ipv6 = 1;
+                       break;
+
+               case CMD_LINE_OPT_ENABLE_JUMBO_NUM: {
+                       const struct option lenopts = {
+                               "max-pkt-len", required_argument, 0, 0
+                       };
+
+                       port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
+                       port_conf.txmode.offloads |= DEV_TX_OFFLOAD_MULTI_SEGS;
+
+                       /*
+                        * if no max-pkt-len set, use the default
+                        * value ETHER_MAX_LEN.
+                        */
+                       if (getopt_long(argc, argvopt, "",
+                                       &lenopts, &option_index) == 0) {
+                               ret = parse_max_pkt_len(optarg);
+                               if (ret < 64 || ret > MAX_JUMBO_PKT_LEN) {
+                                       fprintf(stderr,
+                                               "invalid maximum packet length\n");
                                        print_usage(prgname);
                                        return -1;
                                }
+                               port_conf.rxmode.max_rx_pkt_len = ret;
                        }
-#endif
                        break;
-
-               default:
-                       print_usage(prgname);
-                       return -1;
                }
-       }
 
-       if (optind >= 0)
-               argv[optind-1] = prgname;
-
-       ret = optind-1;
-       optind = 0; /* reset getopt lib */
-       return ret;
-}
-
-static void
-print_ethaddr(const char *name, const 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]);
-}
-
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
+               case CMD_LINE_OPT_HASH_ENTRY_NUM_NUM:
+                       ret = parse_hash_entry_number(optarg);
+                       if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) {
+                               hash_entry_number = ret;
+                       } else {
+                               fprintf(stderr, "invalid hash entry number\n");
+                               print_usage(prgname);
+                               return -1;
+                       }
+                       break;
 
-static void convert_ipv4_5tuple(struct ipv4_5tuple* key1,
-               union ipv4_5tuple_host* key2)
-{
-       key2->ip_dst = rte_cpu_to_be_32(key1->ip_dst);
-       key2->ip_src = rte_cpu_to_be_32(key1->ip_src);
-       key2->port_dst = rte_cpu_to_be_16(key1->port_dst);
-       key2->port_src = rte_cpu_to_be_16(key1->port_src);
-       key2->proto = key1->proto;
-       key2->pad0 = 0;
-       key2->pad1 = 0;
-       return;
-}
+               case CMD_LINE_OPT_PARSE_PTYPE_NUM:
+                       printf("soft parse-ptype is enabled\n");
+                       parse_ptype = 1;
+                       break;
 
-static void convert_ipv6_5tuple(struct ipv6_5tuple* key1,
-                union ipv6_5tuple_host* key2)
-{
-       uint32_t i;
-       for (i = 0; i < 16; i++)
-       {
-               key2->ip_dst[i] = key1->ip_dst[i];
-               key2->ip_src[i] = key1->ip_src[i];
-       }
-       key2->port_dst = rte_cpu_to_be_16(key1->port_dst);
-       key2->port_src = rte_cpu_to_be_16(key1->port_src);
-       key2->proto = key1->proto;
-       key2->pad0 = 0;
-       key2->pad1 = 0;
-       key2->reserve = 0;
-       return;
-}
+               case CMD_LINE_OPT_PARSE_PER_PORT_POOL:
+                       printf("per port buffer pool is enabled\n");
+                       per_port_pool = 1;
+                       break;
 
-#define BYTE_VALUE_MAX 256
-#define ALL_32_BITS 0xffffffff
-#define BIT_8_TO_15 0x0000ff00
-static inline void
-populate_ipv4_few_flow_into_table(const struct rte_hash* h)
-{
-       uint32_t i;
-       int32_t ret;
-       uint32_t array_len = sizeof(ipv4_l3fwd_route_array)/sizeof(ipv4_l3fwd_route_array[0]);
-
-       mask0 = _mm_set_epi32(ALL_32_BITS, ALL_32_BITS, ALL_32_BITS, BIT_8_TO_15);
-       for (i = 0; i < array_len; i++) {
-               struct ipv4_l3fwd_route  entry;
-               union ipv4_5tuple_host newkey;
-               entry = ipv4_l3fwd_route_array[i];
-               convert_ipv4_5tuple(&entry.key, &newkey);
-               ret = rte_hash_add_key (h,(void *) &newkey);
-               if (ret < 0) {
-                       rte_exit(EXIT_FAILURE, "Unable to add entry %" PRIu32
-                               " to the l3fwd hash.\n", i);
+               default:
+                       print_usage(prgname);
+                       return -1;
                }
-               ipv4_l3fwd_out_if[ret] = entry.if_out;
        }
-       printf("Hash: Adding 0x%" PRIx32 " keys\n", array_len);
-}
 
-#define BIT_16_TO_23 0x00ff0000
-static inline void
-populate_ipv6_few_flow_into_table(const struct rte_hash* h)
-{
-       uint32_t i;
-       int32_t ret;
-       uint32_t array_len = sizeof(ipv6_l3fwd_route_array)/sizeof(ipv6_l3fwd_route_array[0]);
-
-       mask1 = _mm_set_epi32(ALL_32_BITS, ALL_32_BITS, ALL_32_BITS, BIT_16_TO_23);
-       mask2 = _mm_set_epi32(0, 0, ALL_32_BITS, ALL_32_BITS);
-       for (i = 0; i < array_len; i++) {
-               struct ipv6_l3fwd_route entry;
-               union ipv6_5tuple_host newkey;
-               entry = ipv6_l3fwd_route_array[i];
-               convert_ipv6_5tuple(&entry.key, &newkey);
-               ret = rte_hash_add_key (h, (void *) &newkey);
-               if (ret < 0) {
-                       rte_exit(EXIT_FAILURE, "Unable to add entry %" PRIu32
-                               " to the l3fwd hash.\n", i);
-               }
-               ipv6_l3fwd_out_if[ret] = entry.if_out;
+       /* If both LPM and EM are selected, return error. */
+       if (l3fwd_lpm_on && l3fwd_em_on) {
+               fprintf(stderr, "LPM and EM are mutually exclusive, select only one\n");
+               return -1;
        }
-       printf("Hash: Adding 0x%" PRIx32 "keys\n", array_len);
-}
-
-#define NUMBER_PORT_USED 4
-static inline void
-populate_ipv4_many_flow_into_table(const struct rte_hash* h,
-                unsigned int nr_flow)
-{
-       unsigned i;
-       mask0 = _mm_set_epi32(ALL_32_BITS, ALL_32_BITS, ALL_32_BITS, BIT_8_TO_15);
-       for (i = 0; i < nr_flow; i++) {
-               struct ipv4_l3fwd_route entry;
-               union ipv4_5tuple_host newkey;
-               uint8_t a = (uint8_t) ((i/NUMBER_PORT_USED)%BYTE_VALUE_MAX);
-               uint8_t b = (uint8_t) (((i/NUMBER_PORT_USED)/BYTE_VALUE_MAX)%BYTE_VALUE_MAX);
-               uint8_t c = (uint8_t) ((i/NUMBER_PORT_USED)/(BYTE_VALUE_MAX*BYTE_VALUE_MAX));
-               /* Create the ipv4 exact match flow */
-               memset(&entry, 0, sizeof(entry));
-               switch (i & (NUMBER_PORT_USED -1)) {
-               case 0:
-                       entry = ipv4_l3fwd_route_array[0];
-                       entry.key.ip_dst = IPv4(101,c,b,a);
-                       break;
-               case 1:
-                       entry = ipv4_l3fwd_route_array[1];
-                       entry.key.ip_dst = IPv4(201,c,b,a);
-                       break;
-               case 2:
-                       entry = ipv4_l3fwd_route_array[2];
-                       entry.key.ip_dst = IPv4(111,c,b,a);
-                       break;
-               case 3:
-                       entry = ipv4_l3fwd_route_array[3];
-                       entry.key.ip_dst = IPv4(211,c,b,a);
-                       break;
-               };
-               convert_ipv4_5tuple(&entry.key, &newkey);
-               int32_t ret = rte_hash_add_key(h,(void *) &newkey);
-               if (ret < 0) {
-                       rte_exit(EXIT_FAILURE, "Unable to add entry %u\n", i);
-               }
-               ipv4_l3fwd_out_if[ret] = (uint8_t) entry.if_out;
 
+       /*
+        * Nothing is selected, pick longest-prefix match
+        * as default match.
+        */
+       if (!l3fwd_lpm_on && !l3fwd_em_on) {
+               fprintf(stderr, "LPM or EM none selected, default LPM on\n");
+               l3fwd_lpm_on = 1;
        }
-       printf("Hash: Adding 0x%x keys\n", nr_flow);
-}
-
-static inline void
-populate_ipv6_many_flow_into_table(const struct rte_hash* h,
-                unsigned int nr_flow)
-{
-       unsigned i;
-       mask1 = _mm_set_epi32(ALL_32_BITS, ALL_32_BITS, ALL_32_BITS, BIT_16_TO_23);
-       mask2 = _mm_set_epi32(0, 0, ALL_32_BITS, ALL_32_BITS);
-       for (i = 0; i < nr_flow; i++) {
-               struct ipv6_l3fwd_route entry;
-               union ipv6_5tuple_host newkey;
-               uint8_t a = (uint8_t) ((i/NUMBER_PORT_USED)%BYTE_VALUE_MAX);
-               uint8_t b = (uint8_t) (((i/NUMBER_PORT_USED)/BYTE_VALUE_MAX)%BYTE_VALUE_MAX);
-               uint8_t c = (uint8_t) ((i/NUMBER_PORT_USED)/(BYTE_VALUE_MAX*BYTE_VALUE_MAX));
-               /* Create the ipv6 exact match flow */
-               memset(&entry, 0, sizeof(entry));
-               switch (i & (NUMBER_PORT_USED - 1)) {
-               case 0: entry = ipv6_l3fwd_route_array[0]; break;
-               case 1: entry = ipv6_l3fwd_route_array[1]; break;
-               case 2: entry = ipv6_l3fwd_route_array[2]; break;
-               case 3: entry = ipv6_l3fwd_route_array[3]; break;
-               };
-               entry.key.ip_dst[13] = c;
-               entry.key.ip_dst[14] = b;
-               entry.key.ip_dst[15] = a;
-               convert_ipv6_5tuple(&entry.key, &newkey);
-               int32_t ret = rte_hash_add_key(h,(void *) &newkey);
-               if (ret < 0) {
-                       rte_exit(EXIT_FAILURE, "Unable to add entry %u\n", i);
-               }
-               ipv6_l3fwd_out_if[ret] = (uint8_t) entry.if_out;
 
+       /*
+        * ipv6 and hash flags are valid only for
+        * exact macth, reset them to default for
+        * longest-prefix match.
+        */
+       if (l3fwd_lpm_on) {
+               ipv6 = 0;
+               hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
        }
-       printf("Hash: Adding 0x%x keys\n", nr_flow);
-}
 
-static void
-setup_hash(int socketid)
-{
-    struct rte_hash_parameters ipv4_l3fwd_hash_params = {
-        .name = NULL,
-        .entries = L3FWD_HASH_ENTRIES,
-        .bucket_entries = 4,
-        .key_len = sizeof(union ipv4_5tuple_host),
-        .hash_func = ipv4_hash_crc,
-        .hash_func_init_val = 0,
-    };
-
-    struct rte_hash_parameters ipv6_l3fwd_hash_params = {
-        .name = NULL,
-        .entries = L3FWD_HASH_ENTRIES,
-        .bucket_entries = 4,
-        .key_len = sizeof(union ipv6_5tuple_host),
-        .hash_func = ipv6_hash_crc,
-        .hash_func_init_val = 0,
-    };
-
-    char s[64];
-
-       /* create ipv4 hash */
-       snprintf(s, sizeof(s), "ipv4_l3fwd_hash_%d", socketid);
-       ipv4_l3fwd_hash_params.name = s;
-       ipv4_l3fwd_hash_params.socket_id = socketid;
-       ipv4_l3fwd_lookup_struct[socketid] = rte_hash_create(&ipv4_l3fwd_hash_params);
-       if (ipv4_l3fwd_lookup_struct[socketid] == NULL)
-               rte_exit(EXIT_FAILURE, "Unable to create the l3fwd hash on "
-                               "socket %d\n", socketid);
-
-       /* create ipv6 hash */
-       snprintf(s, sizeof(s), "ipv6_l3fwd_hash_%d", socketid);
-       ipv6_l3fwd_hash_params.name = s;
-       ipv6_l3fwd_hash_params.socket_id = socketid;
-       ipv6_l3fwd_lookup_struct[socketid] = rte_hash_create(&ipv6_l3fwd_hash_params);
-       if (ipv6_l3fwd_lookup_struct[socketid] == NULL)
-               rte_exit(EXIT_FAILURE, "Unable to create the l3fwd hash on "
-                               "socket %d\n", socketid);
-
-       if (hash_entry_number != HASH_ENTRY_NUMBER_DEFAULT) {
-               /* For testing hash matching with a large number of flows we
-                * generate millions of IP 5-tuples with an incremented dst
-                * address to initialize the hash table. */
-               if (ipv6 == 0) {
-                       /* populate the ipv4 hash */
-                       populate_ipv4_many_flow_into_table(
-                               ipv4_l3fwd_lookup_struct[socketid], hash_entry_number);
-               } else {
-                       /* populate the ipv6 hash */
-                       populate_ipv6_many_flow_into_table(
-                               ipv6_l3fwd_lookup_struct[socketid], hash_entry_number);
-               }
-       } else {
-               /* Use data in ipv4/ipv6 l3fwd lookup table directly to initialize the hash table */
-               if (ipv6 == 0) {
-                       /* populate the ipv4 hash */
-                       populate_ipv4_few_flow_into_table(ipv4_l3fwd_lookup_struct[socketid]);
-               } else {
-                       /* populate the ipv6 hash */
-                       populate_ipv6_few_flow_into_table(ipv6_l3fwd_lookup_struct[socketid]);
-               }
-       }
+       if (optind >= 0)
+               argv[optind-1] = prgname;
+
+       ret = optind-1;
+       optind = 1; /* reset getopt lib */
+       return ret;
 }
-#endif
 
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
 static void
-setup_lpm(int socketid)
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
 {
-       struct rte_lpm6_config config;
-       unsigned i;
-       int ret;
-       char s[64];
-
-       /* create the LPM table */
-       snprintf(s, sizeof(s), "IPV4_L3FWD_LPM_%d", socketid);
-       ipv4_l3fwd_lookup_struct[socketid] = rte_lpm_create(s, socketid,
-                               IPV4_L3FWD_LPM_MAX_RULES, 0);
-       if (ipv4_l3fwd_lookup_struct[socketid] == NULL)
-               rte_exit(EXIT_FAILURE, "Unable to create the l3fwd LPM table"
-                               " on socket %d\n", socketid);
-
-       /* populate the LPM table */
-       for (i = 0; i < IPV4_L3FWD_NUM_ROUTES; i++) {
-
-               /* skip unused ports */
-               if ((1 << ipv4_l3fwd_route_array[i].if_out &
-                               enabled_port_mask) == 0)
-                       continue;
-
-               ret = rte_lpm_add(ipv4_l3fwd_lookup_struct[socketid],
-                       ipv4_l3fwd_route_array[i].ip,
-                       ipv4_l3fwd_route_array[i].depth,
-                       ipv4_l3fwd_route_array[i].if_out);
-
-               if (ret < 0) {
-                       rte_exit(EXIT_FAILURE, "Unable to add entry %u to the "
-                               "l3fwd LPM table on socket %d\n",
-                               i, socketid);
-               }
-
-               printf("LPM: Adding route 0x%08x / %d (%d)\n",
-                       (unsigned)ipv4_l3fwd_route_array[i].ip,
-                       ipv4_l3fwd_route_array[i].depth,
-                       ipv4_l3fwd_route_array[i].if_out);
-       }
-
-       /* create the LPM6 table */
-       snprintf(s, sizeof(s), "IPV6_L3FWD_LPM_%d", socketid);
-
-       config.max_rules = IPV6_L3FWD_LPM_MAX_RULES;
-       config.number_tbl8s = IPV6_L3FWD_LPM_NUMBER_TBL8S;
-       config.flags = 0;
-       ipv6_l3fwd_lookup_struct[socketid] = rte_lpm6_create(s, socketid,
-                               &config);
-       if (ipv6_l3fwd_lookup_struct[socketid] == NULL)
-               rte_exit(EXIT_FAILURE, "Unable to create the l3fwd LPM table"
-                               " on socket %d\n", socketid);
-
-       /* populate the LPM table */
-       for (i = 0; i < IPV6_L3FWD_NUM_ROUTES; i++) {
-
-               /* skip unused ports */
-               if ((1 << ipv6_l3fwd_route_array[i].if_out &
-                               enabled_port_mask) == 0)
-                       continue;
-
-               ret = rte_lpm6_add(ipv6_l3fwd_lookup_struct[socketid],
-                       ipv6_l3fwd_route_array[i].ip,
-                       ipv6_l3fwd_route_array[i].depth,
-                       ipv6_l3fwd_route_array[i].if_out);
-
-               if (ret < 0) {
-                       rte_exit(EXIT_FAILURE, "Unable to add entry %u to the "
-                               "l3fwd LPM table on socket %d\n",
-                               i, socketid);
-               }
-
-               printf("LPM: Adding route %s / %d (%d)\n",
-                       "IPV6",
-                       ipv6_l3fwd_route_array[i].depth,
-                       ipv6_l3fwd_route_array[i].if_out);
-       }
+       char buf[ETHER_ADDR_FMT_SIZE];
+       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       printf("%s%s", name, buf);
 }
-#endif
 
 static int
-init_mem(unsigned nb_mbuf)
+init_mem(uint16_t portid, unsigned int nb_mbuf)
 {
        struct lcore_conf *qconf;
        int socketid;
@@ -2359,50 +672,62 @@ init_mem(unsigned nb_mbuf)
                        socketid = 0;
 
                if (socketid >= NB_SOCKETS) {
-                       rte_exit(EXIT_FAILURE, "Socket %d of lcore %u is out of range %d\n",
+                       rte_exit(EXIT_FAILURE,
+                               "Socket %d of lcore %u is out of range %d\n",
                                socketid, lcore_id, NB_SOCKETS);
                }
-               if (pktmbuf_pool[socketid] == NULL) {
-                       snprintf(s, sizeof(s), "mbuf_pool_%d", socketid);
-                       pktmbuf_pool[socketid] =
-                               rte_mempool_create(s, nb_mbuf, MBUF_SIZE, MEMPOOL_CACHE_SIZE,
-                                       sizeof(struct rte_pktmbuf_pool_private),
-                                       rte_pktmbuf_pool_init, NULL,
-                                       rte_pktmbuf_init, NULL,
-                                       socketid, 0);
-                       if (pktmbuf_pool[socketid] == NULL)
+
+               if (pktmbuf_pool[portid][socketid] == NULL) {
+                       snprintf(s, sizeof(s), "mbuf_pool_%d:%d",
+                                portid, socketid);
+                       pktmbuf_pool[portid][socketid] =
+                               rte_pktmbuf_pool_create(s, nb_mbuf,
+                                       MEMPOOL_CACHE_SIZE, 0,
+                                       RTE_MBUF_DEFAULT_BUF_SIZE, socketid);
+                       if (pktmbuf_pool[portid][socketid] == NULL)
                                rte_exit(EXIT_FAILURE,
-                                               "Cannot init mbuf pool on socket %d\n", socketid);
+                                       "Cannot init mbuf pool on socket %d\n",
+                                       socketid);
                        else
-                               printf("Allocated mbuf pool on socket %d\n", socketid);
+                               printf("Allocated mbuf pool on socket %d\n",
+                                       socketid);
 
-#if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
-                       setup_lpm(socketid);
-#else
-                       setup_hash(socketid);
-#endif
+                       /* Setup either LPM or EM(f.e Hash). But, only once per
+                        * available socket.
+                        */
+                       if (!lkp_per_socket[socketid]) {
+                               l3fwd_lkp.setup(socketid);
+                               lkp_per_socket[socketid] = 1;
+                       }
                }
                qconf = &lcore_conf[lcore_id];
-               qconf->ipv4_lookup_struct = ipv4_l3fwd_lookup_struct[socketid];
-               qconf->ipv6_lookup_struct = ipv6_l3fwd_lookup_struct[socketid];
+               qconf->ipv4_lookup_struct =
+                       l3fwd_lkp.get_ipv4_lookup_struct(socketid);
+               qconf->ipv6_lookup_struct =
+                       l3fwd_lkp.get_ipv6_lookup_struct(socketid);
        }
        return 0;
 }
 
 /* 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++) {
+               if (force_quit)
+                       return;
                all_ports_up = 1;
-               for (portid = 0; portid < port_num; portid++) {
+               RTE_ETH_FOREACH_DEV(portid) {
+                       if (force_quit)
+                               return;
                        if ((port_mask & (1 << portid)) == 0)
                                continue;
                        memset(&link, 0, sizeof(link));
@@ -2410,18 +735,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;
                        }
@@ -2444,16 +768,50 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
        }
 }
 
+static void
+signal_handler(int signum)
+{
+       if (signum == SIGINT || signum == SIGTERM) {
+               printf("\n\nSignal %d received, preparing to exit...\n",
+                               signum);
+               force_quit = true;
+       }
+}
+
+static int
+prepare_ptype_parser(uint16_t portid, uint16_t queueid)
+{
+       if (parse_ptype) {
+               printf("Port %d: softly parse packet type info\n", portid);
+               if (rte_eth_add_rx_callback(portid, queueid,
+                                           l3fwd_lkp.cb_parse_ptype,
+                                           NULL))
+                       return 1;
+
+               printf("Failed to add rx callback: port=%d\n", portid);
+               return 0;
+       }
+
+       if (l3fwd_lkp.check_ptype(portid))
+               return 1;
+
+       printf("port %d cannot parse packet type, please add --%s\n",
+              portid, CMD_LINE_OPT_PARSE_PTYPE);
+       return 0;
+}
+
 int
-MAIN(int argc, char **argv)
+main(int argc, char **argv)
 {
        struct lcore_conf *qconf;
+       struct rte_eth_dev_info dev_info;
+       struct rte_eth_txconf *txconf;
        int ret;
        unsigned nb_ports;
-       uint16_t queueid;
+       uint16_t queueid, portid;
        unsigned lcore_id;
        uint32_t n_tx_queue, nb_lcores;
-       uint8_t portid, nb_rx_queue, queue, socketid;
+       uint8_t nb_rx_queue, queue, socketid;
 
        /* init EAL */
        ret = rte_eal_init(argc, argv);
@@ -2462,6 +820,17 @@ MAIN(int argc, char **argv)
        argc -= ret;
        argv += ret;
 
+       force_quit = false;
+       signal(SIGINT, signal_handler);
+       signal(SIGTERM, signal_handler);
+
+       /* pre-init dst MACs for all ports to 02:00:00:00:00:xx */
+       for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) {
+               dest_eth_addr[portid] =
+                       ETHER_LOCAL_ADMIN_ADDR + ((uint64_t)portid << 40);
+               *(uint64_t *)(val_eth + portid) = dest_eth_addr[portid];
+       }
+
        /* parse application arguments (after the EAL ones) */
        ret = parse_args(argc, argv);
        if (ret < 0)
@@ -2474,21 +843,20 @@ MAIN(int argc, char **argv)
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "init_lcore_rx_queues failed\n");
 
+       nb_ports = rte_eth_dev_count_avail();
 
-       if (rte_eal_pci_probe() < 0)
-               rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");
-
-       nb_ports = rte_eth_dev_count();
-       if (nb_ports > RTE_MAX_ETHPORTS)
-               nb_ports = RTE_MAX_ETHPORTS;
-
-       if (check_port_config(nb_ports) < 0)
+       if (check_port_config() < 0)
                rte_exit(EXIT_FAILURE, "check_port_config failed\n");
 
        nb_lcores = rte_lcore_count();
 
+       /* Setup function pointers for lookup method. */
+       setup_l3fwd_lookup_tables();
+
        /* initialize all ports */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
+               struct rte_eth_conf local_port_conf = port_conf;
+
                /* skip ports that are not enabled */
                if ((enabled_port_mask & (1 << portid)) == 0) {
                        printf("\nSkipping disabled port %d\n", portid);
@@ -2505,26 +873,59 @@ MAIN(int argc, char **argv)
                        n_tx_queue = MAX_TX_QUEUE_PER_PORT;
                printf("Creating queues: nb_rxq=%d nb_txq=%u... ",
                        nb_rx_queue, (unsigned)n_tx_queue );
+
+               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);
+               }
+
                ret = rte_eth_dev_configure(portid, nb_rx_queue,
-                                       (uint16_t)n_tx_queue, &port_conf);
+                                       (uint16_t)n_tx_queue, &local_port_conf);
                if (ret < 0)
-                       rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%d\n",
+                       rte_exit(EXIT_FAILURE,
+                               "Cannot configure device: err=%d, port=%d\n",
                                ret, portid);
 
+               ret = rte_eth_dev_adjust_nb_rx_tx_desc(portid, &nb_rxd,
+                                                      &nb_txd);
+               if (ret < 0)
+                       rte_exit(EXIT_FAILURE,
+                                "Cannot adjust number of descriptors: err=%d, "
+                                "port=%d\n", ret, portid);
+
                rte_eth_macaddr_get(portid, &ports_eth_addr[portid]);
                print_ethaddr(" Address:", &ports_eth_addr[portid]);
                printf(", ");
+               print_ethaddr("Destination:",
+                       (const struct rte_ether_addr *)&dest_eth_addr[portid]);
+               printf(", ");
 
                /*
-                * prepare dst and src MACs for each port.
+                * prepare src MACs for each port.
                 */
-               *(uint64_t *)(val_eth + portid) =
-                       ETHER_LOCAL_ADMIN_ADDR + ((uint64_t)portid << 40);
                ether_addr_copy(&ports_eth_addr[portid],
-                       (struct ether_addr *)(val_eth + portid) + 1);
+                       (struct rte_ether_addr *)(val_eth + portid) + 1);
 
                /* init memory */
-               ret = init_mem(NB_MBUF);
+               if (!per_port_pool) {
+                       /* portid = 0; this is *not* signifying the first port,
+                        * rather, it signifies that portid is ignored.
+                        */
+                       ret = init_mem(0, NB_MBUF(nb_ports));
+               } else {
+                       ret = init_mem(portid, NB_MBUF(1));
+               }
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "init_mem failed\n");
 
@@ -2535,21 +936,29 @@ MAIN(int argc, char **argv)
                                continue;
 
                        if (numa_on)
-                               socketid = (uint8_t)rte_lcore_to_socket_id(lcore_id);
+                               socketid =
+                               (uint8_t)rte_lcore_to_socket_id(lcore_id);
                        else
                                socketid = 0;
 
                        printf("txq=%u,%d,%d ", lcore_id, queueid, socketid);
                        fflush(stdout);
+
+                       txconf = &dev_info.default_txconf;
+                       txconf->offloads = local_port_conf.txmode.offloads;
                        ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd,
-                                                    socketid, &tx_conf);
+                                                    socketid, txconf);
                        if (ret < 0)
-                               rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d, "
+                               rte_exit(EXIT_FAILURE,
+                                       "rte_eth_tx_queue_setup: err=%d, "
                                        "port=%d\n", ret, portid);
 
                        qconf = &lcore_conf[lcore_id];
                        qconf->tx_queue_id[portid] = queueid;
                        queueid++;
+
+                       qconf->tx_port_id[qconf->n_tx_port] = portid;
+                       qconf->n_tx_port++;
                }
                printf("\n");
        }
@@ -2562,36 +971,56 @@ MAIN(int argc, char **argv)
                fflush(stdout);
                /* init RX queues */
                for(queue = 0; queue < qconf->n_rx_queue; ++queue) {
+                       struct rte_eth_dev *dev;
+                       struct rte_eth_conf *conf;
+                       struct rte_eth_rxconf rxq_conf;
+
                        portid = qconf->rx_queue_list[queue].port_id;
                        queueid = qconf->rx_queue_list[queue].queue_id;
+                       dev = &rte_eth_devices[portid];
+                       conf = &dev->data->dev_conf;
 
                        if (numa_on)
-                               socketid = (uint8_t)rte_lcore_to_socket_id(lcore_id);
+                               socketid =
+                               (uint8_t)rte_lcore_to_socket_id(lcore_id);
                        else
                                socketid = 0;
 
                        printf("rxq=%d,%d,%d ", portid, queueid, socketid);
                        fflush(stdout);
 
-                       ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
-                                       socketid, &rx_conf, pktmbuf_pool[socketid]);
+                       rte_eth_dev_info_get(portid, &dev_info);
+                       rxq_conf = dev_info.default_rxconf;
+                       rxq_conf.offloads = conf->rxmode.offloads;
+                       if (!per_port_pool)
+                               ret = rte_eth_rx_queue_setup(portid, queueid,
+                                               nb_rxd, socketid,
+                                               &rxq_conf,
+                                               pktmbuf_pool[0][socketid]);
+                       else
+                               ret = rte_eth_rx_queue_setup(portid, queueid,
+                                               nb_rxd, socketid,
+                                               &rxq_conf,
+                                               pktmbuf_pool[portid][socketid]);
                        if (ret < 0)
-                               rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup: err=%d,"
-                                               "port=%d\n", ret, portid);
+                               rte_exit(EXIT_FAILURE,
+                               "rte_eth_rx_queue_setup: err=%d, port=%d\n",
+                               ret, portid);
                }
        }
 
        printf("\n");
 
        /* start ports */
-       for (portid = 0; portid < nb_ports; portid++) {
+       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);
 
                /*
@@ -2604,14 +1033,43 @@ MAIN(int argc, char **argv)
                        rte_eth_promiscuous_enable(portid);
        }
 
-       check_all_ports_link_status((uint8_t)nb_ports, enabled_port_mask);
+       printf("\n");
+
+       for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
+               if (rte_lcore_is_enabled(lcore_id) == 0)
+                       continue;
+               qconf = &lcore_conf[lcore_id];
+               for (queue = 0; queue < qconf->n_rx_queue; ++queue) {
+                       portid = qconf->rx_queue_list[queue].port_id;
+                       queueid = qconf->rx_queue_list[queue].queue_id;
+                       if (prepare_ptype_parser(portid, queueid) == 0)
+                               rte_exit(EXIT_FAILURE, "ptype check fails\n");
+               }
+       }
+
+
+       check_all_ports_link_status(enabled_port_mask);
 
+       ret = 0;
        /* launch per-lcore init on every lcore */
-       rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
+       rte_eal_mp_remote_launch(l3fwd_lkp.main_loop, NULL, CALL_MASTER);
        RTE_LCORE_FOREACH_SLAVE(lcore_id) {
-               if (rte_eal_wait_lcore(lcore_id) < 0)
-                       return -1;
+               if (rte_eal_wait_lcore(lcore_id) < 0) {
+                       ret = -1;
+                       break;
+               }
        }
 
-       return 0;
+       /* stop ports */
+       RTE_ETH_FOREACH_DEV(portid) {
+               if ((enabled_port_mask & (1 << portid)) == 0)
+                       continue;
+               printf("Closing port %d...", portid);
+               rte_eth_dev_stop(portid);
+               rte_eth_dev_close(portid);
+               printf(" Done\n");
+       }
+       printf("Bye...\n");
+
+       return ret;
 }