New upstream version 18.11-rc1
[deb_dpdk.git] / examples / l3fwd / main.c
index bf6d885..e4b99ef 100644 (file)
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2016 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>
@@ -50,9 +21,7 @@
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
-#include <rte_memzone.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>
@@ -83,8 +50,8 @@
 /*
  * Configurable number of RX/TX ring descriptors
  */
-#define RTE_TEST_RX_DESC_DEFAULT 128
-#define RTE_TEST_TX_DESC_DEFAULT 512
+#define RTE_TEST_RX_DESC_DEFAULT 1024
+#define RTE_TEST_TX_DESC_DEFAULT 1024
 
 #define MAX_TX_QUEUE_PER_PORT RTE_MAX_ETHPORTS
 #define MAX_RX_QUEUE_PER_PORT 128
@@ -126,7 +93,7 @@ uint32_t hash_entry_number = HASH_ENTRY_NUMBER_DEFAULT;
 struct lcore_conf lcore_conf[RTE_MAX_LCORE];
 
 struct lcore_params {
-       uint8_t port_id;
+       uint16_t port_id;
        uint8_t queue_id;
        uint8_t lcore_id;
 } __rte_cache_aligned;
@@ -153,11 +120,7 @@ static struct rte_eth_conf port_conf = {
                .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 */
+               .offloads = DEV_RX_OFFLOAD_CHECKSUM,
        },
        .rx_adv_conf = {
                .rss_conf = {
@@ -245,9 +208,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) {
@@ -256,7 +219,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;
                }
@@ -265,7 +228,7 @@ 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;
@@ -311,20 +274,32 @@ 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"
-               "  -E : enable exact match\n"
-               "  -L : enable longest prefix match\n"
-               "  --config (port,queue,lcore): rx queues configuration\n"
-               "  --eth-dest=X,MM:MM:MM:MM:MM:MM: optional, ethernet destination for port X\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]\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\n",
                prgname);
 }
 
@@ -435,7 +410,7 @@ parse_config(const char *q_arg)
 static void
 parse_eth_dest(const char *optarg)
 {
-       uint8_t portid;
+       uint16_t portid;
        char *port_end;
        uint8_t c, *dest, peer_addr[6];
 
@@ -463,6 +438,13 @@ parse_eth_dest(const char *optarg)
 #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"
@@ -470,6 +452,31 @@ parse_eth_dest(const char *optarg)
 #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"
+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,
+};
+
+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},
+       {NULL, 0, 0, 0}
+};
 
 /*
  * This expression is used to calculate the number of mbufs needed
@@ -479,10 +486,10 @@ parse_eth_dest(const char *optarg)
  * 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),                          \
+       (nb_ports*nb_rx_queue*nb_rxd +          \
+       nb_ports*nb_lcores*MAX_PKT_BURST +      \
+       nb_ports*n_tx_queue*nb_txd +            \
+       nb_lcores*MEMPOOL_CACHE_SIZE),          \
        (unsigned)8192)
 
 /* Parse the argument given in the command line of the application */
@@ -493,37 +500,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_ETH_DEST, 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},
-               {CMD_LINE_OPT_PARSE_PTYPE, 0, 0, 0},
-               {NULL, 0, 0, 0}
-       };
 
        argvopt = argv;
 
        /* Error or normal output strings. */
