New upstream version 18.02

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

diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index 038f042..8914f76 100644 (file)
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 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-2014 Intel Corporation
  */
 
 #include <stdint.h>
@@ -84,15 +55,12 @@ const char *cfg_profile = NULL;
 int mp_size = NB_MBUF;
 struct flow_conf qos_conf[MAX_DATA_STREAMS];
 
-static const struct rte_eth_conf port_conf = {
+static struct rte_eth_conf port_conf = {
        .rxmode = {
                .max_rx_pkt_len = ETHER_MAX_LEN,
                .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   = 1, /**< CRC stripped by hardware */
+               .ignore_offload_bitfield = 1,
+               .offloads = DEV_RX_OFFLOAD_CRC_STRIP,
        },
        .txmode = {
                .mq_mode = ETH_DCB_NONE,
@@ -104,10 +72,12 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
 {
        int ret;
        struct rte_eth_link link;
+       struct rte_eth_dev_info dev_info;
        struct rte_eth_rxconf rx_conf;
        struct rte_eth_txconf tx_conf;
        uint16_t rx_size;
        uint16_t tx_size;
+       struct rte_eth_conf local_port_conf = port_conf;
 
        /* check if port already initialized (multistream configuration) */
        if (app_inited_port_mask & (1u << portid))
@@ -125,13 +95,17 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
        tx_conf.tx_thresh.wthresh = tx_thresh.wthresh;
        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;
+       tx_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
 
        /* init port */
        RTE_LOG(INFO, APP, "Initializing port %"PRIu16"... ", portid);
        fflush(stdout);
-       ret = rte_eth_dev_configure(portid, 1, 1, &port_conf);
+       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;
+       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",
@@ -149,6 +123,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
 
        /* init one RX queue */
        fflush(stdout);
+       rx_conf.offloads = local_port_conf.rxmode.offloads;
        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)
@@ -158,6 +133,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
 
        /* init one TX queue */
        fflush(stdout);
+       tx_conf.offloads = local_port_conf.txmode.offloads;
        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)