diff options
| author |   Florin Coras <fcoras@cisco.com> | 2018-06-10 14:41:23 -0700 |
|---|---|---|
| committer |   Marco Varlese <marco.varlese@suse.de> | 2018-06-11 14:08:20 +0000 |
| commit | 40903ac34f89d9e2ad775e98b7bcec5b7feb0207 (patch) | |
| tree | 550a152e6a9359248ec50ffbeb0063b564bbcb48 /src/vnet/udp | |
| parent | d723161e038d00e59766aa67a6a0dcc350227e4b (diff) | |
udp: fix for multiple workers and add test
Since the main thread is not used for session polling anymore, when vpp
is started with multiple wokers, allocate connections on the first. Also
add a simple udp make test.
Change-Id: Id869f5d89e0fced51048f0384fa86a5022258b7c
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/udp')
| -rw-r--r-- | src/vnet/udp/udp.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c index 947cc1e38e1..888a6cb844b 100644 --- a/src/vnet/udp/udp.c +++ b/src/vnet/udp/udp.c @@ -288,6 +288,10 @@ udp_open_connection (transport_endpoint_t * rmt) node_index = rmt->is_ip4 ? udp4_input_node.index : udp6_input_node.index; udp_register_dst_port (vm, lcl_port, node_index, 1 /* is_ipv4 */ ); + /* We don't poll main thread if we have workers */ + if (vlib_num_workers ()) + thread_index = 1; + uc = udp_connection_alloc (thread_index); ip_copy (&uc->c_rmt_ip, &rmt->ip, rmt->is_ip4); ip_copy (&uc->c_lcl_ip, &lcl_addr, rmt->is_ip4); @@ -301,10 +305,14 @@ udp_open_connection (transport_endpoint_t * rmt) } transport_connection_t * -udp_half_open_session_get_transport (u32 conn_index) +udp_session_get_half_open (u32 conn_index) { udp_connection_t *uc; - uc = udp_connection_get (conn_index, vlib_get_thread_index ()); + u32 thread_index; + + /* We don't poll main thread if we have workers */ + thread_index = vlib_num_workers ()? 1 : 0; + uc = udp_connection_get (conn_index, thread_index); return &uc->connection; } @@ -316,7 +324,7 @@ const static transport_proto_vft_t udp_proto = { .push_header = udp_push_header, .get_connection = udp_session_get, .get_listener = udp_session_get_listener, - .get_half_open = udp_half_open_session_get_transport, + .get_half_open = udp_session_get_half_open, .close = udp_session_close, .cleanup = udp_session_cleanup, .send_mss = udp_send_mss, @@ -360,7 +368,7 @@ const static transport_proto_vft_t udpc_proto = { .push_header = udp_push_header, .get_connection = udp_session_get, .get_listener = udp_session_get_listener, - .get_half_open = udp_half_open_session_get_transport, + .get_half_open = udp_session_get_half_open, .close = udp_session_close, .cleanup = udp_session_cleanup, .send_mss = udp_send_mss, |