examples: fix port mask parsing failure handling
[dpdk.git] / examples / l2fwd-jobstats / main.c
index a5a1aaa..29d5705 100644 (file)
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2015 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 <locale.h>
 #include <ctype.h>
 #include <getopt.h>
 
-#include <rte_alarm.h>
 #include <rte_common.h>
 #include <rte_log.h>
+#include <rte_malloc.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_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_spinlock.h>
 #include <rte_jobstats.h>
 #include <rte_timer.h>
 #include <rte_alarm.h>
+#include <rte_pause.h>
 
 #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1
 
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 #define NB_MBUF   8192
 
 #define MAX_PKT_BURST 32
 /*
  * Configurable number of RX/TX ring descriptors
  */
-#define RTE_TEST_RX_DESC_DEFAULT 128
-#define RTE_TEST_TX_DESC_DEFAULT 512
+#define RTE_TEST_RX_DESC_DEFAULT 1024
+#define RTE_TEST_TX_DESC_DEFAULT 1024
 static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
 static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
 
 /* ethernet addresses of ports */
-static struct ether_addr l2fwd_ports_eth_addr[RTE_MAX_ETHPORTS];
+static struct rte_ether_addr l2fwd_ports_eth_addr[RTE_MAX_ETHPORTS];
 
 /* mask of enabled ports */
 static uint32_t l2fwd_enabled_port_mask;
@@ -99,18 +65,12 @@ static uint32_t l2fwd_dst_ports[RTE_MAX_ETHPORTS];
 
 static unsigned int l2fwd_rx_queue_per_lcore = 1;
 
-struct mbuf_table {
-       uint64_t next_flush_time;
-       unsigned len;
-       struct rte_mbuf *mbufs[MAX_PKT_BURST];
-};
-
 #define MAX_RX_QUEUE_PER_LCORE 16
 #define MAX_TX_QUEUE_PER_PORT 16
 struct lcore_queue_conf {
        unsigned n_rx_port;
        unsigned rx_port_list[MAX_RX_QUEUE_PER_LCORE];
-       struct mbuf_table tx_mbufs[RTE_MAX_ETHPORTS];
+       uint64_t next_flush_time[RTE_MAX_ETHPORTS];
 
        struct rte_timer rx_timers[MAX_RX_QUEUE_PER_LCORE];
        struct rte_jobstats port_fwd_jobs[MAX_RX_QUEUE_PER_LCORE];
@@ -125,14 +85,11 @@ struct lcore_queue_conf {
 } __rte_cache_aligned;
 struct lcore_queue_conf lcore_queue_conf[RTE_MAX_LCORE];
 
-static const struct rte_eth_conf port_conf = {
+struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS];
+
+static struct rte_eth_conf port_conf = {
        .rxmode = {
                .split_hdr_size = 0,
-               .header_split   = 0, /**< Header Split disabled */
-               .hw_ip_checksum = 0, /**< IP checksum offload disabled */
-               .hw_vlan_filter = 0, /**< VLAN filtering disabled */
-               .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 0, /**< CRC stripped by hardware */
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -183,7 +140,7 @@ show_lcore_stats(unsigned lcore_id)
        uint64_t busy, busy_min, busy_max;
 
        /* Jobs statistics. */
-       const uint8_t port_cnt = qconf->n_rx_port;
+       const uint16_t port_cnt = qconf->n_rx_port;
        uint64_t jobs_exec_cnt[port_cnt], jobs_period[port_cnt];
        uint64_t jobs_exec[port_cnt], jobs_exec_min[port_cnt],
                                jobs_exec_max[port_cnt];
@@ -372,74 +329,35 @@ show_stats_cb(__rte_unused void *param)
        }
 
        printf("\n====================================================\n");
-       rte_eal_alarm_set(timer_period * US_PER_S, show_stats_cb, NULL);
-}
-
-/* Send the burst of packets on an output interface */
-static void
-l2fwd_send_burst(struct lcore_queue_conf *qconf, uint8_t port)
-{
-       struct mbuf_table *m_table;
-       uint16_t ret;
-       uint16_t queueid = 0;
-       uint16_t n;
-
-       m_table = &qconf->tx_mbufs[port];
-       n = m_table->len;
-
-       m_table->next_flush_time = rte_get_timer_cycles() + drain_tsc;
-       m_table->len = 0;
-
-       ret = rte_eth_tx_burst(port, queueid, m_table->mbufs, n);
-
-       port_statistics[port].tx += ret;
-       if (unlikely(ret < n)) {
-               port_statistics[port].dropped += (n - ret);
-               do {
-                       rte_pktmbuf_free(m_table->mbufs[ret]);
-               } while (++ret < n);
-       }
-}
-
-/* Enqueue packets for TX and prepare them to be sent */
-static int
-l2fwd_send_packet(struct rte_mbuf *m, uint8_t port)
-{
-       const unsigned lcore_id = rte_lcore_id();
-       struct lcore_queue_conf *qconf = &lcore_queue_conf[lcore_id];
-       struct mbuf_table *m_table = &qconf->tx_mbufs[port];
-       uint16_t len = qconf->tx_mbufs[port].len;
-
-       m_table->mbufs[len] = m;
 
-       len++;
-       m_table->len = len;
-
-       /* Enough pkts to be sent. */
-       if (unlikely(len == MAX_PKT_BURST))
-               l2fwd_send_burst(qconf, port);
+       fflush(stdout);
 
-       return 0;
+       rte_eal_alarm_set(timer_period * US_PER_S, show_stats_cb, NULL);
 }
 
 static void
 l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid)
 {
-       struct ether_hdr *eth;
+       struct rte_ether_hdr *eth;
        void *tmp;
+       int sent;
        unsigned dst_port;
+       struct rte_eth_dev_tx_buffer *buffer;
 
        dst_port = l2fwd_dst_ports[portid];
-       eth = rte_pktmbuf_mtod(m, struct ether_hdr *);
+       eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
 
        /* 02:00:00:00:00:xx */
        tmp = &eth->d_addr.addr_bytes[0];
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
 
-       l2fwd_send_packet(m, (uint8_t) dst_port);
+       buffer = tx_buffer[dst_port];
+       sent = rte_eth_tx_buffer(dst_port, 0, buffer, m);
+       if (sent)
+               port_statistics[dst_port].tx += sent;
 }
 
 static void
