bus/vdev: move code from EAL into a new driver

[dpdk.git] / test / test / test_link_bonding_rssconf.c

diff --git a/test/test/test_link_bonding_rssconf.c b/test/test/test_link_bonding_rssconf.c
index 34f1c16..54cbf12 100644 (file)
--- a/test/test/test_link_bonding_rssconf.c
+++ b/test/test/test_link_bonding_rssconf.c
@@ -48,11 +48,11 @@
 #include <rte_log.h>
 #include <rte_lcore.h>
 #include <rte_memory.h>
+#include <rte_bus_vdev.h>
 
 #include <rte_string_fns.h>
 #include <rte_errno.h>
 #include <rte_eth_bond.h>
-#include <rte_eth_null.h>
 
 #include "test.h"
 
@@ -61,13 +61,13 @@
 #define RXTX_RING_SIZE                 1024
 #define RXTX_QUEUE_COUNT               4
 
-#define BONDED_DEV_NAME         ("rssconf_bond_dev")
+#define BONDED_DEV_NAME         ("net_bonding_rss")
 
-#define SLAVE_DEV_NAME_FMT      ("rssconf_slave%d")
+#define SLAVE_DEV_NAME_FMT      ("net_null%d")
 #define SLAVE_RXTX_QUEUE_FMT      ("rssconf_slave%d_q%d")
 
 #define NUM_MBUFS 8191
-#define MBUF_SIZE (1600 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
+#define MBUF_SIZE (1600 + RTE_PKTMBUF_HEADROOM)
 #define MBUF_CACHE_SIZE 250
 #define BURST_SIZE 32
 
@@ -76,7 +76,7 @@
 #define INVALID_BONDING_MODE    (-1)
 
 struct slave_conf {
-       uint8_t port_id;
+       uint16_t port_id;
        struct rte_eth_dev_info dev_info;
 
        struct rte_eth_rss_conf rss_conf;
@@ -116,7 +116,7 @@ static struct rte_eth_conf default_pmd_conf = {
                .hw_ip_checksum = 0, /**< IP checksum offload enabled */
                .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_MQ_TX_NONE,
@@ -133,7 +133,7 @@ static struct rte_eth_conf rss_pmd_conf = {
                .hw_ip_checksum = 0, /**< IP checksum offload enabled */
                .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_MQ_TX_NONE,
@@ -160,7 +160,8 @@ static struct rte_eth_conf rss_pmd_conf = {
                RTE_DIM(test_params.slave_ports))
 
 static int
-configure_ethdev(uint8_t port_id, struct rte_eth_conf *eth_conf, uint8_t start)
+configure_ethdev(uint16_t port_id, struct rte_eth_conf *eth_conf,
+                uint8_t start)
 {
        int rxq, txq;
 
@@ -244,7 +245,7 @@ bond_slaves(void)
  * Set all RETA values in port_id to value
  */
 static int
-reta_set(uint8_t port_id, uint8_t value, int reta_size)
+reta_set(uint16_t port_id, uint8_t value, int reta_size)
 {
        struct rte_eth_rss_reta_entry64 reta_conf[512/RTE_RETA_GROUP_SIZE];
        int i, j;
@@ -536,13 +537,12 @@ test_setup(void)
 
        if (test_params.mbuf_pool == NULL) {
 
-               test_params.mbuf_pool = rte_mempool_create("RSS_MBUF_POOL", NUM_MBUFS *
-                               SLAVE_COUNT, MBUF_SIZE, MBUF_CACHE_SIZE,
-                               sizeof(struct rte_pktmbuf_pool_private), rte_pktmbuf_pool_init,
-                               NULL, rte_pktmbuf_init, NULL, rte_socket_id(), 0);
+               test_params.mbuf_pool = rte_pktmbuf_pool_create(
+                       "RSS_MBUF_POOL", NUM_MBUFS * SLAVE_COUNT,
+                       MBUF_CACHE_SIZE, 0, MBUF_SIZE, rte_socket_id());
 
                TEST_ASSERT(test_params.mbuf_pool != NULL,
-                               "rte_mempool_create failed\n");
+                               "rte_pktmbuf_pool_create failed\n");
        }
 
        /* Create / initialize ring eth devs. */
@@ -552,7 +552,7 @@ test_setup(void)
                port_id = rte_eth_dev_count();
                snprintf(name, sizeof(name), SLAVE_DEV_NAME_FMT, port_id);
 
-               retval = eth_dev_null_create(name, 0, 64, 0);
+               retval = rte_vdev_init(name, "size=64,copy=0");
                TEST_ASSERT_SUCCESS(retval, "Failed to create null device '%s'\n",
                                name);