tcp: cleanup connection/session fixes - vpp

diff options

author	Florin Coras <fcoras@cisco.com>	2018-06-06 17:55:02 -0700
committer	Dave Barach <openvpp@barachs.net>	2018-06-11 17:32:40 +0000
commit	25579b4acd449e1bae30d2a20a44b77741c8e1fd (patch)
tree	b82e8bb17fc8b2f257cb57dfd9e6ca628a5916a3 /gmod
parent	40903ac34f89d9e2ad775e98b7bcec5b7feb0207 (diff)

tcp: cleanup connection/session fixes

- Cleanup session state after last ack and avoid using a cleanup timer. - Change session cleanup to free the session as opposed to waiting for delete notify. - When in close-wait, postpone sending the fin on close until all outstanding data has been sent. - Don't flush rx fifo unless in closed state Change-Id: Ic2a4f0d5568b65c83f4b55b6c469a7b24b947f39 Signed-off-by: Florin Coras <fcoras@cisco.com>

Diffstat (limited to 'gmod')

0 files changed, 0 insertions, 0 deletions

/*- * BSD LICENSE * * Copyright(c) 2017 Intel Corporation. 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 <rte_common.h> #include <rte_mempool.h> #include <rte_mbuf.h> #include <rte_ethdev.h> #include <rte_eventdev.h> #include <rte_bus_vdev.h> #include <rte_event_eth_rx_adapter.h> #include "test.h" #define MAX_NUM_RX_QUEUE 64 #define NB_MBUFS (8192 * num_ports * MAX_NUM_RX_QUEUE) #define MBUF_CACHE_SIZE 512 #define MBUF_PRIV_SIZE 0 #define TEST_INST_ID 0 #define TEST_DEV_ID 0 #define TEST_ETHDEV_ID 0 struct event_eth_rx_adapter_test_params { struct rte_mempool *mp; uint16_t rx_rings, tx_rings; uint32_t caps; }; static struct event_eth_rx_adapter_test_params default_params; static inline int port_init(uint8_t port, struct rte_mempool *mp) { static const struct rte_eth_conf port_conf_default = { .rxmode = { .mq_mode = ETH_MQ_RX_RSS, .max_rx_pkt_len = ETHER_MAX_LEN }, .rx_adv_conf = { .rss_conf = { .rss_hf = ETH_RSS_IP | ETH_RSS_TCP | ETH_RSS_UDP, } } }; const uint16_t rx_ring_size = 512, tx_ring_size = 512; struct rte_eth_conf port_conf = port_conf_default; int retval; uint16_t q; struct rte_eth_dev_info dev_info; if (port >= rte_eth_dev_count()) return -1; retval = rte_eth_dev_configure(port, 0, 0, &port_conf); rte_eth_dev_info_get(port, &dev_info); default_params.rx_rings = RTE_MIN(dev_info.max_rx_queues, MAX_NUM_RX_QUEUE); default_params.tx_rings = 1; /* Configure the Ethernet device. */ retval = rte_eth_dev_configure(port, default_params.rx_rings, default_params.tx_rings, &port_conf); if (retval != 0) return retval; for (q = 0; q < default_params.rx_rings; q++) { retval = rte_eth_rx_queue_setup(port, q, rx_ring_size, rte_eth_dev_socket_id(port), NULL, mp); if (retval < 0) return retval; } /* Allocate and set up 1 TX queue per Ethernet port. */ for (q = 0; q < default_params.tx_rings; q++) { retval = rte_eth_tx_queue_setup(port, q, tx_ring_size, rte_eth_dev_socket_id(port), NULL); if (retval < 0) return retval; } /* Start the Ethernet port. */ retval = rte_eth_dev_start(port); if (retval < 0) return retval; /* Display the port MAC address. */ struct ether_addr addr; rte_eth_macaddr_get(port, &addr); printf("Port %u MAC: %02" PRIx8 " %02" PRIx8 " %02" PRIx8 " %02" PRIx8 " %02" PRIx8 " %02" PRIx8 "\n", (unsigned int)port, addr.addr_bytes[0], addr.addr_bytes[1], addr.addr_bytes[2], addr.addr_bytes[3], addr.addr_bytes[4], addr.addr_bytes[5]); /* Enable RX in promiscuous mode for the Ethernet device. */ rte_eth_promiscuous_enable(port); return 0; } static int init_ports(int num_ports) { uint8_t portid; int retval; default_params.mp = rte_pktmbuf_pool_create("packet_pool", NB_MBUFS, MBUF_CACHE_SIZE, MBUF_PRIV_SIZE, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id()); if (!default_params.mp) return -ENOMEM; for (portid = 0; portid < num_ports; portid++) { retval = port_init(portid, default_params.mp); if (retval) return retval; } return 0; } static int testsuite_setup(void) { int err; uint8_t count; struct rte_event_dev_info dev_info; count = rte_event_dev_count(); if (!count) { printf("Failed to find a valid event device," " testing with event_skeleton device\n"); rte_vdev_init("event_skeleton", NULL); } struct rte_event_dev_config config = { .nb_event_queues = 1, .nb_event_ports = 1, }; err = rte_event_dev_info_get(TEST_DEV_ID, &dev_info); config.nb_event_queue_flows = dev_info.max_event_queue_flows; config.nb_event_port_dequeue_depth = dev_info.max_event_port_dequeue_depth; config.nb_event_port_enqueue_depth = dev_info.max_event_port_enqueue_depth; config.nb_events_limit = dev_info.max_num_events; err = rte_event_dev_configure(TEST_DEV_ID, &config); TEST_ASSERT(err == 0, "Event device initialization failed err %d\n", err); /* * eth devices like octeontx use event device to receive packets * so rte_eth_dev_start invokes rte_event_dev_start internally, so * call init_ports after rte_event_dev_configure */ err = init_ports(rte_eth_dev_count()); TEST_ASSERT(err == 0, "Port initialization failed err %d\n", err); err = rte_event_eth_rx_adapter_caps_get(TEST_DEV_ID, TEST_ETHDEV_ID, &default_params.caps); TEST_ASSERT(err == 0, "Failed to get adapter cap err %d\n", err); return err; } static void testsuite_teardown(void) { uint32_t i; for (i = 0; i < rte_eth_dev_count(); i++) rte_eth_dev_stop(i); rte_mempool_free(default_params.mp); } static int adapter_create(void) { int err; struct rte_event_dev_info dev_info; struct rte_event_port_conf rx_p_conf; err = rte_event_dev_info_get(TEST_DEV_ID, &dev_info); TEST_ASSERT(err == 0, "Expected 0 got %d", err); rx_p_conf.new_event_threshold = dev_info.max_num_events; rx_p_conf.dequeue_depth = dev_info.max_event_port_dequeue_depth; rx_p_conf.enqueue_depth = dev_info.max_event_port_enqueue_depth; err = rte_event_eth_rx_adapter_create(TEST_INST_ID, TEST_DEV_ID, &rx_p_conf); TEST_ASSERT(err == 0, "Expected 0 got %d", err); return err; } static void adapter_free(void) { rte_event_eth_rx_adapter_free(TEST_INST_ID); } static int adapter_create_free(void) { int err; struct rte_event_port_conf rx_p_conf = { .dequeue_depth = 8, .enqueue_depth = 8, .new_event_threshold = 1200, }; err = rte_event_eth_rx_adapter_create(TEST_INST_ID, TEST_DEV_ID, NULL); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); err = rte_event_eth_rx_adapter_create(TEST_INST_ID, TEST_DEV_ID, &rx_p_conf); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_create(TEST_INST_ID, TEST_DEV_ID, &rx_p_conf); TEST_ASSERT(err == -EEXIST, "Expected -EEXIST %d got %d", -EEXIST, err); err = rte_event_eth_rx_adapter_free(TEST_INST_ID); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_free(TEST_INST_ID); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL %d got %d", -EINVAL, err); err = rte_event_eth_rx_adapter_free(1); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL %d got %d", -EINVAL, err); return TEST_SUCCESS; } static int adapter_queue_add_del(void) { int err; struct rte_event ev; uint32_t cap; struct rte_event_eth_rx_adapter_queue_conf queue_config; err = rte_event_eth_rx_adapter_caps_get(TEST_DEV_ID, TEST_ETHDEV_ID, &cap); TEST_ASSERT(err == 0, "Expected 0 got %d", err); ev.queue_id = 0; ev.sched_type = RTE_SCHED_TYPE_ATOMIC; ev.priority = 0; queue_config.rx_queue_flags = 0; if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID) { ev.flow_id = 1; queue_config.rx_queue_flags = RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID; } queue_config.ev = ev; queue_config.servicing_weight = 1; err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, rte_eth_dev_count(), -1, &queue_config); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ) { err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, TEST_ETHDEV_ID, 0, &queue_config); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, TEST_ETHDEV_ID, 0); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, TEST_ETHDEV_ID, -1, &queue_config); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, TEST_ETHDEV_ID, -1); TEST_ASSERT(err == 0, "Expected 0 got %d", err); } else { err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, TEST_ETHDEV_ID, 0, &queue_config); TEST_ASSERT(err == -EINVAL, "Expected EINVAL got %d", err); err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, TEST_ETHDEV_ID, -1, &queue_config); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, TEST_ETHDEV_ID, 0); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, TEST_ETHDEV_ID, -1); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, TEST_ETHDEV_ID, -1); TEST_ASSERT(err == 0, "Expected 0 got %d", err); } err = rte_event_eth_rx_adapter_queue_add(1, TEST_ETHDEV_ID, -1, &queue_config); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); err = rte_event_eth_rx_adapter_queue_del(1, TEST_ETHDEV_ID, -1); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); return TEST_SUCCESS; } static int adapter_start_stop(void) { int err; struct rte_event ev; ev.queue_id = 0; ev.sched_type = RTE_SCHED_TYPE_ATOMIC; ev.priority = 0; struct rte_event_eth_rx_adapter_queue_conf queue_config; queue_config.rx_queue_flags = 0; if (default_params.caps & RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID) { ev.flow_id = 1; queue_config.rx_queue_flags = RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID; } queue_config.ev = ev; queue_config.servicing_weight = 1; err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, TEST_ETHDEV_ID, -1, &queue_config); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_start(TEST_INST_ID); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_stop(TEST_INST_ID); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, TEST_ETHDEV_ID, -1); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_start(TEST_INST_ID); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_stop(TEST_INST_ID); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_start(1); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); err = rte_event_eth_rx_adapter_stop(1); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); return TEST_SUCCESS; } static int adapter_stats(void) { int err; struct rte_event_eth_rx_adapter_stats stats; err = rte_event_eth_rx_adapter_stats_get(TEST_INST_ID, NULL); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); err = rte_event_eth_rx_adapter_stats_get(TEST_INST_ID, &stats); TEST_ASSERT(err == 0, "Expected 0 got %d", err); err = rte_event_eth_rx_adapter_stats_get(1, &stats); TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err); return TEST_SUCCESS; } static struct unit_test_suite service_tests = { .suite_name = "rx event eth adapter test suite", .setup = testsuite_setup, .teardown = testsuite_teardown, .unit_test_cases = { TEST_CASE_ST(NULL, NULL, adapter_create_free), TEST_CASE_ST(adapter_create, adapter_free, adapter_queue_add_del), TEST_CASE_ST(adapter_create, adapter_free, adapter_start_stop), TEST_CASE_ST(adapter_create, adapter_free, adapter_stats), TEST_CASES_END() /**< NULL terminate unit test array */ } }; static int test_event_eth_rx_adapter_common(void) { return unit_test_suite_runner(&service_tests); } REGISTER_TEST_COMMAND(event_eth_rx_adapter_autotest, test_event_eth_rx_adapter_common);


context:
space:
mode: