New upstream version 18.11-rc1
[deb_dpdk.git] / test / test / virtual_pmd.c
index e9dd8ac..f8ddc2d 100644 (file)
@@ -1,38 +1,12 @@
-/*-
- *   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 <rte_mbuf.h>
 #include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
+#include <rte_pci.h>
+#include <rte_bus_pci.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_memory.h>
@@ -210,13 +184,15 @@ virtual_ethdev_link_update_fail(struct rte_eth_dev *bonded_eth_dev __rte_unused,
        return -1;
 }
 
-static void
+static int
 virtual_ethdev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
 
        if (stats)
                rte_memcpy(stats, &dev_private->eth_stats, sizeof(*stats));
+
+       return 0;
 }
 
 static void
@@ -240,6 +216,12 @@ static void
 virtual_ethdev_promiscuous_mode_disable(struct rte_eth_dev *dev __rte_unused)
 {}
 
+static int
+virtual_ethdev_mac_address_set(__rte_unused struct rte_eth_dev *dev,
+                              __rte_unused struct ether_addr *addr)
+{
+       return 0;
+}
 
 static const struct eth_dev_ops virtual_ethdev_default_dev_ops = {
        .dev_configure = virtual_ethdev_configure_success,
@@ -252,15 +234,15 @@ static const struct eth_dev_ops virtual_ethdev_default_dev_ops = {
        .rx_queue_release = virtual_ethdev_rx_queue_release,
        .tx_queue_release = virtual_ethdev_tx_queue_release,
        .link_update = virtual_ethdev_link_update_success,
+       .mac_addr_set = virtual_ethdev_mac_address_set,
        .stats_get = virtual_ethdev_stats_get,
        .stats_reset = virtual_ethdev_stats_reset,
        .promiscuous_enable = virtual_ethdev_promiscuous_mode_enable,
        .promiscuous_disable = virtual_ethdev_promiscuous_mode_disable
 };
 
-
 void
-virtual_ethdev_start_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_start_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -274,7 +256,7 @@ virtual_ethdev_start_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_configure_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_configure_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -287,7 +269,7 @@ virtual_ethdev_configure_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_rx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_rx_queue_setup_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -300,7 +282,7 @@ virtual_ethdev_rx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_tx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_tx_queue_setup_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -313,7 +295,7 @@ virtual_ethdev_tx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_link_update_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_link_update_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
        struct virtual_ethdev_private *dev_private = dev->data->dev_private;
@@ -429,7 +411,7 @@ virtual_ethdev_tx_burst_fail(void *queue, struct rte_mbuf **bufs,
 
 
 void
-virtual_ethdev_rx_burst_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_rx_burst_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
 
@@ -441,7 +423,7 @@ virtual_ethdev_rx_burst_fn_set_success(uint8_t port_id, uint8_t success)
 
 
 void
-virtual_ethdev_tx_burst_fn_set_success(uint8_t port_id, uint8_t success)
+virtual_ethdev_tx_burst_fn_set_success(uint16_t port_id, uint8_t success)
 {
        struct virtual_ethdev_private *dev_private = NULL;
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
@@ -457,7 +439,7 @@ virtual_ethdev_tx_burst_fn_set_success(uint8_t port_id, uint8_t success)
 }
 
 void
-virtual_ethdev_tx_burst_fn_set_tx_pkt_fail_count(uint8_t port_id,
+virtual_ethdev_tx_burst_fn_set_tx_pkt_fail_count(uint16_t port_id,
                uint8_t packet_fail_count)
 {
        struct virtual_ethdev_private *dev_private = NULL;
@@ -469,7 +451,7 @@ virtual_ethdev_tx_burst_fn_set_tx_pkt_fail_count(uint8_t port_id,
 }
 
 void
-virtual_ethdev_set_link_status(uint8_t port_id, uint8_t link_status)
+virtual_ethdev_set_link_status(uint16_t port_id, uint8_t link_status)
 {
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
 
@@ -477,18 +459,19 @@ virtual_ethdev_set_link_status(uint8_t port_id, uint8_t link_status)
 }
 
 void
-virtual_ethdev_simulate_link_status_interrupt(uint8_t port_id,
+virtual_ethdev_simulate_link_status_interrupt(uint16_t port_id,
                uint8_t link_status)
 {
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
 
        vrtl_eth_dev->data->dev_link.link_status = link_status;
 
-       _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
+       _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC,
+                                     NULL);
 }
 
 int
-virtual_ethdev_add_mbufs_to_rx_queue(uint8_t port_id,
+virtual_ethdev_add_mbufs_to_rx_queue(uint16_t port_id,
                struct rte_mbuf **pkt_burst, int burst_length)
 {
        struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
@@ -500,7 +483,7 @@ virtual_ethdev_add_mbufs_to_rx_queue(uint8_t port_id,
 }
 
 int
-virtual_ethdev_get_mbufs_from_tx_queue(uint8_t port_id,
+virtual_ethdev_get_mbufs_from_tx_queue(uint16_t port_id,
                struct rte_mbuf **pkt_burst, int burst_length)
 {
        struct virtual_ethdev_private *dev_private;
@@ -511,20 +494,6 @@ virtual_ethdev_get_mbufs_from_tx_queue(uint8_t port_id,
                burst_length, NULL);
 }
 
-static uint8_t
-get_number_of_sockets(void)
-{
-       int sockets = 0;
-       int i;
-       const struct rte_memseg *ms = rte_eal_get_physmem_layout();
-
-       for (i = 0; i < RTE_MAX_MEMSEG && ms[i].addr != NULL; i++) {
-               if (sockets < ms[i].socket_id)
-                       sockets = ms[i].socket_id;
-       }
-       /* Number of sockets = maximum socket_id + 1 */
-       return ++sockets;
-}
 
 int
 virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
@@ -542,9 +511,6 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
         * and internal (dev_private) data
         */
 
-       if (socket_id >= get_number_of_sockets())
-               goto err;
-
        pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, socket_id);
        if (pci_dev == NULL)
                goto err;
@@ -580,6 +546,7 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
                goto err;
 
        pci_dev->device.numa_node = socket_id;
+       pci_dev->device.name = eth_dev->data->name;
        pci_drv->driver.name = virtual_ethdev_driver_name;
        pci_drv->id_table = id_table;
 
@@ -623,6 +590,8 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
        eth_dev->rx_pkt_burst = virtual_ethdev_rx_burst_success;
        eth_dev->tx_pkt_burst = virtual_ethdev_tx_burst_success;
 
+       rte_eth_dev_probing_finish(eth_dev);
+
        return eth_dev->data->port_id;
 
 err: