* [dpdk-dev] [PATCH v7 6/9] test: dynamic rss configuration
@ 2015-10-30 13:56 Tomasz Kulasek
0 siblings, 0 replies; 2+ messages in thread
From: Tomasz Kulasek @ 2015-10-30 13:56 UTC (permalink / raw)
To: dev
Date: Fri, 30 Oct 2015 14:56:01 +0100
Message-Id: <1446213364-11856-7-git-send-email-tomaszx.kulasek@intel.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <1446213364-11856-1-git-send-email-tomaszx.kulasek@intel.com>
References: <1444989651-6236-1-git-send-email-tomaszx.kulasek@intel.com>
<1446213364-11856-1-git-send-email-tomaszx.kulasek@intel.com>
v7 changes:
- Makefile for test app changed to not break compilation when
CONFIG_RTE_LIBRTE_PMD_NULL=n (now module is silently omitted when
requirements not met)
Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
Acked-by: Declan Doherty <declan.doherty@intel.com>
---
app/test/Makefile | 7 +
app/test/test_link_bonding_rssconf.c | 679 ++++++++++++++++++++++++++++++++++
2 files changed, 686 insertions(+)
create mode 100644 app/test/test_link_bonding_rssconf.c
diff --git a/app/test/Makefile b/app/test/Makefile
index 294618f..ef9125d 100644
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -140,6 +140,13 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_mode4.c
endif
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y)
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_rssconf.c
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+LDLIBS += -lrte_pmd_null
+endif
+endif
+
SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c
diff --git a/app/test/test_link_bonding_rssconf.c b/app/test/test_link_bonding_rssconf.c
new file mode 100644
index 0000000..e6714b4
--- /dev/null
+++ b/app/test/test_link_bonding_rssconf.c
@@ -0,0 +1,679 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 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.
+ */
+
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <rte_cycles.h>
+#include <sys/queue.h>
+
+#include <rte_byteorder.h>
+#include <rte_common.h>
+#include <rte_debug.h>
+#include <rte_ethdev.h>
+#include <rte_log.h>
+#include <rte_lcore.h>
+#include <rte_memory.h>
+
+#include <rte_string_fns.h>
+#include <rte_errno.h>
+#include <rte_eth_bond.h>
+#include <rte_eth_null.h>
+
+#include "test.h"
+
+#define SLAVE_COUNT (4)
+
+#define RXTX_RING_SIZE 1024
+#define RXTX_QUEUE_COUNT 4
+
+#define BONDED_DEV_NAME ("rssconf_bond_dev")
+
+#define SLAVE_DEV_NAME_FMT ("rssconf_slave%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_CACHE_SIZE 250
+#define BURST_SIZE 32
+
+#define INVALID_SOCKET_ID (-1)
+#define INVALID_PORT_ID (0xFF)
+#define INVALID_BONDING_MODE (-1)
+
+struct slave_conf {
+ uint8_t port_id;
+ struct rte_eth_dev_info dev_info;
+
+ struct rte_eth_rss_conf rss_conf;
+ uint8_t rss_key[40];
+ struct rte_eth_rss_reta_entry64 reta_conf[512 / RTE_RETA_GROUP_SIZE];
+
+ uint8_t is_slave;
+ struct rte_ring *rxtx_queue[RXTX_QUEUE_COUNT];
+};
+
+struct link_bonding_rssconf_unittest_params {
+ uint8_t bond_port_id;
+ struct rte_eth_dev_info bond_dev_info;
+ struct rte_eth_rss_reta_entry64 bond_reta_conf[512 / RTE_RETA_GROUP_SIZE];
+ struct slave_conf slave_ports[SLAVE_COUNT];
+
+ struct rte_mempool *mbuf_pool;
+};
+
+static struct link_bonding_rssconf_unittest_params test_params = {
+ .bond_port_id = INVALID_PORT_ID,
+ .slave_ports = {
+ [0 ... SLAVE_COUNT - 1] = { .port_id = INVALID_PORT_ID, .is_slave = 0}
+ },
+ .mbuf_pool = NULL,
+};
+
+/**
+ * Default port configuration with RSS turned off
+ */
+static struct rte_eth_conf default_pmd_conf = {
+ .rxmode = {
+ .mq_mode = ETH_MQ_RX_NONE,
+ .max_rx_pkt_len = ETHER_MAX_LEN,
+ .split_hdr_size = 0,
+ .header_split = 0, /**< Header Split disabled */
+ .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 */
+ },
+ .txmode = {
+ .mq_mode = ETH_MQ_TX_NONE,
+ },
+ .lpbk_mode = 0,
+};
+
+static struct rte_eth_conf rss_pmd_conf = {
+ .rxmode = {
+ .mq_mode = ETH_MQ_RX_RSS,
+ .max_rx_pkt_len = ETHER_MAX_LEN,
+ .split_hdr_size = 0,
+ .header_split = 0, /**< Header Split disabled */
+ .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 */
+ },
+ .txmode = {
+ .mq_mode = ETH_MQ_TX_NONE,
+ },
+ .rx_adv_conf = {
+ .rss_conf = {
+ .rss_key = NULL,
+ .rss_hf = ETH_RSS_IPV6,
+ },
+ },
+ .lpbk_mode = 0,
+};
+
+#define FOR_EACH(_i, _item, _array, _size) \
+ for (_i = 0, _item = &_array[0]; _i < _size && (_item = &_array[_i]); _i++)
+
+/* Macro for iterating over every port that can be used as a slave
+ * in this test.
+ * _i variable used as an index in test_params->slave_ports
+ * _slave pointer to &test_params->slave_ports[_idx]
+ */
+#define FOR_EACH_PORT(_i, _port) \
+ FOR_EACH(_i, _port, test_params.slave_ports, \
+ RTE_DIM(test_params.slave_ports))
+
+static int
+configure_ethdev(uint8_t port_id, struct rte_eth_conf *eth_conf, uint8_t start)
+{
+ int rxq, txq;
+
+ TEST_ASSERT(rte_eth_dev_configure(port_id, RXTX_QUEUE_COUNT,
+ RXTX_QUEUE_COUNT, eth_conf) == 0, "Failed to configure device %u",
+ port_id);
+
+ for (rxq = 0; rxq < RXTX_QUEUE_COUNT; rxq++) {
+ TEST_ASSERT(rte_eth_rx_queue_setup(port_id, rxq, RXTX_RING_SIZE,
+ rte_eth_dev_socket_id(port_id), NULL,
+ test_params.mbuf_pool) == 0, "Failed to setup rx queue.");
+ }
+
+ for (txq = 0; txq < RXTX_QUEUE_COUNT; txq++) {
+ TEST_ASSERT(rte_eth_tx_queue_setup(port_id, txq, RXTX_RING_SIZE,
+ rte_eth_dev_socket_id(port_id), NULL) == 0,
+ "Failed to setup tx queue.");
+ }
+
+ if (start) {
+ TEST_ASSERT(rte_eth_dev_start(port_id) == 0,
+ "Failed to start device (%d).", port_id);
+ }
+
+ return 0;
+}
+
+/**
+ * Remove all slaves from bonding
+ */
+static int
+remove_slaves(void)
+{
+ unsigned n;
+ struct slave_conf *port;
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+ if (port->is_slave) {
+ TEST_ASSERT_SUCCESS(rte_eth_bond_slave_remove(
+ test_params.bond_port_id, port->port_id),
+ "Cannot remove slave %d from bonding", port->port_id);
+ port->is_slave = 0;
+ }
+ }
+
+ return 0;
+}
+
+static int
+remove_slaves_and_stop_bonded_device(void)
+{
+ TEST_ASSERT_SUCCESS(remove_slaves(), "Removing slaves");
+ rte_eth_dev_stop(test_params.bond_port_id);
+ return TEST_SUCCESS;
+}
+
+/**
+ * Add all slaves to bonding
+ */
+static int
+bond_slaves(void)
+{
+ unsigned n;
+ struct slave_conf *port;
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+ if (!port->is_slave) {
+ TEST_ASSERT_SUCCESS(rte_eth_bond_slave_add(test_params.bond_port_id,
+ port->port_id), "Cannot attach slave %d to the bonding",
+ port->port_id);
+ port->is_slave = 1;
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * Set all RETA values in port_id to value
+ */
+static int
+reta_set(uint8_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;
+
+ for (i = 0; i < reta_size / RTE_RETA_GROUP_SIZE; i++) {
+ /* select all fields to set */
+ reta_conf[i].mask = ~0LL;
+ for (j = 0; j < RTE_RETA_GROUP_SIZE; j++)
+ reta_conf[i].reta[j] = value;
+ }
+
+ return rte_eth_dev_rss_reta_update(port_id, reta_conf, reta_size);
+}
+
+/**
+ * Check if slaves RETA is synchronized with bonding port. Returns 1 if slave
+ * port is synced with bonding port.
+ */
+static int
+reta_check_synced(struct slave_conf *port)
+{
+ unsigned i;
+
+ for (i = 0; i < test_params.bond_dev_info.reta_size;
+ i++) {
+
+ int index = i / RTE_RETA_GROUP_SIZE;
+ int shift = i % RTE_RETA_GROUP_SIZE;
+
+ if (port->reta_conf[index].reta[shift] !=
+ test_params.bond_reta_conf[index].reta[shift])
+ return 0;
+
+ }
+
+ return 1;
+}
+
+/**
+ * Fetch bonding ports RETA
+ */
+static int
+bond_reta_fetch(void) {
+ unsigned j;
+
+ for (j = 0; j < test_params.bond_dev_info.reta_size / RTE_RETA_GROUP_SIZE;
+ j++)
+ test_params.bond_reta_conf[j].mask = ~0LL;
+
+ TEST_ASSERT_SUCCESS(rte_eth_dev_rss_reta_query(test_params.bond_port_id,
+ test_params.bond_reta_conf, test_params.bond_dev_info.reta_size),
+ "Cannot take bonding ports RSS configuration");
+ return 0;
+}
+
+/**
+ * Fetch slaves RETA
+ */
+static int
+slave_reta_fetch(struct slave_conf *port) {
+ unsigned j;
+
+ for (j = 0; j < port->dev_info.reta_size / RTE_RETA_GROUP_SIZE; j++)
+ port->reta_conf[j].mask = ~0LL;
+
+ TEST_ASSERT_SUCCESS(rte_eth_dev_rss_reta_query(port->port_id,
+ port->reta_conf, port->dev_info.reta_size),
+ "Cannot take bonding ports RSS configuration");
+ return 0;
+}
+
+/**
+ * Remove and add slave to check if slaves configuration is synced with
+ * the bonding ports values after adding new slave.
+ */
+static int
+slave_remove_and_add(void)
+{
+ struct slave_conf *port = &(test_params.slave_ports[0]);
+
+ /* 1. Remove first slave from bonding */
+ TEST_ASSERT_SUCCESS(rte_eth_bond_slave_remove(test_params.bond_port_id,
+ port->port_id), "Cannot remove slave #d from bonding");
+
+ /* 2. Change removed (ex-)slave and bonding configuration to different
+ * values
+ */
+ reta_set(test_params.bond_port_id, 1, test_params.bond_dev_info.reta_size);
+ bond_reta_fetch();
+
+ reta_set(port->port_id, 2, port->dev_info.reta_size);
+ slave_reta_fetch(port);
+
+ TEST_ASSERT(reta_check_synced(port) == 0,
+ "Removed slave didn't should be synchronized with bonding port");
+
+ /* 3. Add (ex-)slave and check if configuration changed*/
+ TEST_ASSERT_SUCCESS(rte_eth_bond_slave_add(test_params.bond_port_id,
+ port->port_id), "Cannot add slave");
+
+ bond_reta_fetch();
+ slave_reta_fetch(port);
+
+ return reta_check_synced(port);
+}
+
+/**
+ * Test configuration propagation over slaves.
+ */
+static int
+test_propagate(void)
+{
+ unsigned i;
+ uint8_t n;
+ struct slave_conf *port;
+ uint8_t bond_rss_key[40];
+ struct rte_eth_rss_conf bond_rss_conf;
+
+ int retval = 0;
+ uint64_t rss_hf = 0;
+ uint64_t default_rss_hf = 0;
+
+ rte_eth_dev_info_get(test_params.bond_port_id, &test_params.bond_dev_info);
+
+ /*
+ * Test hash function propagation
+ */
+ for (i = 0; i < sizeof(test_params.bond_dev_info.flow_type_rss_offloads)*8;
+ i++) {
+
+ rss_hf = test_params.bond_dev_info.flow_type_rss_offloads & (1<<i);
+ if (rss_hf) {
+ bond_rss_conf.rss_key = NULL;
+ bond_rss_conf.rss_hf = rss_hf;
+
+ retval = rte_eth_dev_rss_hash_update(test_params.bond_port_id,
+ &bond_rss_conf);
+ TEST_ASSERT_SUCCESS(retval, "Cannot set slaves hash function");
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+
+ retval = rte_eth_dev_rss_hash_conf_get(port->port_id,
+ &port->rss_conf);
+ TEST_ASSERT_SUCCESS(retval,
+ "Cannot take slaves RSS configuration");
+
+ TEST_ASSERT(port->rss_conf.rss_hf == rss_hf,
+ "Hash function not propagated for slave %d",
+ port->port_id);
+ }
+
+ default_rss_hf = rss_hf;
+ }
+
+ }
+
+ /*
+ * Test key propagation
+ */
+ for (i = 1; i < 10; i++) {
+
+ /* Set all keys to zero */
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+ memset(port->rss_conf.rss_key, 0, 40);
+ retval = rte_eth_dev_rss_hash_update(port->port_id,
+ &port->rss_conf);
+ TEST_ASSERT_SUCCESS(retval, "Cannot set slaves RSS keys");
+ }
+
+ memset(bond_rss_key, i, sizeof(bond_rss_key));
+ bond_rss_conf.rss_hf = default_rss_hf,
+ bond_rss_conf.rss_key = bond_rss_key;
+ bond_rss_conf.rss_key_len = 40;
+
+ retval = rte_eth_dev_rss_hash_update(test_params.bond_port_id,
+ &bond_rss_conf);
+ TEST_ASSERT_SUCCESS(retval, "Cannot set bonded port RSS keys");
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+
+ retval = rte_eth_dev_rss_hash_conf_get(port->port_id,
+ &(port->rss_conf));
+
+ TEST_ASSERT_SUCCESS(retval,
+ "Cannot take slaves RSS configuration");
+
+ /* compare keys */
+ retval = memcmp(port->rss_conf.rss_key, bond_rss_key,
+ sizeof(bond_rss_key));
+ TEST_ASSERT(retval == 0, "Key value not propagated for slave %d",
+ port->port_id);
+ }
+ }
+
+ /*
+ * Test RETA propagation
+ */
+ for (i = 0; i < RXTX_QUEUE_COUNT; i++) {
+
+ /* Set all keys to zero */
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+ retval = reta_set(port->port_id, (i + 1) % RXTX_QUEUE_COUNT,
+ port->dev_info.reta_size);
+ TEST_ASSERT_SUCCESS(retval, "Cannot set slaves RETA");
+ }
+
+ TEST_ASSERT_SUCCESS(reta_set(test_params.bond_port_id,
+ i % RXTX_QUEUE_COUNT, test_params.bond_dev_info.reta_size),
+ "Cannot set bonded port RETA");
+
+ bond_reta_fetch();
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+
+ slave_reta_fetch(port);
+ TEST_ASSERT(reta_check_synced(port) == 1, "RETAs inconsistent");
+ }
+ }
+
+ return TEST_SUCCESS;
+}
+
+/**
+ * Test propagation logic, when RX_RSS mq_mode is turned on for bonding port
+ */
+static int
+test_rss(void)
+{
+ /**
+ * Configure bonding port in RSS mq mode
+ */
+ TEST_ASSERT_SUCCESS(configure_ethdev(test_params.bond_port_id,
+ &rss_pmd_conf, 0), "Failed to configure bonding device\n");
+
+ rte_eth_dev_info_get(test_params.bond_port_id, &test_params.bond_dev_info);
+
+ TEST_ASSERT_SUCCESS(bond_slaves(), "Bonding slaves failed");
+
+ TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params.bond_port_id),
+ "Failed to start bonding port (%d).", test_params.bond_port_id);
+
+ TEST_ASSERT_SUCCESS(test_propagate(), "Propagation test failed");
+
+ TEST_ASSERT(slave_remove_and_add() == 1, "New slave should be synced");
+
+ remove_slaves_and_stop_bonded_device();
+
+ return TEST_SUCCESS;
+}
+
+/**
+ * Test propagation logic, when RX_RSS mq_mode is turned off for bonding port
+ */
+static int
+test_rss_lazy(void)
+{
+ TEST_ASSERT_SUCCESS(configure_ethdev(test_params.bond_port_id,
+ &default_pmd_conf, 0), "Failed to configure bonding device\n");
+
+ rte_eth_dev_info_get(test_params.bond_port_id, &test_params.bond_dev_info);
+
+ TEST_ASSERT_SUCCESS(bond_slaves(), "Bonding slaves failed");
+
+ TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params.bond_port_id),
+ "Failed to start bonding port (%d).", test_params.bond_port_id);
+
+ TEST_ASSERT_SUCCESS(test_propagate(), "Propagation test failed");
+
+ TEST_ASSERT(slave_remove_and_add() == 0, "New slave shouldn't be synced");
+
+ remove_slaves_and_stop_bonded_device();
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_setup(void)
+{
+ unsigned n;
+ int retval;
+ int port_id;
+ char name[256];
+ struct slave_conf *port;
+
+ 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_ASSERT(test_params.mbuf_pool != NULL,
+ "rte_mempool_create failed\n");
+ }
+
+ /* Create / initialize ring eth devs. */
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+
+ 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);
+ TEST_ASSERT_SUCCESS(retval, "Failed to create null device '%s'\n",
+ name);
+
+ port->port_id = port_id;
+
+ port->rss_conf.rss_key = port->rss_key;
+ port->rss_conf.rss_key_len = 40;
+
+ retval = configure_ethdev(port->port_id, &default_pmd_conf, 0);
+ TEST_ASSERT_SUCCESS(retval, "Failed to configure virtual ethdev %s\n",
+ name);
+
+ rte_eth_dev_info_get(port->port_id, &port->dev_info);
+ }
+
+ if (test_params.bond_port_id == INVALID_PORT_ID) {
+ retval = rte_eth_bond_create(BONDED_DEV_NAME, 0, rte_socket_id());
+
+ TEST_ASSERT(retval >= 0, "Failed to create bonded ethdev %s",
+ BONDED_DEV_NAME);
+
+ test_params.bond_port_id = retval;
+
+ TEST_ASSERT_SUCCESS(configure_ethdev(test_params.bond_port_id,
+ &default_pmd_conf, 0), "Failed to configure bonding device\n");
+
+ rte_eth_dev_info_get(test_params.bond_port_id,
+ &test_params.bond_dev_info);
+ }
+
+ return TEST_SUCCESS;
+}
+
+static int
+testsuite_teardown(void)
+{
+ struct slave_conf *port;
+ uint8_t i;
+
+ /* Only stop ports.
+ * Any cleanup/reset state is done when particular test is
+ * started. */
+
+ rte_eth_dev_stop(test_params.bond_port_id);
+
+ FOR_EACH_PORT(i, port)
+ rte_eth_dev_stop(port->port_id);
+
+ return 0;
+}
+
+static int
+check_environment(void)
+{
+ return TEST_SUCCESS;
+}
+
+static int
+test_rssconf_executor(int (*test_func)(void))
+{
+ int test_result;
+
+ /* Check if environment is clean. Fail to launch a test if there was
+ * a critical error before that prevented to reset environment. */
+ TEST_ASSERT_SUCCESS(check_environment(),
+ "Refusing to launch test in dirty environment.");
+
+ RTE_VERIFY(test_func != NULL);
+ test_result = (*test_func)();
+
+ /* If test succeed check if environment wast left in good condition. */
+ if (test_result == TEST_SUCCESS)
+ test_result = check_environment();
+
+ /* Reset environment in case test failed to do that. */
+ if (test_result != TEST_SUCCESS) {
+ TEST_ASSERT_SUCCESS(remove_slaves_and_stop_bonded_device(),
+ "Failed to stop bonded device");
+ }
+
+ return test_result;
+}
+
+static int
+test_setup_wrapper(void)
+{
+ return test_rssconf_executor(&test_setup);
+}
+
+static int
+test_rss_wrapper(void)
+{
+ return test_rssconf_executor(&test_rss);
+}
+
+static int
+test_rss_lazy_wrapper(void)
+{
+ return test_rssconf_executor(&test_rss_lazy);
+}
+
+static struct unit_test_suite link_bonding_rssconf_test_suite = {
+ .suite_name = "RSS Dynamic Configuration for Bonding Unit Test Suite",
+ .teardown = testsuite_teardown,
+ .unit_test_cases = {
+ TEST_CASE_NAMED("test_setup", test_setup_wrapper),
+ TEST_CASE_NAMED("test_rss", test_rss_wrapper),
+ TEST_CASE_NAMED("test_rss_lazy", test_rss_lazy_wrapper),
+ { NULL, NULL, NULL, NULL, NULL } /**< NULL terminate unit test array */
+ }
+};
+
+static int
+test_link_bonding_rssconf(void)
+{
+ return unit_test_suite_runner(&link_bonding_rssconf_test_suite);
+}
+
+static struct test_command test_link_bonding_rssconf_cmd = {
+ .command = "link_bonding_rssconf_autotest",
+ .callback = test_link_bonding_rssconf,
+};
+
+REGISTER_TEST_COMMAND(test_link_bonding_rssconf_cmd);
--
1.7.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* [dpdk-dev] [PATCH v7 6/9] test: dynamic rss configuration
2015-10-30 14:25 ` [dpdk-dev] [PATCH v7 " Tomasz Kulasek
@ 2015-10-30 14:25 ` Tomasz Kulasek
0 siblings, 0 replies; 2+ messages in thread
From: Tomasz Kulasek @ 2015-10-30 14:25 UTC (permalink / raw)
To: dev
v7 changes:
- Makefile for test app changed to not break compilation when
CONFIG_RTE_LIBRTE_PMD_NULL=n (now module is silently omitted when
requirements not met)
Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
Acked-by: Declan Doherty <declan.doherty@intel.com>
---
app/test/Makefile | 7 +
| 679 ++++++++++++++++++++++++++++++++++
2 files changed, 686 insertions(+)
create mode 100644 app/test/test_link_bonding_rssconf.c
diff --git a/app/test/Makefile b/app/test/Makefile
index 294618f..ef9125d 100644
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -140,6 +140,13 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_mode4.c
endif
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y)
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_rssconf.c
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+LDLIBS += -lrte_pmd_null
+endif
+endif
+
SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c
--git a/app/test/test_link_bonding_rssconf.c b/app/test/test_link_bonding_rssconf.c
new file mode 100644
index 0000000..e6714b4
--- /dev/null
+++ b/app/test/test_link_bonding_rssconf.c
@@ -0,0 +1,679 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 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.
+ */
+
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <rte_cycles.h>
+#include <sys/queue.h>
+
+#include <rte_byteorder.h>
+#include <rte_common.h>
+#include <rte_debug.h>
+#include <rte_ethdev.h>
+#include <rte_log.h>
+#include <rte_lcore.h>
+#include <rte_memory.h>
+
+#include <rte_string_fns.h>
+#include <rte_errno.h>
+#include <rte_eth_bond.h>
+#include <rte_eth_null.h>
+
+#include "test.h"
+
+#define SLAVE_COUNT (4)
+
+#define RXTX_RING_SIZE 1024
+#define RXTX_QUEUE_COUNT 4
+
+#define BONDED_DEV_NAME ("rssconf_bond_dev")
+
+#define SLAVE_DEV_NAME_FMT ("rssconf_slave%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_CACHE_SIZE 250
+#define BURST_SIZE 32
+
+#define INVALID_SOCKET_ID (-1)
+#define INVALID_PORT_ID (0xFF)
+#define INVALID_BONDING_MODE (-1)
+
+struct slave_conf {
+ uint8_t port_id;
+ struct rte_eth_dev_info dev_info;
+
+ struct rte_eth_rss_conf rss_conf;
+ uint8_t rss_key[40];
+ struct rte_eth_rss_reta_entry64 reta_conf[512 / RTE_RETA_GROUP_SIZE];
+
+ uint8_t is_slave;
+ struct rte_ring *rxtx_queue[RXTX_QUEUE_COUNT];
+};
+
+struct link_bonding_rssconf_unittest_params {
+ uint8_t bond_port_id;
+ struct rte_eth_dev_info bond_dev_info;
+ struct rte_eth_rss_reta_entry64 bond_reta_conf[512 / RTE_RETA_GROUP_SIZE];
+ struct slave_conf slave_ports[SLAVE_COUNT];
+
+ struct rte_mempool *mbuf_pool;
+};
+
+static struct link_bonding_rssconf_unittest_params test_params = {
+ .bond_port_id = INVALID_PORT_ID,
+ .slave_ports = {
+ [0 ... SLAVE_COUNT - 1] = { .port_id = INVALID_PORT_ID, .is_slave = 0}
+ },
+ .mbuf_pool = NULL,
+};
+
+/**
+ * Default port configuration with RSS turned off
+ */
+static struct rte_eth_conf default_pmd_conf = {
+ .rxmode = {
+ .mq_mode = ETH_MQ_RX_NONE,
+ .max_rx_pkt_len = ETHER_MAX_LEN,
+ .split_hdr_size = 0,
+ .header_split = 0, /**< Header Split disabled */
+ .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 */
+ },
+ .txmode = {
+ .mq_mode = ETH_MQ_TX_NONE,
+ },
+ .lpbk_mode = 0,
+};
+
+static struct rte_eth_conf rss_pmd_conf = {
+ .rxmode = {
+ .mq_mode = ETH_MQ_RX_RSS,
+ .max_rx_pkt_len = ETHER_MAX_LEN,
+ .split_hdr_size = 0,
+ .header_split = 0, /**< Header Split disabled */
+ .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 */
+ },
+ .txmode = {
+ .mq_mode = ETH_MQ_TX_NONE,
+ },
+ .rx_adv_conf = {
+ .rss_conf = {
+ .rss_key = NULL,
+ .rss_hf = ETH_RSS_IPV6,
+ },
+ },
+ .lpbk_mode = 0,
+};
+
+#define FOR_EACH(_i, _item, _array, _size) \
+ for (_i = 0, _item = &_array[0]; _i < _size && (_item = &_array[_i]); _i++)
+
+/* Macro for iterating over every port that can be used as a slave
+ * in this test.
+ * _i variable used as an index in test_params->slave_ports
+ * _slave pointer to &test_params->slave_ports[_idx]
+ */
+#define FOR_EACH_PORT(_i, _port) \
+ FOR_EACH(_i, _port, test_params.slave_ports, \
+ RTE_DIM(test_params.slave_ports))
+
+static int
+configure_ethdev(uint8_t port_id, struct rte_eth_conf *eth_conf, uint8_t start)
+{
+ int rxq, txq;
+
+ TEST_ASSERT(rte_eth_dev_configure(port_id, RXTX_QUEUE_COUNT,
+ RXTX_QUEUE_COUNT, eth_conf) == 0, "Failed to configure device %u",
+ port_id);
+
+ for (rxq = 0; rxq < RXTX_QUEUE_COUNT; rxq++) {
+ TEST_ASSERT(rte_eth_rx_queue_setup(port_id, rxq, RXTX_RING_SIZE,
+ rte_eth_dev_socket_id(port_id), NULL,
+ test_params.mbuf_pool) == 0, "Failed to setup rx queue.");
+ }
+
+ for (txq = 0; txq < RXTX_QUEUE_COUNT; txq++) {
+ TEST_ASSERT(rte_eth_tx_queue_setup(port_id, txq, RXTX_RING_SIZE,
+ rte_eth_dev_socket_id(port_id), NULL) == 0,
+ "Failed to setup tx queue.");
+ }
+
+ if (start) {
+ TEST_ASSERT(rte_eth_dev_start(port_id) == 0,
+ "Failed to start device (%d).", port_id);
+ }
+
+ return 0;
+}
+
+/**
+ * Remove all slaves from bonding
+ */
+static int
+remove_slaves(void)
+{
+ unsigned n;
+ struct slave_conf *port;
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+ if (port->is_slave) {
+ TEST_ASSERT_SUCCESS(rte_eth_bond_slave_remove(
+ test_params.bond_port_id, port->port_id),
+ "Cannot remove slave %d from bonding", port->port_id);
+ port->is_slave = 0;
+ }
+ }
+
+ return 0;
+}
+
+static int
+remove_slaves_and_stop_bonded_device(void)
+{
+ TEST_ASSERT_SUCCESS(remove_slaves(), "Removing slaves");
+ rte_eth_dev_stop(test_params.bond_port_id);
+ return TEST_SUCCESS;
+}
+
+/**
+ * Add all slaves to bonding
+ */
+static int
+bond_slaves(void)
+{
+ unsigned n;
+ struct slave_conf *port;
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+ if (!port->is_slave) {
+ TEST_ASSERT_SUCCESS(rte_eth_bond_slave_add(test_params.bond_port_id,
+ port->port_id), "Cannot attach slave %d to the bonding",
+ port->port_id);
+ port->is_slave = 1;
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * Set all RETA values in port_id to value
+ */
+static int
+reta_set(uint8_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;
+
+ for (i = 0; i < reta_size / RTE_RETA_GROUP_SIZE; i++) {
+ /* select all fields to set */
+ reta_conf[i].mask = ~0LL;
+ for (j = 0; j < RTE_RETA_GROUP_SIZE; j++)
+ reta_conf[i].reta[j] = value;
+ }
+
+ return rte_eth_dev_rss_reta_update(port_id, reta_conf, reta_size);
+}
+
+/**
+ * Check if slaves RETA is synchronized with bonding port. Returns 1 if slave
+ * port is synced with bonding port.
+ */
+static int
+reta_check_synced(struct slave_conf *port)
+{
+ unsigned i;
+
+ for (i = 0; i < test_params.bond_dev_info.reta_size;
+ i++) {
+
+ int index = i / RTE_RETA_GROUP_SIZE;
+ int shift = i % RTE_RETA_GROUP_SIZE;
+
+ if (port->reta_conf[index].reta[shift] !=
+ test_params.bond_reta_conf[index].reta[shift])
+ return 0;
+
+ }
+
+ return 1;
+}
+
+/**
+ * Fetch bonding ports RETA
+ */
+static int
+bond_reta_fetch(void) {
+ unsigned j;
+
+ for (j = 0; j < test_params.bond_dev_info.reta_size / RTE_RETA_GROUP_SIZE;
+ j++)
+ test_params.bond_reta_conf[j].mask = ~0LL;
+
+ TEST_ASSERT_SUCCESS(rte_eth_dev_rss_reta_query(test_params.bond_port_id,
+ test_params.bond_reta_conf, test_params.bond_dev_info.reta_size),
+ "Cannot take bonding ports RSS configuration");
+ return 0;
+}
+
+/**
+ * Fetch slaves RETA
+ */
+static int
+slave_reta_fetch(struct slave_conf *port) {
+ unsigned j;
+
+ for (j = 0; j < port->dev_info.reta_size / RTE_RETA_GROUP_SIZE; j++)
+ port->reta_conf[j].mask = ~0LL;
+
+ TEST_ASSERT_SUCCESS(rte_eth_dev_rss_reta_query(port->port_id,
+ port->reta_conf, port->dev_info.reta_size),
+ "Cannot take bonding ports RSS configuration");
+ return 0;
+}
+
+/**
+ * Remove and add slave to check if slaves configuration is synced with
+ * the bonding ports values after adding new slave.
+ */
+static int
+slave_remove_and_add(void)
+{
+ struct slave_conf *port = &(test_params.slave_ports[0]);
+
+ /* 1. Remove first slave from bonding */
+ TEST_ASSERT_SUCCESS(rte_eth_bond_slave_remove(test_params.bond_port_id,
+ port->port_id), "Cannot remove slave #d from bonding");
+
+ /* 2. Change removed (ex-)slave and bonding configuration to different
+ * values
+ */
+ reta_set(test_params.bond_port_id, 1, test_params.bond_dev_info.reta_size);
+ bond_reta_fetch();
+
+ reta_set(port->port_id, 2, port->dev_info.reta_size);
+ slave_reta_fetch(port);
+
+ TEST_ASSERT(reta_check_synced(port) == 0,
+ "Removed slave didn't should be synchronized with bonding port");
+
+ /* 3. Add (ex-)slave and check if configuration changed*/
+ TEST_ASSERT_SUCCESS(rte_eth_bond_slave_add(test_params.bond_port_id,
+ port->port_id), "Cannot add slave");
+
+ bond_reta_fetch();
+ slave_reta_fetch(port);
+
+ return reta_check_synced(port);
+}
+
+/**
+ * Test configuration propagation over slaves.
+ */
+static int
+test_propagate(void)
+{
+ unsigned i;
+ uint8_t n;
+ struct slave_conf *port;
+ uint8_t bond_rss_key[40];
+ struct rte_eth_rss_conf bond_rss_conf;
+
+ int retval = 0;
+ uint64_t rss_hf = 0;
+ uint64_t default_rss_hf = 0;
+
+ rte_eth_dev_info_get(test_params.bond_port_id, &test_params.bond_dev_info);
+
+ /*
+ * Test hash function propagation
+ */
+ for (i = 0; i < sizeof(test_params.bond_dev_info.flow_type_rss_offloads)*8;
+ i++) {
+
+ rss_hf = test_params.bond_dev_info.flow_type_rss_offloads & (1<<i);
+ if (rss_hf) {
+ bond_rss_conf.rss_key = NULL;
+ bond_rss_conf.rss_hf = rss_hf;
+
+ retval = rte_eth_dev_rss_hash_update(test_params.bond_port_id,
+ &bond_rss_conf);
+ TEST_ASSERT_SUCCESS(retval, "Cannot set slaves hash function");
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+
+ retval = rte_eth_dev_rss_hash_conf_get(port->port_id,
+ &port->rss_conf);
+ TEST_ASSERT_SUCCESS(retval,
+ "Cannot take slaves RSS configuration");
+
+ TEST_ASSERT(port->rss_conf.rss_hf == rss_hf,
+ "Hash function not propagated for slave %d",
+ port->port_id);
+ }
+
+ default_rss_hf = rss_hf;
+ }
+
+ }
+
+ /*
+ * Test key propagation
+ */
+ for (i = 1; i < 10; i++) {
+
+ /* Set all keys to zero */
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+ memset(port->rss_conf.rss_key, 0, 40);
+ retval = rte_eth_dev_rss_hash_update(port->port_id,
+ &port->rss_conf);
+ TEST_ASSERT_SUCCESS(retval, "Cannot set slaves RSS keys");
+ }
+
+ memset(bond_rss_key, i, sizeof(bond_rss_key));
+ bond_rss_conf.rss_hf = default_rss_hf,
+ bond_rss_conf.rss_key = bond_rss_key;
+ bond_rss_conf.rss_key_len = 40;
+
+ retval = rte_eth_dev_rss_hash_update(test_params.bond_port_id,
+ &bond_rss_conf);
+ TEST_ASSERT_SUCCESS(retval, "Cannot set bonded port RSS keys");
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+
+ retval = rte_eth_dev_rss_hash_conf_get(port->port_id,
+ &(port->rss_conf));
+
+ TEST_ASSERT_SUCCESS(retval,
+ "Cannot take slaves RSS configuration");
+
+ /* compare keys */
+ retval = memcmp(port->rss_conf.rss_key, bond_rss_key,
+ sizeof(bond_rss_key));
+ TEST_ASSERT(retval == 0, "Key value not propagated for slave %d",
+ port->port_id);
+ }
+ }
+
+ /*
+ * Test RETA propagation
+ */
+ for (i = 0; i < RXTX_QUEUE_COUNT; i++) {
+
+ /* Set all keys to zero */
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+ retval = reta_set(port->port_id, (i + 1) % RXTX_QUEUE_COUNT,
+ port->dev_info.reta_size);
+ TEST_ASSERT_SUCCESS(retval, "Cannot set slaves RETA");
+ }
+
+ TEST_ASSERT_SUCCESS(reta_set(test_params.bond_port_id,
+ i % RXTX_QUEUE_COUNT, test_params.bond_dev_info.reta_size),
+ "Cannot set bonded port RETA");
+
+ bond_reta_fetch();
+
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+
+ slave_reta_fetch(port);
+ TEST_ASSERT(reta_check_synced(port) == 1, "RETAs inconsistent");
+ }
+ }
+
+ return TEST_SUCCESS;
+}
+
+/**
+ * Test propagation logic, when RX_RSS mq_mode is turned on for bonding port
+ */
+static int
+test_rss(void)
+{
+ /**
+ * Configure bonding port in RSS mq mode
+ */
+ TEST_ASSERT_SUCCESS(configure_ethdev(test_params.bond_port_id,
+ &rss_pmd_conf, 0), "Failed to configure bonding device\n");
+
+ rte_eth_dev_info_get(test_params.bond_port_id, &test_params.bond_dev_info);
+
+ TEST_ASSERT_SUCCESS(bond_slaves(), "Bonding slaves failed");
+
+ TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params.bond_port_id),
+ "Failed to start bonding port (%d).", test_params.bond_port_id);
+
+ TEST_ASSERT_SUCCESS(test_propagate(), "Propagation test failed");
+
+ TEST_ASSERT(slave_remove_and_add() == 1, "New slave should be synced");
+
+ remove_slaves_and_stop_bonded_device();
+
+ return TEST_SUCCESS;
+}
+
+/**
+ * Test propagation logic, when RX_RSS mq_mode is turned off for bonding port
+ */
+static int
+test_rss_lazy(void)
+{
+ TEST_ASSERT_SUCCESS(configure_ethdev(test_params.bond_port_id,
+ &default_pmd_conf, 0), "Failed to configure bonding device\n");
+
+ rte_eth_dev_info_get(test_params.bond_port_id, &test_params.bond_dev_info);
+
+ TEST_ASSERT_SUCCESS(bond_slaves(), "Bonding slaves failed");
+
+ TEST_ASSERT_SUCCESS(rte_eth_dev_start(test_params.bond_port_id),
+ "Failed to start bonding port (%d).", test_params.bond_port_id);
+
+ TEST_ASSERT_SUCCESS(test_propagate(), "Propagation test failed");
+
+ TEST_ASSERT(slave_remove_and_add() == 0, "New slave shouldn't be synced");
+
+ remove_slaves_and_stop_bonded_device();
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_setup(void)
+{
+ unsigned n;
+ int retval;
+ int port_id;
+ char name[256];
+ struct slave_conf *port;
+
+ 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_ASSERT(test_params.mbuf_pool != NULL,
+ "rte_mempool_create failed\n");
+ }
+
+ /* Create / initialize ring eth devs. */
+ FOR_EACH_PORT(n, port) {
+ port = &test_params.slave_ports[n];
+
+ 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);
+ TEST_ASSERT_SUCCESS(retval, "Failed to create null device '%s'\n",
+ name);
+
+ port->port_id = port_id;
+
+ port->rss_conf.rss_key = port->rss_key;
+ port->rss_conf.rss_key_len = 40;
+
+ retval = configure_ethdev(port->port_id, &default_pmd_conf, 0);
+ TEST_ASSERT_SUCCESS(retval, "Failed to configure virtual ethdev %s\n",
+ name);
+
+ rte_eth_dev_info_get(port->port_id, &port->dev_info);
+ }
+
+ if (test_params.bond_port_id == INVALID_PORT_ID) {
+ retval = rte_eth_bond_create(BONDED_DEV_NAME, 0, rte_socket_id());
+
+ TEST_ASSERT(retval >= 0, "Failed to create bonded ethdev %s",
+ BONDED_DEV_NAME);
+
+ test_params.bond_port_id = retval;
+
+ TEST_ASSERT_SUCCESS(configure_ethdev(test_params.bond_port_id,
+ &default_pmd_conf, 0), "Failed to configure bonding device\n");
+
+ rte_eth_dev_info_get(test_params.bond_port_id,
+ &test_params.bond_dev_info);
+ }
+
+ return TEST_SUCCESS;
+}
+
+static int
+testsuite_teardown(void)
+{
+ struct slave_conf *port;
+ uint8_t i;
+
+ /* Only stop ports.
+ * Any cleanup/reset state is done when particular test is
+ * started. */
+
+ rte_eth_dev_stop(test_params.bond_port_id);
+
+ FOR_EACH_PORT(i, port)
+ rte_eth_dev_stop(port->port_id);
+
+ return 0;
+}
+
+static int
+check_environment(void)
+{
+ return TEST_SUCCESS;
+}
+
+static int
+test_rssconf_executor(int (*test_func)(void))
+{
+ int test_result;
+
+ /* Check if environment is clean. Fail to launch a test if there was
+ * a critical error before that prevented to reset environment. */
+ TEST_ASSERT_SUCCESS(check_environment(),
+ "Refusing to launch test in dirty environment.");
+
+ RTE_VERIFY(test_func != NULL);
+ test_result = (*test_func)();
+
+ /* If test succeed check if environment wast left in good condition. */
+ if (test_result == TEST_SUCCESS)
+ test_result = check_environment();
+
+ /* Reset environment in case test failed to do that. */
+ if (test_result != TEST_SUCCESS) {
+ TEST_ASSERT_SUCCESS(remove_slaves_and_stop_bonded_device(),
+ "Failed to stop bonded device");
+ }
+
+ return test_result;
+}
+
+static int
+test_setup_wrapper(void)
+{
+ return test_rssconf_executor(&test_setup);
+}
+
+static int
+test_rss_wrapper(void)
+{
+ return test_rssconf_executor(&test_rss);
+}
+
+static int
+test_rss_lazy_wrapper(void)
+{
+ return test_rssconf_executor(&test_rss_lazy);
+}
+
+static struct unit_test_suite link_bonding_rssconf_test_suite = {
+ .suite_name = "RSS Dynamic Configuration for Bonding Unit Test Suite",
+ .teardown = testsuite_teardown,
+ .unit_test_cases = {
+ TEST_CASE_NAMED("test_setup", test_setup_wrapper),
+ TEST_CASE_NAMED("test_rss", test_rss_wrapper),
+ TEST_CASE_NAMED("test_rss_lazy", test_rss_lazy_wrapper),
+ { NULL, NULL, NULL, NULL, NULL } /**< NULL terminate unit test array */
+ }
+};
+
+static int
+test_link_bonding_rssconf(void)
+{
+ return unit_test_suite_runner(&link_bonding_rssconf_test_suite);
+}
+
+static struct test_command test_link_bonding_rssconf_cmd = {
+ .command = "link_bonding_rssconf_autotest",
+ .callback = test_link_bonding_rssconf,
+};
+
+REGISTER_TEST_COMMAND(test_link_bonding_rssconf_cmd);
--
1.7.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-30 14:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-30 13:56 [dpdk-dev] [PATCH v7 6/9] test: dynamic rss configuration Tomasz Kulasek
-- strict thread matches above, loose matches on Subject: below --
2015-10-16 10:00 [dpdk-dev] [PATCH v6 0/9] Dynamic RSS Configuration for Bonding Tomasz Kulasek
2015-10-30 14:25 ` [dpdk-dev] [PATCH v7 " Tomasz Kulasek
2015-10-30 14:25 ` [dpdk-dev] [PATCH v7 6/9] test: dynamic rss configuration Tomasz Kulasek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).