bus/pci: fix UIO bind check

[dpdk.git] / examples / qos_sched / init.c

diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index f38802e..038f042 100644 (file)
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -42,6 +42,7 @@
 #include <rte_sched.h>
 #include <rte_cycles.h>
 #include <rte_string_fns.h>
+#include <rte_cfgfile.h>
 
 #include "main.h"
 #include "cfg_file.h"
@@ -91,7 +92,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_DCB_NONE,
@@ -99,12 +100,14 @@ static const struct rte_eth_conf port_conf = {
 };
 
 static int
-app_init_port(uint8_t portid, struct rte_mempool *mp)
+app_init_port(uint16_t portid, struct rte_mempool *mp)
 {
        int ret;
        struct rte_eth_link link;
        struct rte_eth_rxconf rx_conf;
        struct rte_eth_txconf tx_conf;
+       uint16_t rx_size;
+       uint16_t tx_size;
 
        /* check if port already initialized (multistream configuration) */
        if (app_inited_port_mask & (1u << portid))
@@ -115,6 +118,7 @@ app_init_port(uint8_t portid, struct rte_mempool *mp)
        rx_conf.rx_thresh.wthresh = rx_thresh.wthresh;
        rx_conf.rx_free_thresh = 32;
        rx_conf.rx_drop_en = 0;
+       rx_conf.rx_deferred_start = 0;
 
        tx_conf.tx_thresh.pthresh = tx_thresh.pthresh;
        tx_conf.tx_thresh.hthresh = tx_thresh.hthresh;
@@ -122,36 +126,51 @@ app_init_port(uint8_t portid, struct rte_mempool *mp)
        tx_conf.tx_free_thresh = 0;
        tx_conf.tx_rs_thresh = 0;
        tx_conf.txq_flags = ETH_TXQ_FLAGS_NOMULTSEGS | ETH_TXQ_FLAGS_NOOFFLOADS;
+       tx_conf.tx_deferred_start = 0;
 
        /* init port */
-       RTE_LOG(INFO, APP, "Initializing port %"PRIu8"... ", portid);
+       RTE_LOG(INFO, APP, "Initializing port %"PRIu16"... ", 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=%"PRIu8"\n", ret, portid);
+               rte_exit(EXIT_FAILURE,
+                        "Cannot configure device: err=%d, port=%u\n",
+                        ret, portid);
+
+       rx_size = ring_conf.rx_size;
+       tx_size = ring_conf.tx_size;
+       ret = rte_eth_dev_adjust_nb_rx_tx_desc(portid, &rx_size, &tx_size);
+       if (ret < 0)
+               rte_exit(EXIT_FAILURE,
+                        "rte_eth_dev_adjust_nb_rx_tx_desc: err=%d,port=%u\n",
+                        ret, portid);
+       ring_conf.rx_size = rx_size;
+       ring_conf.tx_size = tx_size;
 
        /* init one RX queue */
        fflush(stdout);
        ret = rte_eth_rx_queue_setup(portid, 0, (uint16_t)ring_conf.rx_size,
                rte_eth_dev_socket_id(portid), &rx_conf, mp);
        if (ret < 0)
-               rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: "
-                               "err=%d, port=%"PRIu8"\n", ret, portid);
+               rte_exit(EXIT_FAILURE,
+                        "rte_eth_tx_queue_setup: err=%d, port=%u\n",
+                        ret, portid);
 
        /* init one TX queue */
        fflush(stdout);
        ret = rte_eth_tx_queue_setup(portid, 0,
                (uint16_t)ring_conf.tx_size, rte_eth_dev_socket_id(portid), &tx_conf);
        if (ret < 0)
-               rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d, "
-                               "port=%"PRIu8" queue=%d\n", ret, portid, 0);
+               rte_exit(EXIT_FAILURE,
+                        "rte_eth_tx_queue_setup: err=%d, port=%u queue=%d\n",
+                        ret, portid, 0);
 
        /* Start device */
        ret = rte_eth_dev_start(portid);
        if (ret < 0)
-               rte_exit(EXIT_FAILURE, "rte_pmd_port_start: "
-                               "err=%d, port=%"PRIu8"\n", ret, portid);
+               rte_exit(EXIT_FAILURE,
+                        "rte_pmd_port_start: err=%d, port=%u\n",
+                        ret, portid);
 
        printf("done: ");
 
@@ -244,7 +263,7 @@ app_init_sched_port(uint32_t portid, uint32_t socketid)
        uint32_t pipe, subport;
        int err;
 
-       rte_eth_link_get((uint8_t)portid, &link);
+       rte_eth_link_get(portid, &link);
 
        port_params.socket = socketid;
        port_params.rate = (uint64_t) link.link_speed * 1000 * 1000 / 8;
@@ -284,16 +303,15 @@ app_load_cfg_profile(const char *profile)
 {
        if (profile == NULL)
                return 0;
-
-       struct cfg_file *cfg_file = cfg_load(profile, 0);
-       if (cfg_file == NULL)
+       struct rte_cfgfile *file = rte_cfgfile_load(profile, 0);
+       if (file == NULL)
                rte_exit(EXIT_FAILURE, "Cannot load configuration profile %s\n", profile);
 
-       cfg_load_port(cfg_file, &port_params);
-       cfg_load_subport(cfg_file, subport_params);
-       cfg_load_pipe(cfg_file, pipe_profiles);
+       cfg_load_port(file, &port_params);
+       cfg_load_subport(file, subport_params);
+       cfg_load_pipe(file, pipe_profiles);
 
-       cfg_close(cfg_file);
+       rte_cfgfile_close(file);
 
        return 0;
 }
@@ -335,13 +353,10 @@ int app_init(void)
 
                /* create the mbuf pools for each RX Port */
                snprintf(pool_name, MAX_NAME_LEN, "mbuf_pool%u", i);
-               qos_conf[i].mbuf_pool = rte_mempool_create(pool_name, mp_size, MBUF_SIZE,
-                                               burst_conf.rx_burst * 4,
-                                               sizeof(struct rte_pktmbuf_pool_private),
-                                               rte_pktmbuf_pool_init, NULL,
-                                               rte_pktmbuf_init, NULL,
-                                               rte_eth_dev_socket_id(qos_conf[i].rx_port),
-                                               0);
+               qos_conf[i].mbuf_pool = rte_pktmbuf_pool_create(pool_name,
+                       mp_size, burst_conf.rx_burst * 4, 0,
+                       RTE_MBUF_DEFAULT_BUF_SIZE,
+                       rte_eth_dev_socket_id(qos_conf[i].rx_port));
                if (qos_conf[i].mbuf_pool == NULL)
                        rte_exit(EXIT_FAILURE, "Cannot init mbuf pool for socket %u\n", i);