New upstream version 18.11-rc1

[deb_dpdk.git] / examples / flow_filtering / main.c

diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
index 7d739b4..a73d120 100644 (file)
--- a/examples/flow_filtering/main.c
+++ b/examples/flow_filtering/main.c
@@ -1,33 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright 2017 Mellanox.
- *
- *   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 Mellanox. 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 2017 Mellanox Technologies, Ltd
  */
 
 #include <stdio.h>
@@ -55,10 +27,11 @@
 #include <rte_mbuf.h>
 #include <rte_net.h>
 #include <rte_flow.h>
+#include <rte_cycles.h>
 
 static volatile bool force_quit;
 
-static uint8_t port_id;
+static uint16_t port_id;
 static uint16_t nr_queues = 5;
 static uint8_t selected_queue = 1;
 struct rte_mempool *mbuf_pool;
@@ -119,13 +92,23 @@ main_loop(void)
        rte_eth_dev_close(port_id);
 }
 
+#define CHECK_INTERVAL 1000  /* 100ms */
+#define MAX_REPEAT_TIMES 90  /* 9s (90 * 100ms) in total */
+
 static void
 assert_link_status(void)
 {
        struct rte_eth_link link;
+       uint8_t rep_cnt = MAX_REPEAT_TIMES;
 
        memset(&link, 0, sizeof(link));
-       rte_eth_link_get(port_id, &link);
+       do {
+               rte_eth_link_get(port_id, &link);
+               if (link.link_status == ETH_LINK_UP)
+                       break;
+               rte_delay_ms(CHECK_INTERVAL);
+       } while (--rep_cnt);
+
        if (link.link_status == ETH_LINK_DOWN)
                rte_exit(EXIT_FAILURE, ":: error: link is still down\n");
 }
@@ -138,18 +121,20 @@ init_port(void)
        struct rte_eth_conf port_conf = {
                .rxmode = {
                        .split_hdr_size = 0,
-                       /**< Header Split disabled */
-                       .header_split   = 0,
-                       /**< IP checksum offload disabled */
-                       .hw_ip_checksum = 0,
-                       /**< VLAN filtering disabled */
-                       .hw_vlan_filter = 0,
-                       /**< Jumbo Frame Support disabled */
-                       .jumbo_frame    = 0,
-                       /**< CRC stripped by hardware */
-                       .hw_strip_crc   = 1,
+               },
+               .txmode = {
+                       .offloads =
+                               DEV_TX_OFFLOAD_VLAN_INSERT |
+                               DEV_TX_OFFLOAD_IPV4_CKSUM  |
+                               DEV_TX_OFFLOAD_UDP_CKSUM   |
+                               DEV_TX_OFFLOAD_TCP_CKSUM   |
+                               DEV_TX_OFFLOAD_SCTP_CKSUM  |
+                               DEV_TX_OFFLOAD_TCP_TSO,
                },
        };
+       struct rte_eth_txconf txq_conf;
+       struct rte_eth_rxconf rxq_conf;
+       struct rte_eth_dev_info dev_info;
 
        printf(":: initializing port: %d\n", port_id);
        ret = rte_eth_dev_configure(port_id,
@@ -160,11 +145,14 @@ init_port(void)
                        ret, port_id);
        }
 
+       rte_eth_dev_info_get(port_id, &dev_info);
+       rxq_conf = dev_info.default_rxconf;
+       rxq_conf.offloads = port_conf.rxmode.offloads;
        /* only set Rx queues: something we care only so far */
        for (i = 0; i < nr_queues; i++) {
                ret = rte_eth_rx_queue_setup(port_id, i, 512,
                                     rte_eth_dev_socket_id(port_id),
-                                    NULL,
+                                    &rxq_conf,
                                     mbuf_pool);
                if (ret < 0) {
                        rte_exit(EXIT_FAILURE,
@@ -173,6 +161,20 @@ init_port(void)
                }
        }
 
+       txq_conf = dev_info.default_txconf;
+       txq_conf.offloads = port_conf.txmode.offloads;
+
+       for (i = 0; i < nr_queues; i++) {
+               ret = rte_eth_tx_queue_setup(port_id, i, 512,
+                               rte_eth_dev_socket_id(port_id),
+                               &txq_conf);
+               if (ret < 0) {
+                       rte_exit(EXIT_FAILURE,
+                               ":: Tx queue setup failed: err=%d, port=%u\n",
+                               ret, port_id);
+               }
+       }
+
        rte_eth_promiscuous_enable(port_id);
        ret = rte_eth_dev_start(port_id);
        if (ret < 0) {
@@ -200,7 +202,7 @@ int
 main(int argc, char **argv)
 {
        int ret;
-       uint8_t nr_ports;
+       uint16_t nr_ports;
        struct rte_flow_error error;
 
        ret = rte_eal_init(argc, argv);
@@ -211,7 +213,7 @@ main(int argc, char **argv)
        signal(SIGINT, signal_handler);
        signal(SIGTERM, signal_handler);
 
-       nr_ports = rte_eth_dev_count();
+       nr_ports = rte_eth_dev_count_avail();
        if (nr_ports == 0)
                rte_exit(EXIT_FAILURE, ":: no Ethernet ports found\n");
        port_id = 0;