@@ -463,11 +381,11 @@ l2fwd_fwd_job(__rte_unused struct rte_timer *timer, void *arg)
        struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
        struct rte_mbuf *m;
 
-       const uint8_t port_idx = (uintptr_t) arg;
+       const uint16_t port_idx = (uintptr_t) arg;
        const unsigned lcore_id = rte_lcore_id();
        struct lcore_queue_conf *qconf = &lcore_queue_conf[lcore_id];
        struct rte_jobstats *job = &qconf->port_fwd_jobs[port_idx];
-       const uint8_t portid = qconf->rx_port_list[port_idx];
+       const uint16_t portid = qconf->rx_port_list[port_idx];
 
        uint8_t j;
        uint16_t total_nb_rx;
@@ -477,7 +395,7 @@ l2fwd_fwd_job(__rte_unused struct rte_timer *timer, void *arg)
        /* Call rx burst 2 times. This allow rte_jobstats logic to see if this
         * function must be called more frequently. */
 
-       total_nb_rx = rte_eth_rx_burst((uint8_t) portid, 0, pkts_burst,
+       total_nb_rx = rte_eth_rx_burst(portid, 0, pkts_burst,
                        MAX_PKT_BURST);
 
        for (j = 0; j < total_nb_rx; j++) {
@@ -487,7 +405,7 @@ l2fwd_fwd_job(__rte_unused struct rte_timer *timer, void *arg)
        }
 
        if (total_nb_rx == MAX_PKT_BURST) {
-               const uint16_t nb_rx = rte_eth_rx_burst((uint8_t) portid, 0, pkts_burst,
+               const uint16_t nb_rx = rte_eth_rx_burst(portid, 0, pkts_burst,
                                MAX_PKT_BURST);
 
                total_nb_rx += nb_rx;
@@ -513,8 +431,10 @@ l2fwd_flush_job(__rte_unused struct rte_timer *timer, __rte_unused void *arg)
        uint64_t now;
        unsigned lcore_id;
        struct lcore_queue_conf *qconf;
-       struct mbuf_table *m_table;
-       uint8_t portid;
+       uint16_t portid;
+       unsigned i;
+       uint32_t sent;
+       struct rte_eth_dev_tx_buffer *buffer;
 
        lcore_id = rte_lcore_id();
        qconf = &lcore_queue_conf[lcore_id];
@@ -524,14 +444,20 @@ l2fwd_flush_job(__rte_unused struct rte_timer *timer, __rte_unused void *arg)
        now = rte_get_timer_cycles();
        lcore_id = rte_lcore_id();
        qconf = &lcore_queue_conf[lcore_id];
-       for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) {
-               m_table = &qconf->tx_mbufs[portid];
-               if (m_table->len == 0 || m_table->next_flush_time <= now)
+
+       for (i = 0; i < qconf->n_rx_port; i++) {
+               portid = l2fwd_dst_ports[qconf->rx_port_list[i]];
+
+               if (qconf->next_flush_time[portid] <= now)
                        continue;
 
-               l2fwd_send_burst(qconf, portid);
-       }
+               buffer = tx_buffer[portid];
+               sent = rte_eth_tx_buffer_flush(portid, 0, buffer);
+               if (sent)
+                       port_statistics[portid].tx += sent;
 
+               qconf->next_flush_time[portid] = rte_get_timer_cycles() + drain_tsc;
+       }
 
        /* Pass target to indicate that this job is happy of time interwal
         * in which it was called. */
@@ -579,10 +505,13 @@ l2fwd_main_loop(void)
                         */
                        rte_jobstats_start(&qconf->jobs_context, &qconf->idle_job);
 
+                       uint64_t repeats = 0;
+
                        do {
                                uint8_t i;
                                uint64_t now = rte_get_timer_cycles();
 
+                               repeats++;
                                need_manage = qconf->flush_timer.expire < now;
                                /* Check if we was esked to give a stats. */
                                stats_read_pending =
@@ -593,7 +522,11 @@ l2fwd_main_loop(void)
                                        need_manage = qconf->rx_timers[i].expire < now;
 
                        } while (!need_manage);
-                       rte_jobstats_finish(&qconf->idle_job, qconf->idle_job.target);
+
+                       if (likely(repeats != 1))
+                               rte_jobstats_finish(&qconf->idle_job, qconf->idle_job.target);
+                       else
+                               rte_jobstats_abort(&qconf->idle_job);
 
                        rte_timer_manage();
                        rte_jobstats_context_finish(&qconf->jobs_context);
@@ -605,7 +538,7 @@ l2fwd_main_loop(void)
 }
 
 static int
-l2fwd_launch_one_lcore(__attribute__((unused)) void *dummy)
+l2fwd_launch_one_lcore(__rte_unused void *dummy)
 {
        l2fwd_main_loop();
        return 0;
@@ -632,10 +565,7 @@ l2fwd_parse_portmask(const char *portmask)
        /* parse hexadecimal string */
        pm = strtoul(portmask, &end, 16);
        if ((portmask[0] == '\0') || (end == NULL) || (*end != '\0'))
-               return -1;
-
-       if (pm == 0)
-               return -1;
+               return 0;
 
        return pm;
 }
@@ -742,43 +672,51 @@ l2fwd_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;
 }
 
 /* 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;
+       int ret;
 
        printf("\nChecking link status");
        fflush(stdout);
        for (count = 0; count <= MAX_CHECK_TIME; count++) {
                all_ports_up = 1;
-               for (portid = 0; portid < port_num; portid++) {
+               RTE_ETH_FOREACH_DEV(portid) {
                        if ((port_mask & (1 << portid)) == 0)
                                continue;
                        memset(&link, 0, sizeof(link));
-                       rte_eth_link_get_nowait(portid, &link);
+                       ret = rte_eth_link_get_nowait(portid, &link);
+                       if (ret < 0) {
+                               all_ports_up = 0;
+                               if (print_flag == 1)
+                                       printf("Port %u link get failed: %s\n",
+                                               portid, rte_strerror(-ret));
+                               continue;
+                       }
                        /* 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"));
+                                       ("full-duplex") : ("half-duplex"));
                                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;
                        }
@@ -805,14 +743,13 @@ int
 main(int argc, char **argv)
 {
        struct lcore_queue_conf *qconf;
-       struct rte_eth_dev_info dev_info;
        unsigned lcore_id, rx_lcore_id;
        unsigned nb_ports_in_mask = 0;
        int ret;
        char name[RTE_JOBSTATS_NAMESIZE];
-       uint8_t nb_ports;
-       uint8_t nb_ports_available;
-       uint8_t portid, last_port;
+       uint16_t nb_ports;
+       uint16_t nb_ports_available = 0;
+       uint16_t portid, last_port;
        uint8_t i;
 
        /* init EAL */
@@ -834,22 +771,15 @@ main(int argc, char **argv)
 
        /* create the mbuf pool */
        l2fwd_pktmbuf_pool =
-               rte_mempool_create("mbuf_pool", NB_MBUF,
-                                  MBUF_SIZE, 32,
-                                  sizeof(struct rte_pktmbuf_pool_private),
-                                  rte_pktmbuf_pool_init, NULL,
-                                  rte_pktmbuf_init, NULL,
-                                  rte_socket_id(), 0);
+               rte_pktmbuf_pool_create("mbuf_pool", NB_MBUF, 32,
+                       0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
        if (l2fwd_pktmbuf_pool == NULL)
                rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
 
-       nb_ports = rte_eth_dev_count();
+       nb_ports = rte_eth_dev_count_avail();
        if (nb_ports == 0)
                rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n");
 
-       if (nb_ports > RTE_MAX_ETHPORTS)
-               nb_ports = RTE_MAX_ETHPORTS;
-
        /* reset l2fwd_dst_ports */
        for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++)
                l2fwd_dst_ports[portid] = 0;
@@ -858,7 +788,7 @@ main(int argc, char **argv)
        /*
         * Each logical core is assigned a dedicated TX queue on each port.
         */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0)
                        continue;
@@ -870,8 +800,6 @@ main(int argc, char **argv)
                        last_port = portid;
 
                nb_ports_in_mask++;
-
-               rte_eth_dev_info_get(portid, &dev_info);
        }
        if (nb_ports_in_mask % 2) {
                printf("Notice: odd number of ports in portmask.\n");
@@ -882,7 +810,7 @@ main(int argc, char **argv)
        qconf = NULL;
 
        /* Initialize the port/queue configuration of each logical core */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0)
                        continue;
@@ -902,60 +830,116 @@ main(int argc, char **argv)
 
                qconf->rx_port_list[qconf->n_rx_port] = portid;
                qconf->n_rx_port++;
-               printf("Lcore %u: RX port %u\n", rx_lcore_id, (unsigned) portid);
+               printf("Lcore %u: RX port %u\n", rx_lcore_id, portid);
        }
 
-       nb_ports_available = nb_ports;
-
        /* Initialise each port */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
+               struct rte_eth_dev_info dev_info;
+               struct rte_eth_rxconf rxq_conf;
+               struct rte_eth_txconf txq_conf;
+               struct rte_eth_conf local_port_conf = port_conf;
+
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) {
-                       printf("Skipping disabled port %u\n", (unsigned) portid);
-                       nb_ports_available--;
+                       printf("Skipping disabled port %u\n", portid);
                        continue;
                }
+               nb_ports_available++;
+
                /* init port */
-               printf("Initializing port %u... ", (unsigned) portid);
+               printf("Initializing port %u... ", portid);
                fflush(stdout);
-               ret = rte_eth_dev_configure(portid, 1, 1, &port_conf);
+
+               ret = rte_eth_dev_info_get(portid, &dev_info);
+               if (ret != 0)
+                       rte_exit(EXIT_FAILURE,
+                               "Error during getting device (port %u) info: %s\n",
+                               portid, strerror(-ret));
+
+               if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+                       local_port_conf.txmode.offloads |=
+                               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+               ret = rte_eth_dev_configure(portid, 1, 1, &local_port_conf);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n",
-                                 ret, (unsigned) portid);
+                                 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=%u\n",
+                                ret, portid);
 
-               rte_eth_macaddr_get(portid, &l2fwd_ports_eth_addr[portid]);
+               ret = rte_eth_macaddr_get(portid,
+                                         &l2fwd_ports_eth_addr[portid]);
+               if (ret < 0)
+                       rte_exit(EXIT_FAILURE,
+                                "Cannot get MAC address: err=%d, port=%u\n",
+                                ret, portid);
 
                /* init one RX queue */
                fflush(stdout);
+               rxq_conf = dev_info.default_rxconf;
+               rxq_conf.offloads = local_port_conf.rxmode.offloads;
                ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
                                             rte_eth_dev_socket_id(portid),
-                                            NULL,
+                                            &rxq_conf,
                                             l2fwd_pktmbuf_pool);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup:err=%d, port=%u\n",
-                                 ret, (unsigned) portid);
+                                 ret, portid);
 
                /* init one TX queue on each port */
+               txq_conf = dev_info.default_txconf;
+               txq_conf.offloads = local_port_conf.txmode.offloads;
                fflush(stdout);
                ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
                                rte_eth_dev_socket_id(portid),