-       const char *str1 = "L3FWD: Invalid portmask";
-       const char *str2 = "L3FWD: Promiscuous mode selected";
-       const char *str3 = "L3FWD: Exact match selected";
-       const char *str4 = "L3FWD: Longest-prefix match selected";
-       const char *str5 = "L3FWD: Invalid config";
-       const char *str6 = "L3FWD: NUMA is disabled";
-       const char *str7 = "L3FWD: IPV6 is specified";
-       const char *str8 =
-               "L3FWD: Jumbo frame is enabled - disabling simple TX path";
-       const char *str9 = "L3FWD: Invalid packet length";
-       const char *str10 = "L3FWD: Set jumbo frame max packet len to ";
-       const char *str11 = "L3FWD: Invalid hash entry number";
-       const char *str12 =
-               "L3FWD: LPM and EM are mutually exclusive, select only one";
-       const char *str13 = "L3FWD: LPM or EM none selected, default LPM on";
-
-       while ((opt = getopt_long(argc, argvopt, "p:PLE",
+       while ((opt = getopt_long(argc, argvopt, short_options,
                                lgopts, &option_index)) != EOF) {
 
                switch (opt) {
@@ -531,110 +512,86 @@ parse_args(int argc, char **argv)
                case 'p':
                        enabled_port_mask = parse_portmask(optarg);
                        if (enabled_port_mask == 0) {
-                               printf("%s\n", str1);
+                               fprintf(stderr, "Invalid portmask\n");
                                print_usage(prgname);
                                return -1;
                        }
                        break;
+
                case 'P':
-                       printf("%s\n", str2);
                        promiscuous_on = 1;
                        break;
 
                case 'E':
-                       printf("%s\n", str3);
                        l3fwd_em_on = 1;
                        break;
 
                case 'L':
-                       printf("%s\n", str4);
                        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("%s\n", str5);
-                                       print_usage(prgname);
-                                       return -1;
-                               }
-                       }
-
-                       if (!strncmp(lgopts[option_index].name,
-                                       CMD_LINE_OPT_ETH_DEST,
-                                       sizeof(CMD_LINE_OPT_ETH_DEST))) {
-                                       parse_eth_dest(optarg);
-                       }
-
-                       if (!strncmp(lgopts[option_index].name,
-                                       CMD_LINE_OPT_NO_NUMA,
-                                       sizeof(CMD_LINE_OPT_NO_NUMA))) {
-                               printf("%s\n", str6);
-                               numa_on = 0;
+               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_IPV6,
-                               sizeof(CMD_LINE_OPT_IPV6))) {
-                               printf("%sn", str7);
-                               ipv6 = 1;
-                       }
+               case CMD_LINE_OPT_ETH_DEST_NUM:
+                       parse_eth_dest(optarg);
+                       break;
 
-                       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("%s\n", str8);
-                               port_conf.rxmode.jumbo_frame = 1;
-
-                               /*
-                                * 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("%s\n", str9);
-                                               print_usage(prgname);
-                                               return -1;
-                                       }
-                                       port_conf.rxmode.max_rx_pkt_len = ret;
-                               }
-                               printf("%s %u\n", str10,
-                               (unsigned int)port_conf.rxmode.max_rx_pkt_len);
-                       }
+               case CMD_LINE_OPT_NO_NUMA_NUM:
+                       numa_on = 0;
+                       break;
 
-                       if (!strncmp(lgopts[option_index].name,
-                               CMD_LINE_OPT_HASH_ENTRY_NUM,
-                               sizeof(CMD_LINE_OPT_HASH_ENTRY_NUM))) {
+               case CMD_LINE_OPT_IPV6_NUM:
+                       ipv6 = 1;
+                       break;
 
-                               ret = parse_hash_entry_number(optarg);
-                               if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) {
-                                       hash_entry_number = ret;
-                               } else {
-                                       printf("%s\n", str11);
+               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;
                        }
+                       break;
+               }
 
-                       if (!strncmp(lgopts[option_index].name,
-                                    CMD_LINE_OPT_PARSE_PTYPE,
-                                    sizeof(CMD_LINE_OPT_PARSE_PTYPE))) {
-                               printf("soft parse-ptype is enabled\n");
-                               parse_ptype = 1;
+               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;
 
+               case CMD_LINE_OPT_PARSE_PTYPE_NUM:
+                       printf("soft parse-ptype is enabled\n");
+                       parse_ptype = 1;
                        break;
 
                default:
@@ -645,7 +602,7 @@ parse_args(int argc, char **argv)
 
        /* If both LPM and EM are selected, return error. */
        if (l3fwd_lpm_on && l3fwd_em_on) {
-               printf("%s\n", str12);
+               fprintf(stderr, "LPM and EM are mutually exclusive, select only one\n");
                return -1;
        }
 
@@ -654,8 +611,8 @@ parse_args(int argc, char **argv)
         * 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("%s\n", str13);
        }
 
        /*
@@ -672,7 +629,7 @@ parse_args(int argc, char **argv)
                argv[optind-1] = prgname;
 
        ret = optind-1;
-       optind = 0; /* reset getopt lib */
+       optind = 1; /* reset getopt lib */
        return ret;
 }
 
@@ -735,11 +692,12 @@ init_mem(unsigned nb_mbuf)
 
 /* 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");
@@ -748,7 +706,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
                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)
@@ -758,14 +716,13 @@ 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 */
@@ -803,7 +760,7 @@ signal_handler(int signum)
 }
 
 static int
-prepare_ptype_parser(uint8_t portid, uint16_t queueid)
+prepare_ptype_parser(uint16_t portid, uint16_t queueid)
 {
        if (parse_ptype) {
                printf("Port %d: softly parse packet type info\n", portid);
@@ -832,10 +789,10 @@ main(int argc, char **argv)
        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);
@@ -867,11 +824,9 @@ main(int argc, char **argv)
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "init_lcore_rx_queues failed\n");
 
-       nb_ports = rte_eth_dev_count();
-       if (nb_ports > RTE_MAX_ETHPORTS)
-               nb_ports = RTE_MAX_ETHPORTS;
+       nb_ports = rte_eth_dev_count_avail();
 
-       if (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();
@@ -880,7 +835,9 @@ main(int argc, char **argv)
        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);
@@ -897,13 +854,37 @@ 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",
                                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(", ");
@@ -937,10 +918,8 @@ main(int argc, char **argv)
                        printf("txq=%u,%d,%d ", lcore_id, queueid, socketid);
                        fflush(stdout);
 
-                       rte_eth_dev_info_get(portid, &dev_info);
                        txconf = &dev_info.default_txconf;
-                       if (port_conf.rxmode.jumbo_frame)
-                               txconf->txq_flags = 0;
+                       txconf->offloads = local_port_conf.txmode.offloads;
                        ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd,
                                                     socketid, txconf);
                        if (ret < 0)
@@ -966,8 +945,14 @@ 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 =
@@ -978,9 +963,12 @@ main(int argc, char **argv)
                        printf("rxq=%d,%d,%d ", portid, queueid, socketid);
                        fflush(stdout);
 
+                       rte_eth_dev_info_get(portid, &dev_info);
+                       rxq_conf = dev_info.default_rxconf;
+                       rxq_conf.offloads = conf->rxmode.offloads;
                        ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
                                        socketid,
-                                       NULL,
+                                       &rxq_conf,
                                        pktmbuf_pool[socketid]);
                        if (ret < 0)
                                rte_exit(EXIT_FAILURE,
@@ -992,7 +980,7 @@ main(int argc, char **argv)
        printf("\n");
 
        /* start ports */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
                if ((enabled_port_mask & (1 << portid)) == 0) {
                        continue;
                }
@@ -1028,7 +1016,7 @@ main(int argc, char **argv)
        }
 
 
-       check_all_ports_link_status((uint8_t)nb_ports, enabled_port_mask);
+       check_all_ports_link_status(enabled_port_mask);
 
        ret = 0;
        /* launch per-lcore init on every lcore */
@@ -1041,7 +1029,7 @@ main(int argc, char **argv)
        }
 
        /* stop ports */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
                if ((enabled_port_mask & (1 << portid)) == 0)
                        continue;
                printf("Closing port %d...", portid);