ring: relax alignment constraint on ring structure

[dpdk.git] / examples / exception_path / main.c

diff --git a/examples/exception_path/main.c b/examples/exception_path/main.c
index 06a0d4c..dda391c 100644 (file)
--- a/examples/exception_path/main.c
+++ b/examples/exception_path/main.c
@@ -41,13 +41,21 @@
 #include <rte_string_fns.h>
 #include <rte_cycles.h>
 
+#ifndef APP_MAX_LCORE
+#if (RTE_MAX_LCORE > 64)
+#define APP_MAX_LCORE 64
+#else
+#define APP_MAX_LCORE RTE_MAX_LCORE
+#endif
+#endif
+
 /* Macros for printing using RTE_LOG */
 #define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
 #define FATAL_ERROR(fmt, args...)       rte_exit(EXIT_FAILURE, fmt "\n", ##args)
 #define PRINT_INFO(fmt, args...)        RTE_LOG(INFO, APP, fmt "\n", ##args)
 
 /* Max ports than can be used (each port is associated with two lcores) */
-#define MAX_PORTS               (RTE_MAX_LCORE / 2)
+#define MAX_PORTS               (APP_MAX_LCORE / 2)
 
 /* Max size of a single packet */
 #define MAX_PACKET_SZ (2048)
@@ -65,10 +73,10 @@
 #define MEMPOOL_CACHE_SZ        PKT_BURST_SZ
 
 /* Number of RX ring descriptors */
-#define NB_RXD                  128
+#define NB_RXD                  1024
 
 /* Number of TX ring descriptors */
-#define NB_TXD                  512
+#define NB_TXD                  1024
 
 /*
  * RX and TX Prefetch, Host, and Write-back threshold values should be
@@ -78,13 +86,10 @@
  */
 
 /* Options for configuring ethernet port */
-static const struct rte_eth_conf port_conf = {
+static struct rte_eth_conf port_conf = {
        .rxmode = {
-               .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 = 1,      /* CRC stripped by hardware */
+               .ignore_offload_bitfield = 1,
+               .offloads = DEV_RX_OFFLOAD_CRC_STRIP,
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -104,17 +109,17 @@ static uint64_t input_cores_mask = 0;
 static uint64_t output_cores_mask = 0;
 
 /* Array storing port_id that is associated with each lcore */
-static uint16_t port_ids[RTE_MAX_LCORE];
+static uint16_t port_ids[APP_MAX_LCORE];
 
 /* Structure type for recording lcore-specific stats */
 struct stats {
        uint64_t rx;
        uint64_t tx;
        uint64_t dropped;
-};
+} __rte_cache_aligned;
 
 /* Array of lcore-specific stats */
-static struct stats lcore_stats[RTE_MAX_LCORE];
+static struct stats lcore_stats[APP_MAX_LCORE];
 
 /* Print out statistics on packets handled */
 static void
@@ -333,7 +338,9 @@ setup_port_lcore_affinities(void)
        uint16_t rx_port = 0;
 
        /* Setup port_ids[] array, and check masks were ok */
-       RTE_LCORE_FOREACH(i) {
+       for (i = 0; i < APP_MAX_LCORE; i++) {
+               if (!rte_lcore_is_enabled(i))
+                       continue;
                if (input_cores_mask & (1ULL << i)) {
                        /* Skip ports that are not enabled */
                        while ((ports_mask & (1 << rx_port)) == 0) {
@@ -418,11 +425,19 @@ init_port(uint16_t port)
        int ret;
        uint16_t nb_rxd = NB_RXD;
        uint16_t nb_txd = NB_TXD;
+       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;
 
        /* Initialise device and RX/TX queues */
        PRINT_INFO("Initialising port %u ...", port);
        fflush(stdout);
-       ret = rte_eth_dev_configure(port, 1, 1, &port_conf);
+       rte_eth_dev_info_get(port, &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;
+       ret = rte_eth_dev_configure(port, 1, 1, &local_port_conf);
        if (ret < 0)
                FATAL_ERROR("Could not configure port%u (%d)", port, ret);
 
@@ -431,17 +446,22 @@ init_port(uint16_t port)
                FATAL_ERROR("Could not adjust number of descriptors for port%u (%d)",
                            port, ret);
 
+       rxq_conf = dev_info.default_rxconf;
+       rxq_conf.offloads = local_port_conf.rxmode.offloads;
        ret = rte_eth_rx_queue_setup(port, 0, nb_rxd,
                                rte_eth_dev_socket_id(port),
-                               NULL,
+                               &rxq_conf,
                                pktmbuf_pool);
        if (ret < 0)
                FATAL_ERROR("Could not setup up RX queue for port%u (%d)",
                                port, ret);
 
+       txq_conf = dev_info.default_txconf;
+       txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
+       txq_conf.offloads = local_port_conf.txmode.offloads;
        ret = rte_eth_tx_queue_setup(port, 0, nb_txd,
                                rte_eth_dev_socket_id(port),
-                               NULL);
+                               &txq_conf);
        if (ret < 0)
                FATAL_ERROR("Could not setup up TX queue for port%u (%d)",
                                port, ret);