ethdev: increase port id range

[dpdk.git] / examples / l2fwd-jobstats / main.c

diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index 614ea60..9511156 100644 (file)
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -38,7 +38,6 @@
 #include <ctype.h>
 #include <getopt.h>
 
-#include <rte_alarm.h>
 #include <rte_common.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
@@ -46,7 +45,6 @@
 #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>
@@ -59,7 +57,6 @@
 #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>
@@ -68,6 +65,7 @@
 #include <rte_jobstats.h>
 #include <rte_timer.h>
 #include <rte_alarm.h>
+#include <rte_pause.h>
 
 #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1
 
@@ -127,7 +125,7 @@ static const struct rte_eth_conf port_conf = {
                .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 */
+               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -710,7 +708,7 @@ 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;
 }
 
@@ -778,9 +776,9 @@ main(int argc, char **argv)
        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;
+       uint16_t portid, last_port;
        uint8_t i;
 
        /* init EAL */
@@ -863,7 +861,7 @@ 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;
@@ -872,17 +870,24 @@ main(int argc, char **argv)
        for (portid = 0; portid < nb_ports; portid++) {
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) {
-                       printf("Skipping disabled port %u\n", (unsigned) portid);
+                       printf("Skipping disabled port %u\n", portid);
                        nb_ports_available--;
                        continue;
                }
                /* 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);
                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]);
 
@@ -894,7 +899,7 @@ main(int argc, char **argv)
                                             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 */
                fflush(stdout);
@@ -902,8 +907,9 @@ main(int argc, char **argv)
                                rte_eth_dev_socket_id(portid),
                                NULL);
                if (ret < 0)
-                       rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
-                               ret, (unsigned) portid);
+                       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",
@@ -911,7 +917,7 @@ main(int argc, char **argv)
                                rte_eth_dev_socket_id(portid));
                if (tx_buffer[portid] == NULL)
                        rte_exit(EXIT_FAILURE, "Cannot allocate buffer for tx on port %u\n",
-                                       (unsigned) portid);
+                                       portid);
 
                rte_eth_tx_buffer_init(tx_buffer[portid], MAX_PKT_BURST);
 
@@ -919,21 +925,22 @@ main(int argc, char **argv)
                                rte_eth_tx_buffer_count_callback,
                                &port_statistics[portid].dropped);
                if (ret < 0)
-                               rte_exit(EXIT_FAILURE, "Cannot set error callback for "
-                                               "tx buffer on port %u\n", (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);
 
                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],