New upstream version 18.02

[deb_dpdk.git] / examples / tep_termination / vxlan_setup.c

diff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c
index 1ad4ca3..ba7d92a 100644 (file)
--- a/examples/tep_termination/vxlan_setup.c
+++ b/examples/tep_termination/vxlan_setup.c
@@ -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-2015 Intel Corporation
  */
 
 #include <getopt.h>
@@ -95,17 +66,22 @@ uint8_t tep_filter_type[] = {RTE_TUNNEL_FILTER_IMAC_TENID,
                        RTE_TUNNEL_FILTER_OMAC_TENID_IMAC,};
 
 /* Options for configuring ethernet port */
-static const struct rte_eth_conf port_conf = {
+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   = 1, /**< CRC stripped by hardware */
+               .ignore_offload_bitfield = 1,
+               .offloads = DEV_RX_OFFLOAD_CRC_STRIP,
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
+               .offloads = (DEV_TX_OFFLOAD_IPV4_CKSUM |
+                            DEV_TX_OFFLOAD_UDP_CKSUM |
+                            DEV_TX_OFFLOAD_TCP_CKSUM |
+                            DEV_TX_OFFLOAD_SCTP_CKSUM |
+                            DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
+                            DEV_TX_OFFLOAD_TCP_TSO |
+                            DEV_TX_OFFLOAD_MULTI_SEGS |
+                            DEV_TX_OFFLOAD_VXLAN_TNL_TSO),
        },
 };
 
@@ -141,6 +117,7 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool)
        struct rte_eth_rxconf *rxconf;
        struct rte_eth_txconf *txconf;
        struct vxlan_conf *pconf = &vxdev;
+       struct rte_eth_conf local_port_conf = port_conf;
 
        pconf->dst_port = udp_port;
 
@@ -154,15 +131,18 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool)
 
        rxconf = &dev_info.default_rxconf;
        txconf = &dev_info.default_txconf;
-       txconf->txq_flags = 0;
+       txconf->txq_flags = ETH_TXQ_FLAGS_IGNORE;
 
        if (port >= rte_eth_dev_count())
                return -1;
 
        rx_rings = nb_devices;
-
+       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+               local_port_conf.txmode.offloads |=
+                       DEV_TX_OFFLOAD_MBUF_FAST_FREE;
        /* Configure ethernet device. */
-       retval = rte_eth_dev_configure(port, rx_rings, tx_rings, &port_conf);
+       retval = rte_eth_dev_configure(port, rx_rings, tx_rings,
+                                      &local_port_conf);
        if (retval != 0)
                return retval;
 
@@ -172,6 +152,7 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool)
                return retval;
 
        /* Setup the queues. */
+       rxconf->offloads = local_port_conf.rxmode.offloads;
        for (q = 0; q < rx_rings; q++) {
                retval = rte_eth_rx_queue_setup(port, q, rx_ring_size,
                                                rte_eth_dev_socket_id(port),
@@ -180,6 +161,7 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool)
                if (retval < 0)
                        return retval;
        }
+       txconf->offloads = local_port_conf.txmode.offloads;
        for (q = 0; q < tx_rings; q++) {
                retval = rte_eth_tx_queue_setup(port, q, tx_ring_size,
                                                rte_eth_dev_socket_id(port),