-                               NULL);
+                               &txq_conf);
+               if (ret < 0)
+                       rte_exit(EXIT_FAILURE,
+                       "rte_eth_tx_queue_setup:err=%d, port=%u\n",
+                               ret, portid);
+
+               /* Initialize TX buffers */
+               tx_buffer[portid] = rte_zmalloc_socket("tx_buffer",
+                               RTE_ETH_TX_BUFFER_SIZE(MAX_PKT_BURST), 0,
+                               rte_eth_dev_socket_id(portid));
+               if (tx_buffer[portid] == NULL)
+                       rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
+                                       portid);
+
+               rte_eth_tx_buffer_init(tx_buffer[portid], MAX_PKT_BURST);
+
+               ret = rte_eth_tx_buffer_set_err_callback(tx_buffer[portid],
+                               rte_eth_tx_buffer_count_callback,
+                               &port_statistics[portid].dropped);
                if (ret < 0)
-                       rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
-                               ret, (unsigned) portid);
+                       rte_exit(EXIT_FAILURE,
+                       "Cannot set error callback for tx buffer on port %u\n",
+                                portid);
 
                /* Start device */
                ret = rte_eth_dev_start(portid);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_dev_start:err=%d, port=%u\n",
-                                 ret, (unsigned) portid);
+                                 ret, portid);
 
                printf("done:\n");
 
-               rte_eth_promiscuous_enable(portid);
+               ret = rte_eth_promiscuous_enable(portid);
+               if (ret != 0) {
+                       rte_exit(EXIT_FAILURE,
+                                "rte_eth_promiscuous_enable:err=%s, port=%u\n",
+                                rte_strerror(-ret), portid);
+                       return ret;
+
+               }
 
                printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
-                               (unsigned) portid,
+                               portid,
                                l2fwd_ports_eth_addr[portid].addr_bytes[0],
                                l2fwd_ports_eth_addr[portid].addr_bytes[1],
                                l2fwd_ports_eth_addr[portid].addr_bytes[2],
@@ -972,7 +956,7 @@ main(int argc, char **argv)
                        "All available ports are disabled. Please set portmask.\n");
        }
 
-       check_all_ports_link_status(nb_ports, l2fwd_enabled_port_mask);
+       check_all_ports_link_status(l2fwd_enabled_port_mask);
 
        drain_tsc = (hz + US_PER_S - 1) / US_PER_S * BURST_TX_DRAIN_US;
 
@@ -997,11 +981,11 @@ main(int argc, char **argv)
                                drain_tsc, 0);
 
                rte_timer_init(&qconf->flush_timer);
-               rte_timer_reset(&qconf->flush_timer, drain_tsc, PERIODICAL, lcore_id,
-                               &l2fwd_flush_job, NULL);
+               ret = rte_timer_reset(&qconf->flush_timer, drain_tsc, PERIODICAL,
+                               lcore_id, &l2fwd_flush_job, NULL);
 
                if (ret < 0) {
-                       rte_exit(1, "Failed to add flush job for lcore %u: %s",
+                       rte_exit(1, "Failed to reset flush job timer for lcore %u: %s",
                                        lcore_id, rte_strerror(-ret));
                }
 
@@ -1009,7 +993,7 @@ main(int argc, char **argv)
                        struct rte_jobstats *job = &qconf->port_fwd_jobs[i];
 
                        portid = qconf->rx_port_list[i];
-                       printf("Setting forward jon for port %u\n", portid);
+                       printf("Setting forward job for port %u\n", portid);
 
                        snprintf(name, RTE_DIM(name), "port %u fwd", portid);
                        /* Setup forward job.
@@ -1019,8 +1003,13 @@ main(int argc, char **argv)
                        rte_jobstats_set_update_period_function(job, l2fwd_job_update_cb);
 
                        rte_timer_init(&qconf->rx_timers[i]);
-                       rte_timer_reset(&qconf->rx_timers[i], 0, PERIODICAL, lcore_id,
+                       ret = rte_timer_reset(&qconf->rx_timers[i], 0, PERIODICAL, lcore_id,
                                        &l2fwd_fwd_job, (void *)(uintptr_t)i);
+
+                       if (ret < 0) {
+                               rte_exit(1, "Failed to reset lcore %u port %u job timer: %s",
+                                               lcore_id, qconf->rx_port_list[i], rte_strerror(-ret));
+                       }
                }
        }