X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=dcf8ba2aa72ee9959cf47b1078cb284d70398eb8;hb=935ce75cb;hp=317351d76127ea2b386967d2c1edd97e0ae17fad;hpb=e0982e56f0b644fbec429fa8639ddb1b3403bea8;p=vpp.git diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index 317351d7612..dcf8ba2aa72 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this * You may obtain a copy of the License at: @@ -15,42 +15,36 @@ #include #include -#include #include #include #include +#include __thread uword __vcl_worker_index = ~0; static int -vcl_wait_for_segment (u64 segment_handle) +vcl_segment_is_not_mounted (vcl_worker_t * wrk, u64 segment_handle) { - vcl_worker_t *wrk = vcl_worker_get_current (); - u32 wait_for_seconds = 10, segment_index; - f64 timeout; + u32 segment_index; if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) return 0; - timeout = clib_time_now (&wrk->clib_time) + wait_for_seconds; - while (clib_time_now (&wrk->clib_time) < timeout) - { - segment_index = vcl_segment_table_lookup (segment_handle); - if (segment_index != VCL_INVALID_SEGMENT_INDEX) - return 0; - usleep (10); - } + segment_index = vcl_segment_table_lookup (segment_handle); + if (segment_index != VCL_INVALID_SEGMENT_INDEX) + return 0; + return 1; } static inline int -vcl_mq_dequeue_batch (vcl_worker_t * wrk, svm_msg_q_t * mq) +vcl_mq_dequeue_batch (vcl_worker_t * wrk, svm_msg_q_t * mq, u32 n_max_msg) { svm_msg_q_msg_t *msg; u32 n_msgs; int i; - n_msgs = svm_msg_q_size (mq); + n_msgs = clib_min (svm_msg_q_size (mq), n_max_msg); for (i = 0; i < n_msgs; i++) { vec_add2 (wrk->mq_msg_vector, msg, 1); @@ -60,14 +54,14 @@ vcl_mq_dequeue_batch (vcl_worker_t * wrk, svm_msg_q_t * mq) } const char * -vppcom_session_state_str (session_state_t state) +vppcom_session_state_str (vcl_session_state_t state) { char *st; switch (state) { - case STATE_START: - st = "STATE_START"; + case STATE_CLOSED: + st = "STATE_CLOSED"; break; case STATE_CONNECT: @@ -90,8 +84,16 @@ vppcom_session_state_str (session_state_t state) st = "STATE_DISCONNECT"; break; - case STATE_FAILED: - st = "STATE_FAILED"; + case STATE_DETACHED: + st = "STATE_DETACHED"; + break; + + case STATE_UPDATED: + st = "STATE_UPDATED"; + break; + + case STATE_LISTEN_NO_MQ: + st = "STATE_LISTEN_NO_MQ"; break; default: @@ -189,6 +191,104 @@ format_ip46_address (u8 * s, va_list * args) * VPPCOM Utility Functions */ +static void +vcl_send_session_listen (vcl_worker_t * wrk, vcl_session_t * s) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_listen_msg_t *mp; + svm_msg_q_t *mq; + + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_LISTEN); + mp = (session_listen_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->bapi_client_index; + mp->context = s->session_index; + mp->wrk_index = wrk->vpp_wrk_index; + mp->is_ip4 = s->transport.is_ip4; + clib_memcpy_fast (&mp->ip, &s->transport.lcl_ip, sizeof (mp->ip)); + mp->port = s->transport.lcl_port; + mp->proto = s->session_type; + if (s->flags & VCL_SESSION_F_CONNECTED) + mp->flags = TRANSPORT_CFG_F_CONNECTED; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} + +static void +vcl_send_session_connect (vcl_worker_t * wrk, vcl_session_t * s) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_connect_msg_t *mp; + svm_msg_q_t *mq; + + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_CONNECT); + mp = (session_connect_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->bapi_client_index; + mp->context = s->session_index; + mp->wrk_index = wrk->vpp_wrk_index; + mp->is_ip4 = s->transport.is_ip4; + mp->parent_handle = s->parent_handle; + clib_memcpy_fast (&mp->ip, &s->transport.rmt_ip, sizeof (mp->ip)); + clib_memcpy_fast (&mp->lcl_ip, &s->transport.lcl_ip, sizeof (mp->lcl_ip)); + mp->port = s->transport.rmt_port; + mp->lcl_port = s->transport.lcl_port; + mp->proto = s->session_type; + if (s->flags & VCL_SESSION_F_CONNECTED) + mp->flags |= TRANSPORT_CFG_F_CONNECTED; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} + +void +vcl_send_session_unlisten (vcl_worker_t * wrk, vcl_session_t * s) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_unlisten_msg_t *mp; + svm_msg_q_t *mq; + + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_UNLISTEN); + mp = (session_unlisten_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->bapi_client_index; + mp->wrk_index = wrk->vpp_wrk_index; + mp->handle = s->vpp_handle; + mp->context = wrk->wrk_index; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} + +static void +vcl_send_session_disconnect (vcl_worker_t * wrk, vcl_session_t * s) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_disconnect_msg_t *mp; + svm_msg_q_t *mq; + + /* Send to thread that owns the session */ + mq = s->vpp_evt_q; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_DISCONNECT); + mp = (session_disconnect_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->bapi_client_index; + mp->handle = s->vpp_handle; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} + +static void +vcl_send_app_detach (vcl_worker_t * wrk) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_app_detach_msg_t *mp; + svm_msg_q_t *mq; + + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_APP_DETACH); + mp = (session_app_detach_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->bapi_client_index; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} static void vcl_send_session_accepted_reply (svm_msg_q_t * mq, u32 context, @@ -244,15 +344,49 @@ vcl_send_session_worker_update (vcl_worker_t * wrk, vcl_session_t * s, mq = vcl_session_vpp_evt_q (wrk, s); app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_WORKER_UPDATE); mp = (session_worker_update_msg_t *) app_evt->evt->data; - mp->client_index = wrk->my_client_index; + mp->client_index = wrk->bapi_client_index; mp->handle = s->vpp_handle; mp->req_wrk_index = wrk->vpp_wrk_index; mp->wrk_index = wrk_index; app_send_ctrl_evt_to_vpp (mq, app_evt); } +int +vcl_send_worker_rpc (u32 dst_wrk_index, void *data, u32 data_len) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_app_wrk_rpc_msg_t *mp; + vcl_worker_t *dst_wrk, *wrk; + svm_msg_q_t *mq; + int ret = -1; + + if (data_len > sizeof (mp->data)) + goto done; + + clib_spinlock_lock (&vcm->workers_lock); + + dst_wrk = vcl_worker_get_if_valid (dst_wrk_index); + if (!dst_wrk) + goto done; + + wrk = vcl_worker_get_current (); + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_APP_WRK_RPC); + mp = (session_app_wrk_rpc_msg_t *) app_evt->evt->data; + mp->client_index = wrk->bapi_client_index; + mp->wrk_index = dst_wrk->vpp_wrk_index; + clib_memcpy (mp->data, data, data_len); + app_send_ctrl_evt_to_vpp (mq, app_evt); + ret = 0; + +done: + clib_spinlock_unlock (&vcm->workers_lock); + return ret; +} + static u32 -vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp) +vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp, + u32 ls_index) { vcl_session_t *session, *listen_session; svm_fifo_t *rx_fifo, *tx_fifo; @@ -261,84 +395,70 @@ vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp) session = vcl_session_alloc (wrk); - listen_session = vcl_session_table_lookup_listener (wrk, - mp->listener_handle); - if (!listen_session) + listen_session = vcl_session_get (wrk, ls_index); + if (listen_session->vpp_handle != mp->listener_handle) { - svm_msg_q_t *evt_q; - evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); - clib_warning ("VCL<%d>: ERROR: couldn't find listen session: " - "unknown vpp listener handle %llx", - getpid (), mp->listener_handle); - vcl_send_session_accepted_reply (evt_q, mp->context, mp->handle, - VNET_API_ERROR_INVALID_ARGUMENT); - vcl_session_free (wrk, session); - return VCL_INVALID_SESSION_INDEX; + VDBG (0, "ERROR: listener handle %lu does not match session %u", + mp->listener_handle, ls_index); + goto error; } - rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); - tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); - - if (mp->server_event_queue_address) - { - session->vpp_evt_q = uword_to_pointer (mp->client_event_queue_address, - svm_msg_q_t *); - session->our_evt_q = uword_to_pointer (mp->server_event_queue_address, - svm_msg_q_t *); - if (vcl_wait_for_segment (mp->segment_handle)) - { - clib_warning ("segment for session %u couldn't be mounted!", - session->session_index); - return VCL_INVALID_SESSION_INDEX; - } - rx_fifo->master_session_index = session->session_index; - tx_fifo->master_session_index = session->session_index; - rx_fifo->master_thread_index = vcl_get_worker_index (); - tx_fifo->master_thread_index = vcl_get_worker_index (); - vec_validate (wrk->vpp_event_queues, 0); - evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); - wrk->vpp_event_queues[0] = evt_q; - } - else + if (vcl_segment_is_not_mounted (wrk, mp->segment_handle)) { - session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, - svm_msg_q_t *); - rx_fifo->client_session_index = session->session_index; - tx_fifo->client_session_index = session->session_index; - rx_fifo->client_thread_index = vcl_get_worker_index (); - tx_fifo->client_thread_index = vcl_get_worker_index (); - vpp_wrk_index = tx_fifo->master_thread_index; - vec_validate (wrk->vpp_event_queues, vpp_wrk_index); - wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; + VDBG (0, "ERROR: segment for session %u is not mounted!", + session->session_index); + goto error; } + rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); + tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); + session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, + svm_msg_q_t *); + rx_fifo->client_session_index = session->session_index; + tx_fifo->client_session_index = session->session_index; + rx_fifo->client_thread_index = vcl_get_worker_index (); + tx_fifo->client_thread_index = vcl_get_worker_index (); + vpp_wrk_index = tx_fifo->master_thread_index; + vec_validate (wrk->vpp_event_queues, vpp_wrk_index); + wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; + session->vpp_handle = mp->handle; session->vpp_thread_index = rx_fifo->master_thread_index; - session->client_context = mp->context; session->rx_fifo = rx_fifo; session->tx_fifo = tx_fifo; session->session_state = STATE_ACCEPT; - session->transport.rmt_port = mp->port; - session->transport.is_ip4 = mp->is_ip4; - clib_memcpy_fast (&session->transport.rmt_ip, mp->ip, + session->transport.rmt_port = mp->rmt.port; + session->transport.is_ip4 = mp->rmt.is_ip4; + clib_memcpy_fast (&session->transport.rmt_ip, &mp->rmt.ip, sizeof (ip46_address_t)); vcl_session_table_add_vpp_handle (wrk, mp->handle, session->session_index); session->transport.lcl_port = listen_session->transport.lcl_port; session->transport.lcl_ip = listen_session->transport.lcl_ip; session->session_type = listen_session->session_type; - session->is_dgram = session->session_type == VPPCOM_PROTO_UDP; - - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: client accept request from %s" - " address %U port %d queue %p!", getpid (), mp->handle, - session->session_index, - mp->is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &mp->ip, - mp->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, - clib_net_to_host_u16 (mp->port), session->vpp_evt_q); + session->is_dgram = vcl_proto_is_dgram (session->session_type); + session->listener_index = listen_session->session_index; + listen_session->n_accepted_sessions++; + + VDBG (1, "session %u [0x%llx]: client accept request from %s address %U" + " port %d queue %p!", session->session_index, mp->handle, + mp->rmt.is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &mp->rmt.ip, + mp->rmt.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (mp->rmt.port), session->vpp_evt_q); vcl_evt (VCL_EVT_ACCEPT, session, listen_session, session_index); + vcl_send_session_accepted_reply (session->vpp_evt_q, mp->context, + session->vpp_handle, 0); + return session->session_index; + +error: + evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); + vcl_send_session_accepted_reply (evt_q, mp->context, mp->handle, + VNET_API_ERROR_INVALID_ARGUMENT); + vcl_session_free (wrk, session); + return VCL_INVALID_SESSION_INDEX; } static u32 @@ -348,33 +468,36 @@ vcl_session_connected_handler (vcl_worker_t * wrk, u32 session_index, vpp_wrk_index; svm_fifo_t *rx_fifo, *tx_fifo; vcl_session_t *session = 0; - svm_msg_q_t *evt_q; session_index = mp->context; session = vcl_session_get (wrk, session_index); if (!session) { - clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: " - "Invalid session index (%u)!", - getpid (), mp->handle, session_index); + VDBG (0, "ERROR: vpp handle 0x%llx has no session index (%u)!", + mp->handle, session_index); return VCL_INVALID_SESSION_INDEX; } if (mp->retval) { - clib_warning ("VCL<%d>: ERROR: sid %u: connect failed! %U", getpid (), - session_index, format_api_error, ntohl (mp->retval)); - session->session_state = STATE_FAILED; + VDBG (0, "ERROR: session index %u: connect failed! %U", + session_index, format_session_error, mp->retval); + session->session_state = STATE_DETACHED | STATE_DISCONNECT; session->vpp_handle = mp->handle; return session_index; } + session->vpp_handle = mp->handle; + session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, + svm_msg_q_t *); rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); - if (vcl_wait_for_segment (mp->segment_handle)) + if (vcl_segment_is_not_mounted (wrk, mp->segment_handle)) { - clib_warning ("segment for session %u couldn't be mounted!", - session->session_index); - return VCL_INVALID_SESSION_INDEX; + VDBG (0, "segment for session %u is not mounted!", + session->session_index); + session->session_state = STATE_DETACHED | STATE_DISCONNECT; + vcl_send_session_disconnect (wrk, session); + return session_index; } rx_fifo->client_session_index = session_index; @@ -382,42 +505,44 @@ vcl_session_connected_handler (vcl_worker_t * wrk, rx_fifo->client_thread_index = vcl_get_worker_index (); tx_fifo->client_thread_index = vcl_get_worker_index (); - if (mp->client_event_queue_address) - { - session->vpp_evt_q = uword_to_pointer (mp->server_event_queue_address, - svm_msg_q_t *); - session->our_evt_q = uword_to_pointer (mp->client_event_queue_address, - svm_msg_q_t *); + vpp_wrk_index = tx_fifo->master_thread_index; + vec_validate (wrk->vpp_event_queues, vpp_wrk_index); + wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; - vec_validate (wrk->vpp_event_queues, 0); - evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); - wrk->vpp_event_queues[0] = evt_q; - } - else + if (mp->ct_rx_fifo) { - session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, - svm_msg_q_t *); - vpp_wrk_index = tx_fifo->master_thread_index; - vec_validate (wrk->vpp_event_queues, vpp_wrk_index); - wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; + session->ct_rx_fifo = uword_to_pointer (mp->ct_rx_fifo, svm_fifo_t *); + session->ct_tx_fifo = uword_to_pointer (mp->ct_tx_fifo, svm_fifo_t *); + if (vcl_segment_is_not_mounted (wrk, mp->ct_segment_handle)) + { + VDBG (0, "ct segment for session %u is not mounted!", + session->session_index); + session->session_state = STATE_DETACHED | STATE_DISCONNECT; + vcl_send_session_disconnect (wrk, session); + return session_index; + } } session->rx_fifo = rx_fifo; session->tx_fifo = tx_fifo; - session->vpp_handle = mp->handle; session->vpp_thread_index = rx_fifo->master_thread_index; - session->transport.is_ip4 = mp->is_ip4; - clib_memcpy_fast (&session->transport.lcl_ip, mp->lcl_ip, + session->transport.is_ip4 = mp->lcl.is_ip4; + clib_memcpy_fast (&session->transport.lcl_ip, &mp->lcl.ip, sizeof (session->transport.lcl_ip)); - session->transport.lcl_port = mp->lcl_port; - session->session_state = STATE_CONNECT; + session->transport.lcl_port = mp->lcl.port; + + /* Application closed session before connect reply */ + if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK) + && session->session_state == STATE_CLOSED) + vcl_send_session_disconnect (wrk, session); + else + session->session_state = STATE_CONNECT; /* Add it to lookup table */ vcl_session_table_add_vpp_handle (wrk, mp->handle, session_index); - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: connect succeeded! " - "session_rx_fifo %p, refcnt %d, session_tx_fifo %p, refcnt %d", - getpid (), mp->handle, session_index, session->rx_fifo, + VDBG (1, "session %u [0x%llx] connected! rx_fifo %p, refcnt %d, tx_fifo %p," + " refcnt %d", session_index, mp->handle, session->rx_fifo, session->rx_fifo->refcnt, session->tx_fifo, session->tx_fifo->refcnt); return session_index; @@ -466,7 +591,8 @@ vcl_session_reset_handler (vcl_worker_t * wrk, return VCL_INVALID_SESSION_INDEX; } - session->session_state = STATE_DISCONNECT; + if (session->session_state != STATE_CLOSED) + session->session_state = STATE_DISCONNECT; VDBG (0, "reset session %u [0x%llx]", sid, reset_msg->handle); return sid; } @@ -480,19 +606,18 @@ vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) session = vcl_session_get (wrk, sid); if (mp->retval) { - VERR ("vpp handle 0x%llx, sid %u: bind failed: %U", mp->handle, sid, - format_api_error, mp->retval); + VERR ("session %u [0x%llx]: bind failed: %U", sid, mp->handle, + format_session_error, mp->retval); if (session) { - session->session_state = STATE_FAILED; + session->session_state = STATE_DETACHED; session->vpp_handle = mp->handle; return sid; } else { - clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: " - "Invalid session index (%u)!", - getpid (), mp->handle, sid); + VDBG (0, "ERROR: session %u [0x%llx]: Invalid session index!", + sid, mp->handle); return VCL_INVALID_SESSION_INDEX; } } @@ -509,7 +634,7 @@ vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) vec_validate (wrk->vpp_event_queues, 0); wrk->vpp_event_queues[0] = session->vpp_evt_q; - if (session->is_dgram) + if (vcl_session_is_cl (session)) { svm_fifo_t *rx_fifo, *tx_fifo; session->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); @@ -525,6 +650,72 @@ vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) return sid; } +static void +vcl_session_unlisten_reply_handler (vcl_worker_t * wrk, void *data) +{ + session_unlisten_reply_msg_t *mp = (session_unlisten_reply_msg_t *) data; + vcl_session_t *s; + + s = vcl_session_get_w_vpp_handle (wrk, mp->handle); + if (!s) + { + VDBG (0, "Unlisten reply with wrong handle %llx", mp->handle); + return; + } + if (s->session_state != STATE_DISCONNECT) + { + /* Connected udp listener */ + if (s->session_type == VPPCOM_PROTO_UDP + && s->session_state == STATE_CLOSED) + return; + + VDBG (0, "Unlisten session in wrong state %llx", mp->handle); + return; + } + + if (mp->retval) + VDBG (0, "ERROR: session %u [0xllx]: unlisten failed: %U", + s->session_index, mp->handle, format_session_error, mp->retval); + + if (mp->context != wrk->wrk_index) + VDBG (0, "wrong context"); + + vcl_session_table_del_vpp_handle (wrk, mp->handle); + vcl_session_free (wrk, s); +} + +static void +vcl_session_migrated_handler (vcl_worker_t * wrk, void *data) +{ + session_migrated_msg_t *mp = (session_migrated_msg_t *) data; + vcl_session_t *s; + + s = vcl_session_get_w_vpp_handle (wrk, mp->handle); + if (!s) + { + VDBG (0, "Migrated notification with wrong handle %llx", mp->handle); + return; + } + + s->vpp_thread_index = mp->vpp_thread_index; + s->vpp_handle = mp->new_handle; + s->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); + + vec_validate (wrk->vpp_event_queues, s->vpp_thread_index); + wrk->vpp_event_queues[s->vpp_thread_index] = s->vpp_evt_q; + + vcl_session_table_del_vpp_handle (wrk, mp->handle); + vcl_session_table_add_vpp_handle (wrk, mp->new_handle, s->session_index); + + /* Generate new tx event if we have outstanding data */ + if (svm_fifo_has_event (s->tx_fifo)) + app_send_io_evt_to_vpp (s->vpp_evt_q, s->tx_fifo->master_session_index, + SESSION_IO_EVT_TX, SVM_Q_WAIT); + + VDBG (0, "Migrated 0x%lx to thread %u 0x%lx", mp->handle, + s->vpp_thread_index, mp->new_handle); +} + static vcl_session_t * vcl_session_accepted (vcl_worker_t * wrk, session_accepted_msg_t * msg) { @@ -545,6 +736,7 @@ vcl_session_accepted (vcl_worker_t * wrk, session_accepted_msg_t * msg) } clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); + vcl_msg->flags = 0; vcl_msg->accepted_msg = *msg; /* Session handle points to listener until fully accepted by app */ vcl_session_table_add_vpp_handle (wrk, msg->handle, session->session_index); @@ -565,6 +757,10 @@ vcl_session_disconnected_handler (vcl_worker_t * wrk, return 0; } + /* Late disconnect notification on a session that has been closed */ + if (session->session_state == STATE_CLOSED) + return 0; + /* Caught a disconnect before actually accepting the session */ if (session->session_state == STATE_LISTEN) { @@ -574,10 +770,50 @@ vcl_session_disconnected_handler (vcl_worker_t * wrk, return 0; } - session->session_state = STATE_VPP_CLOSING; + /* If not already reset change state */ + if (session->session_state != STATE_DISCONNECT) + session->session_state = STATE_VPP_CLOSING; + return session; } +static void +vcl_session_cleanup_handler (vcl_worker_t * wrk, void *data) +{ + session_cleanup_msg_t *msg; + vcl_session_t *session; + + msg = (session_cleanup_msg_t *) data; + session = vcl_session_get_w_vpp_handle (wrk, msg->handle); + if (!session) + { + VDBG (0, "disconnect confirmed for unknown handle 0x%llx", msg->handle); + return; + } + + if (msg->type == SESSION_CLEANUP_TRANSPORT) + { + /* Transport was cleaned up before we confirmed close. Probably the + * app is still waiting for some data that cannot be delivered. + * Confirm close to make sure everything is cleaned up */ + if (session->session_state == STATE_VPP_CLOSING) + vcl_session_cleanup (wrk, session, vcl_session_handle (session), + 1 /* do_disconnect */ ); + return; + } + + vcl_session_table_del_vpp_handle (wrk, msg->handle); + /* Should not happen. App did not close the connection so don't free it. */ + if (session->session_state != STATE_CLOSED) + { + VDBG (0, "app did not close session %d", session->session_index); + session->session_state = STATE_DETACHED; + session->vpp_handle = VCL_INVALID_SESSION_HANDLE; + return; + } + vcl_session_free (wrk, session); +} + static void vcl_session_req_worker_update_handler (vcl_worker_t * wrk, void *data) { @@ -605,9 +841,9 @@ vcl_session_worker_update_reply_handler (vcl_worker_t * wrk, void *data) VDBG (0, "unknown handle 0x%llx", msg->handle); return; } - if (vcl_wait_for_segment (msg->segment_handle)) + if (vcl_segment_is_not_mounted (wrk, msg->segment_handle)) { - clib_warning ("segment for session %u couldn't be mounted!", + clib_warning ("segment for session %u is not mounted!", s->session_index); return; } @@ -627,6 +863,67 @@ vcl_session_worker_update_reply_handler (vcl_worker_t * wrk, void *data) s->vpp_handle, wrk->wrk_index); } +static int +vcl_api_recv_fd (vcl_worker_t * wrk, int *fds, int n_fds) +{ + + if (vcm->cfg.vpp_app_socket_api) + return vcl_sapi_recv_fds (wrk, fds, n_fds); + + return vcl_bapi_recv_fds (wrk, fds, n_fds); +} + +static void +vcl_session_app_add_segment_handler (vcl_worker_t * wrk, void *data) +{ + ssvm_segment_type_t seg_type = SSVM_SEGMENT_SHM; + session_app_add_segment_msg_t *msg; + u64 segment_handle; + int fd = -1; + + msg = (session_app_add_segment_msg_t *) data; + + if (msg->fd_flags) + { + vcl_api_recv_fd (wrk, &fd, 1); + seg_type = SSVM_SEGMENT_MEMFD; + } + + segment_handle = msg->segment_handle; + if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) + { + clib_warning ("invalid segment handle"); + return; + } + + if (vcl_segment_attach (segment_handle, (char *) msg->segment_name, + seg_type, fd)) + { + VDBG (0, "vcl_segment_attach ('%s') failed", msg->segment_name); + return; + } + + VDBG (1, "mapped new segment '%s' size %d", msg->segment_name, + msg->segment_size); +} + +static void +vcl_session_app_del_segment_handler (vcl_worker_t * wrk, void *data) +{ + session_app_del_segment_msg_t *msg = (session_app_del_segment_msg_t *) data; + vcl_segment_detach (msg->segment_handle); + VDBG (1, "Unmapped segment: %d", msg->segment_handle); +} + +static void +vcl_worker_rpc_handler (vcl_worker_t * wrk, void *data) +{ + if (!vcm->wrk_rpc_fn) + return; + + (vcm->wrk_rpc_fn) (((session_app_wrk_rpc_msg_t *) data)->data); +} + static int vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) { @@ -635,10 +932,11 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) switch (e->event_type) { - case FIFO_EVENT_APP_RX: - case FIFO_EVENT_APP_TX: - case SESSION_IO_EVT_CT_RX: - case SESSION_IO_EVT_CT_TX: + case SESSION_IO_EVT_RX: + case SESSION_IO_EVT_TX: + session = vcl_session_get (wrk, e->session_index); + if (!session || !(session->session_state & STATE_OPEN)) + break; vec_add1 (wrk->unhandled_evts_vector, *e); break; case SESSION_CTRL_EVT_ACCEPTED: @@ -653,7 +951,6 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) session = vcl_session_disconnected_handler (wrk, disconnected_msg); if (!session) break; - session->session_state = STATE_DISCONNECT; VDBG (0, "disconnected session %u [0x%llx]", session->session_index, session->vpp_handle); break; @@ -663,12 +960,30 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) case SESSION_CTRL_EVT_BOUND: vcl_session_bound_handler (wrk, (session_bound_msg_t *) e->data); break; + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + vcl_session_unlisten_reply_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_MIGRATED: + vcl_session_migrated_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_CLEANUP: + vcl_session_cleanup_handler (wrk, e->data); + break; case SESSION_CTRL_EVT_REQ_WORKER_UPDATE: vcl_session_req_worker_update_handler (wrk, e->data); break; case SESSION_CTRL_EVT_WORKER_UPDATE_REPLY: vcl_session_worker_update_reply_handler (wrk, e->data); break; + case SESSION_CTRL_EVT_APP_ADD_SEGMENT: + vcl_session_app_add_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_DEL_SEGMENT: + vcl_session_app_del_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_WRK_RPC: + vcl_worker_rpc_handler (wrk, e->data); + break; default: clib_warning ("unhandled %u", e->event_type); } @@ -677,7 +992,7 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) static int vppcom_wait_for_session_state_change (u32 session_index, - session_state_t state, + vcl_session_state_t state, f64 wait_for_time) { vcl_worker_t *wrk = vcl_worker_get_current (); @@ -697,7 +1012,7 @@ vppcom_wait_for_session_state_change (u32 session_index, { return VPPCOM_OK; } - if (session->session_state & STATE_FAILED) + if (session->session_state & STATE_DETACHED) { return VPPCOM_ECONNREFUSED; } @@ -723,7 +1038,7 @@ vppcom_wait_for_session_state_change (u32 session_index, static void vcl_handle_pending_wrk_updates (vcl_worker_t * wrk) { - session_state_t state; + vcl_session_state_t state; vcl_session_t *s; u32 *sip; @@ -752,7 +1067,7 @@ vcl_flush_mq_events (void) mq = wrk->app_event_queue; svm_msg_q_lock (mq); - vcl_mq_dequeue_batch (wrk, mq); + vcl_mq_dequeue_batch (wrk, mq, ~0); svm_msg_q_unlock (mq); for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) @@ -766,63 +1081,38 @@ vcl_flush_mq_events (void) vcl_handle_pending_wrk_updates (wrk); } -static int -vppcom_app_session_enable (void) -{ - int rv; - - if (vcm->app_state != STATE_APP_ENABLED) - { - vppcom_send_session_enable_disable (1 /* is_enabled == TRUE */ ); - rv = vcl_wait_for_app_state_change (STATE_APP_ENABLED); - if (PREDICT_FALSE (rv)) - { - VDBG (0, "VCL<%d>: application session enable timed out! " - "returning %d (%s)", getpid (), rv, vppcom_retval_str (rv)); - return rv; - } - } - return VPPCOM_OK; -} - -static int -vppcom_app_attach (void) -{ - int rv; - - vppcom_app_send_attach (); - rv = vcl_wait_for_app_state_change (STATE_APP_ATTACHED); - if (PREDICT_FALSE (rv)) - { - VDBG (0, "VCL<%d>: application attach timed out! returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); - return rv; - } - - return VPPCOM_OK; -} - static int vppcom_session_unbind (u32 session_handle) { vcl_worker_t *wrk = vcl_worker_get_current (); + session_accepted_msg_t *accepted_msg; vcl_session_t *session = 0; - u64 vpp_handle; + vcl_session_msg_t *evt; session = vcl_session_get_w_handle (wrk, session_handle); if (!session) return VPPCOM_EBADFD; - vpp_handle = session->vpp_handle; - vcl_session_table_del_listener (wrk, vpp_handle); - session->vpp_handle = ~0; - session->session_state = STATE_DISCONNECT; + /* Flush pending accept events, if any */ + while (clib_fifo_elts (session->accept_evts_fifo)) + { + clib_fifo_sub2 (session->accept_evts_fifo, evt); + accepted_msg = &evt->accepted_msg; + vcl_session_table_del_vpp_handle (wrk, accepted_msg->handle); + vcl_send_session_accepted_reply (session->vpp_evt_q, + accepted_msg->context, + session->vpp_handle, -1); + } + clib_fifo_free (session->accept_evts_fifo); - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending unbind msg! new state" - " 0x%x (%s)", getpid (), vpp_handle, session_handle, STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT)); + vcl_send_session_unlisten (wrk, session); + + VDBG (1, "session %u [0x%llx]: sending unbind!", session->session_index, + session->vpp_handle); vcl_evt (VCL_EVT_UNBIND, session); - vppcom_send_unbind_sock (vpp_handle); + + session->vpp_handle = ~0; + session->session_state = STATE_DISCONNECT; return VPPCOM_OK; } @@ -832,8 +1122,8 @@ vppcom_session_disconnect (u32 session_handle) { vcl_worker_t *wrk = vcl_worker_get_current (); svm_msg_q_t *vpp_evt_q; - vcl_session_t *session; - session_state_t state; + vcl_session_t *session, *listen_session; + vcl_session_state_t state; u64 vpp_handle; session = vcl_session_get_w_handle (wrk, session_handle); @@ -843,30 +1133,39 @@ vppcom_session_disconnect (u32 session_handle) vpp_handle = session->vpp_handle; state = session->session_state; - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u state 0x%x (%s)", getpid (), - vpp_handle, session_handle, state, vppcom_session_state_str (state)); + VDBG (1, "session %u [0x%llx] state 0x%x (%s)", session->session_index, + vpp_handle, state, vppcom_session_state_str (state)); if (PREDICT_FALSE (state & STATE_LISTEN)) { - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "Cannot disconnect a listen socket!", - getpid (), vpp_handle, session_handle); + VDBG (0, "ERROR: Cannot disconnect a listen socket!"); return VPPCOM_EBADFD; } if (state & STATE_VPP_CLOSING) { vpp_evt_q = vcl_session_vpp_evt_q (wrk, session); - vcl_send_session_disconnected_reply (vpp_evt_q, wrk->my_client_index, + vcl_send_session_disconnected_reply (vpp_evt_q, wrk->bapi_client_index, vpp_handle, 0); - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect " - "REPLY...", getpid (), vpp_handle, session_handle); + VDBG (1, "session %u [0x%llx]: sending disconnect REPLY...", + session->session_index, vpp_handle); } else { - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect...", - getpid (), vpp_handle, session_handle); - vppcom_send_disconnect_session (vpp_handle); + /* Session doesn't have an event queue yet. Probably a non-blocking + * connect. Wait for the reply */ + if (PREDICT_FALSE (!session->vpp_evt_q)) + return VPPCOM_OK; + + VDBG (1, "session %u [0x%llx]: sending disconnect...", + session->session_index, vpp_handle); + vcl_send_session_disconnect (wrk, session); + } + + if (session->listener_index != VCL_INVALID_SESSION_INDEX) + { + listen_session = vcl_session_get (wrk, session->listener_index); + listen_session->n_accepted_sessions--; } return VPPCOM_OK; @@ -887,17 +1186,33 @@ vppcom_app_exit (void) vcl_worker_cleanup (vcl_worker_get_current (), 1 /* notify vpp */ ); vcl_set_worker_index (~0); vcl_elog_stop (vcm); - if (vec_len (vcm->workers) == 1) - vl_client_disconnect_from_vlib (); - else - vl_client_send_disconnect (1 /* vpp should cleanup */ ); +} + +static int +vcl_api_attach (void) +{ + if (vcm->cfg.vpp_app_socket_api) + return vcl_sapi_attach (); + + return vcl_bapi_attach (); +} + +static void +vcl_api_detach (vcl_worker_t * wrk) +{ + vcl_send_app_detach (wrk); + + if (vcm->cfg.vpp_app_socket_api) + return vcl_sapi_detach (wrk); + + return vcl_bapi_disconnect_from_vpp (); } /* * VPPCOM Public API functions */ int -vppcom_app_create (char *app_name) +vppcom_app_create (const char *app_name) { vppcom_cfg_t *vcl_cfg = &vcm->cfg; int rv; @@ -915,45 +1230,22 @@ vppcom_app_create (char *app_name) vcm->main_cpu = pthread_self (); vcm->main_pid = getpid (); vcm->app_name = format (0, "%s", app_name); - vppcom_init_error_string_table (); - svm_fifo_segment_main_init (&vcm->segment_main, vcl_cfg->segment_baseva, - 20 /* timeout in secs */ ); + fifo_segment_main_init (&vcm->segment_main, vcl_cfg->segment_baseva, + 20 /* timeout in secs */ ); pool_alloc (vcm->workers, vcl_cfg->max_workers); clib_spinlock_init (&vcm->workers_lock); clib_rwlock_init (&vcm->segment_table_lock); atexit (vppcom_app_exit); + vcl_elog_init (vcm); /* Allocate default worker */ vcl_worker_alloc_and_init (); - /* API hookup and connect to VPP */ - vppcom_api_hookup (); - vcl_elog_init (vcm); - vcm->app_state = STATE_APP_START; - rv = vppcom_connect_to_vpp (app_name); - if (rv) - { - VERR ("couldn't connect to VPP!"); - return rv; - } - VDBG (0, "sending session enable"); - rv = vppcom_app_session_enable (); - if (rv) - { - VERR ("vppcom_app_session_enable() failed!"); - return rv; - } - - VDBG (0, "sending app attach"); - rv = vppcom_app_attach (); - if (rv) - { - VERR ("vppcom_app_attach() failed!"); - return rv; - } + if ((rv = vcl_api_attach ())) + return rv; VDBG (0, "app_name '%s', my_client_index %d (0x%x)", app_name, - vcm->workers[0].my_client_index, vcm->workers[0].my_client_index); + vcm->workers[0].bapi_client_index, vcm->workers[0].bapi_client_index); return VPPCOM_OK; } @@ -961,35 +1253,38 @@ vppcom_app_create (char *app_name) void vppcom_app_destroy (void) { - int rv; - f64 orig_app_timeout; + vcl_worker_t *wrk, *current_wrk; + struct dlmallinfo mi; + mspace heap; if (!pool_elts (vcm->workers)) return; vcl_evt (VCL_EVT_DETACH, vcm); - if (pool_elts (vcm->workers) == 1) - { - vppcom_app_send_detach (); - orig_app_timeout = vcm->cfg.app_timeout; - vcm->cfg.app_timeout = 2.0; - rv = vcl_wait_for_app_state_change (STATE_APP_ENABLED); - vcm->cfg.app_timeout = orig_app_timeout; - if (PREDICT_FALSE (rv)) - VDBG (0, "application detach timed out! returning %d (%s)", rv, - vppcom_retval_str (rv)); - vec_free (vcm->app_name); - vcl_worker_cleanup (vcl_worker_get_current (), 0 /* notify vpp */ ); - } - else - { - vcl_worker_cleanup (vcl_worker_get_current (), 1 /* notify vpp */ ); - } + current_wrk = vcl_worker_get_current (); + + /* *INDENT-OFF* */ + pool_foreach (wrk, vcm->workers, ({ + if (current_wrk != wrk) + vcl_worker_cleanup (wrk, 0 /* notify vpp */ ); + })); + /* *INDENT-ON* */ + + vcl_api_detach (current_wrk); + vcl_worker_cleanup (current_wrk, 0 /* notify vpp */ ); - vcl_set_worker_index (~0); vcl_elog_stop (vcm); - vl_client_disconnect_from_vlib (); + + /* + * Free the heap and fix vcm + */ + heap = clib_mem_get_heap (); + mi = mspace_mallinfo (heap); + munmap (mspace_least_addr (heap), mi.arena); + + vcm = &_vppcom_main; + vcm->is_init = 0; } int @@ -1001,9 +1296,9 @@ vppcom_session_create (u8 proto, u8 is_nonblocking) session = vcl_session_alloc (wrk); session->session_type = proto; - session->session_state = STATE_START; + session->session_state = STATE_CLOSED; session->vpp_handle = ~0; - session->is_dgram = proto == VPPCOM_PROTO_UDP; + session->is_dgram = vcl_proto_is_dgram (proto); if (is_nonblocking) VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK); @@ -1011,7 +1306,7 @@ vppcom_session_create (u8 proto, u8 is_nonblocking) vcl_evt (VCL_EVT_CREATE, session, session_type, session->session_state, is_nonblocking, session_index); - VDBG (0, "created sid %u", session->session_index); + VDBG (0, "created session %u", session->session_index); return vcl_session_handle (session); } @@ -1020,7 +1315,7 @@ int vcl_session_cleanup (vcl_worker_t * wrk, vcl_session_t * session, vcl_session_handle_t sh, u8 do_disconnect) { - session_state_t state; + vcl_session_state_t state; u32 next_sh, vep_sh; int rv = VPPCOM_OK; u64 vpp_handle; @@ -1040,77 +1335,71 @@ vcl_session_cleanup (vcl_worker_t * wrk, vcl_session_t * session, { rv = vppcom_epoll_ctl (sh, EPOLL_CTL_DEL, next_sh, 0); if (PREDICT_FALSE (rv < 0)) - VDBG (0, "vpp handle 0x%llx, sid %u: EPOLL_CTL_DEL vep_idx %u" + VDBG (0, "vpp handle 0x%llx, sh %u: EPOLL_CTL_DEL vep_idx %u" " failed! rv %d (%s)", vpp_handle, next_sh, vep_sh, rv, vppcom_retval_str (rv)); next_sh = session->vep.next_sh; } + goto cleanup; } - else - { - if (session->is_vep_session) - { - rv = vppcom_epoll_ctl (vep_sh, EPOLL_CTL_DEL, sh, 0); - if (rv < 0) - VDBG (0, "session %u [0x%llx]: EPOLL_CTL_DEL vep_idx %u " - "failed! rv %d (%s)", session->session_index, vpp_handle, - vep_sh, rv, vppcom_retval_str (rv)); - } - if (!do_disconnect) - { - VDBG (0, "session %u [0x%llx] disconnect skipped", - session->session_index, vpp_handle); - goto cleanup; - } - - if (state & STATE_LISTEN) - { - rv = vppcom_session_unbind (sh); - if (PREDICT_FALSE (rv < 0)) - VDBG (0, "session %u [0x%llx]: listener unbind failed! " - "rv %d (%s)", session->session_index, vpp_handle, rv, - vppcom_retval_str (rv)); - } - else if (state & STATE_OPEN) - { - rv = vppcom_session_disconnect (sh); - if (PREDICT_FALSE (rv < 0)) - VDBG (0, "ERROR: session %u [0x%llx]: disconnect failed!" - " rv %d (%s)", session->session_index, vpp_handle, - rv, vppcom_retval_str (rv)); - } - else if (state == STATE_DISCONNECT) - { - svm_msg_q_t *mq = vcl_session_vpp_evt_q (wrk, session); - vcl_send_session_reset_reply (mq, wrk->my_client_index, - session->vpp_handle, 0); - } + if (session->is_vep_session) + { + rv = vppcom_epoll_ctl (vep_sh, EPOLL_CTL_DEL, sh, 0); + if (rv < 0) + VDBG (0, "session %u [0x%llx]: EPOLL_CTL_DEL vep_idx %u " + "failed! rv %d (%s)", session->session_index, vpp_handle, + vep_sh, rv, vppcom_retval_str (rv)); } - if (vcl_session_is_ct (session)) + if (!do_disconnect) { - vcl_cut_through_registration_t *ctr; - uword mq_addr; + VDBG (1, "session %u [0x%llx] disconnect skipped", + session->session_index, vpp_handle); + goto cleanup; + } - mq_addr = pointer_to_uword (session->our_evt_q); - ctr = vcl_ct_registration_lock_and_lookup (wrk, mq_addr); - ASSERT (ctr); - if (ctr->epoll_evt_conn_index != ~0) - vcl_mq_epoll_del_evfd (wrk, ctr->epoll_evt_conn_index); - VDBG (0, "Removing ct registration %u", - vcl_ct_registration_index (wrk, ctr)); - vcl_ct_registration_del (wrk, ctr); - vcl_ct_registration_lookup_del (wrk, mq_addr); - vcl_ct_registration_unlock (wrk); + if (state & STATE_LISTEN) + { + rv = vppcom_session_unbind (sh); + if (PREDICT_FALSE (rv < 0)) + VDBG (0, "session %u [0x%llx]: listener unbind failed! " + "rv %d (%s)", session->session_index, vpp_handle, rv, + vppcom_retval_str (rv)); + return rv; } + else if ((state & STATE_OPEN) + || (vcl_session_is_connectable_listener (wrk, session))) + { + rv = vppcom_session_disconnect (sh); + if (PREDICT_FALSE (rv < 0)) + VDBG (0, "ERROR: session %u [0x%llx]: disconnect failed!" + " rv %d (%s)", session->session_index, vpp_handle, + rv, vppcom_retval_str (rv)); + } + else if (state == STATE_DISCONNECT) + { + svm_msg_q_t *mq = vcl_session_vpp_evt_q (wrk, session); + vcl_send_session_reset_reply (mq, wrk->bapi_client_index, + session->vpp_handle, 0); + } + else if (state == STATE_DETACHED) + { + /* Should not happen. VPP cleaned up before app confirmed close */ + VDBG (0, "vpp freed session %d before close", session->session_index); + goto free_session; + } + + session->session_state = STATE_CLOSED; + + /* Session is removed only after vpp confirms the disconnect */ + return rv; cleanup: vcl_session_table_del_vpp_handle (wrk, vpp_handle); +free_session: vcl_session_free (wrk, session); - - VDBG (0, "session %u [0x%llx] removed", session->session_index, vpp_handle); vcl_evt (VCL_EVT_CLOSE, session, rv); return rv; @@ -1144,8 +1433,8 @@ vppcom_session_bind (uint32_t session_handle, vppcom_endpt_t * ep) if (session->is_vep) { - clib_warning ("VCL<%d>: ERROR: sid %u: cannot " - "bind to an epoll session!", getpid (), session_handle); + VDBG (0, "ERROR: cannot bind to epoll session %u!", + session->session_index); return VPPCOM_EBADFD; } @@ -1158,8 +1447,8 @@ vppcom_session_bind (uint32_t session_handle, vppcom_endpt_t * ep) sizeof (ip6_address_t)); session->transport.lcl_port = ep->port; - VDBG (0, "VCL<%d>: sid %u: binding to local %s address %U port %u, " - "proto %s", getpid (), session_handle, + VDBG (0, "session %u handle %u: binding to local %s address %U port %u, " + "proto %s", session->session_index, session_handle, session->transport.is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &session->transport.lcl_ip, session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, @@ -1196,13 +1485,12 @@ vppcom_session_listen (uint32_t listen_sh, uint32_t q_len) return VPPCOM_OK; } - VDBG (0, "session %u [0x%llx]: sending vpp listen request...", - listen_sh, listen_vpp_handle); + VDBG (0, "session %u: sending vpp listen request...", listen_sh); /* * Send listen request to vpp and wait for reply */ - vppcom_send_bind_sock (listen_session); + vcl_send_session_listen (wrk, listen_session); rv = vppcom_wait_for_session_state_change (listen_session->session_index, STATE_LISTEN, vcm->cfg.session_timeout); @@ -1219,80 +1507,52 @@ vppcom_session_listen (uint32_t listen_sh, uint32_t q_len) return VPPCOM_OK; } -int -vppcom_session_tls_add_cert (uint32_t session_handle, char *cert, - uint32_t cert_len) -{ - - vcl_worker_t *wrk = vcl_worker_get_current (); - vcl_session_t *session = 0; - - session = vcl_session_get_w_handle (wrk, session_handle); - if (!session) - return VPPCOM_EBADFD; - - if (cert_len == 0 || cert_len == ~0) - return VPPCOM_EBADFD; - - /* - * Send listen request to vpp and wait for reply - */ - vppcom_send_application_tls_cert_add (session, cert, cert_len); - - return VPPCOM_OK; - -} - -int -vppcom_session_tls_add_key (uint32_t session_handle, char *key, - uint32_t key_len) -{ - - vcl_worker_t *wrk = vcl_worker_get_current (); - vcl_session_t *session = 0; - - session = vcl_session_get_w_handle (wrk, session_handle); - if (!session) - return VPPCOM_EBADFD; - - if (key_len == 0 || key_len == ~0) - return VPPCOM_EBADFD; - - /* - * Send listen request to vpp and wait for reply - */ - vppcom_send_application_tls_key_add (session, key, key_len); - - return VPPCOM_OK; - - -} - static int -validate_args_session_accept_ (vcl_worker_t * wrk, - vcl_session_t * listen_session) +validate_args_session_accept_ (vcl_worker_t * wrk, vcl_session_t * ls) { - /* Input validation - expects spinlock on sessions_lockp */ - if (listen_session->is_vep) + if (ls->is_vep) { - clib_warning ("VCL<%d>: ERROR: sid %u: cannot accept on an " - "epoll session!", getpid (), - listen_session->session_index); + VDBG (0, "ERROR: cannot accept on epoll session %u!", + ls->session_index); return VPPCOM_EBADFD; } - if (listen_session->session_state != STATE_LISTEN) + if ((ls->session_state != STATE_LISTEN) + && (!vcl_session_is_connectable_listener (wrk, ls))) { - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "not in listen state! state 0x%x (%s)", getpid (), - listen_session->vpp_handle, listen_session->session_index, - listen_session->session_state, - vppcom_session_state_str (listen_session->session_state)); + VDBG (0, + "ERROR: session [0x%llx]: not in listen state! state 0x%x" + " (%s)", ls->vpp_handle, ls->session_state, + vppcom_session_state_str (ls->session_state)); return VPPCOM_EBADFD; } return VPPCOM_OK; } +int +vppcom_unformat_proto (uint8_t * proto, char *proto_str) +{ + if (!strcmp (proto_str, "TCP")) + *proto = VPPCOM_PROTO_TCP; + else if (!strcmp (proto_str, "tcp")) + *proto = VPPCOM_PROTO_TCP; + else if (!strcmp (proto_str, "UDP")) + *proto = VPPCOM_PROTO_UDP; + else if (!strcmp (proto_str, "udp")) + *proto = VPPCOM_PROTO_UDP; + else if (!strcmp (proto_str, "TLS")) + *proto = VPPCOM_PROTO_TLS; + else if (!strcmp (proto_str, "tls")) + *proto = VPPCOM_PROTO_TLS; + else if (!strcmp (proto_str, "QUIC")) + *proto = VPPCOM_PROTO_QUIC; + else if (!strcmp (proto_str, "quic")) + *proto = VPPCOM_PROTO_QUIC; + else + return 1; + return 0; +} + int vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, uint32_t flags) @@ -1302,9 +1562,7 @@ vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, session_accepted_msg_t accepted_msg; vcl_session_t *listen_session = 0; vcl_session_t *client_session = 0; - svm_msg_q_t *vpp_evt_q; vcl_session_msg_t *evt; - u64 listen_vpp_handle; svm_msg_q_msg_t msg; session_event_t *e; u8 is_nonblocking; @@ -1328,18 +1586,18 @@ vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, is_nonblocking = VCL_SESS_ATTR_TEST (listen_session->attr, VCL_SESS_ATTR_NONBLOCK); - if (svm_msg_q_is_empty (wrk->app_event_queue) && is_nonblocking) - return VPPCOM_EAGAIN; - while (1) { + if (svm_msg_q_is_empty (wrk->app_event_queue) && is_nonblocking) + return VPPCOM_EAGAIN; + if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_WAIT, 0)) return VPPCOM_EAGAIN; e = svm_msg_q_msg_data (wrk->app_event_queue, &msg); if (e->event_type != SESSION_CTRL_EVT_ACCEPTED) { - clib_warning ("discarded event: %u", e->event_type); + vcl_handle_mq_event (wrk, e); svm_msg_q_free_msg (wrk->app_event_queue, &msg); continue; } @@ -1350,20 +1608,22 @@ vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, handle: - client_session_index = vcl_session_accepted_handler (wrk, &accepted_msg); + client_session_index = vcl_session_accepted_handler (wrk, &accepted_msg, + listen_session_index); + if (client_session_index == VCL_INVALID_SESSION_INDEX) + return VPPCOM_ECONNABORTED; + listen_session = vcl_session_get (wrk, listen_session_index); client_session = vcl_session_get (wrk, client_session_index); if (flags & O_NONBLOCK) VCL_SESS_ATTR_SET (client_session->attr, VCL_SESS_ATTR_NONBLOCK); - listen_vpp_handle = listen_session->vpp_handle; - VDBG (1, "vpp handle 0x%llx, sid %u: Got a client request! " - "vpp handle 0x%llx, sid %u, flags %d, is_nonblocking %u", - listen_vpp_handle, listen_session_handle, - client_session->vpp_handle, client_session_index, - flags, VCL_SESS_ATTR_TEST (client_session->attr, - VCL_SESS_ATTR_NONBLOCK)); + VDBG (1, "listener %u [0x%llx]: Got a connect request! session %u [0x%llx]," + " flags %d, is_nonblocking %u", listen_session->session_index, + listen_session->vpp_handle, client_session_index, + client_session->vpp_handle, flags, + VCL_SESS_ATTR_TEST (client_session->attr, VCL_SESS_ATTR_NONBLOCK)); if (ep) { @@ -1377,17 +1637,8 @@ handle: sizeof (ip6_address_t)); } - if (accepted_msg.server_event_queue_address) - vpp_evt_q = uword_to_pointer (accepted_msg.vpp_event_queue_address, - svm_msg_q_t *); - else - vpp_evt_q = client_session->vpp_evt_q; - - vcl_send_session_accepted_reply (vpp_evt_q, client_session->client_context, - client_session->vpp_handle, 0); - VDBG (0, "listener %u [0x%llx] accepted %u [0x%llx] peer: %U:%u " - "local: %U:%u", listen_session_handle, listen_vpp_handle, + "local: %U:%u", listen_session_handle, listen_session->vpp_handle, client_session_index, client_session->vpp_handle, format_ip46_address, &client_session->transport.rmt_ip, client_session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, @@ -1426,9 +1677,8 @@ vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) if (PREDICT_FALSE (session->is_vep)) { - clib_warning ("VCL<%d>: ERROR: sid %u: cannot " - "connect on an epoll session!", getpid (), - session_handle); + VDBG (0, "ERROR: cannot connect epoll session %u!", + session->session_index); return VPPCOM_EBADFD; } @@ -1437,8 +1687,7 @@ vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) VDBG (0, "session handle %u [0x%llx]: session already " "connected to %s %U port %d proto %s, state 0x%x (%s)", session_handle, session->vpp_handle, - session->transport.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, + session->transport.is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &session->transport.rmt_ip, session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, clib_net_to_host_u16 (session->transport.rmt_port), @@ -1447,17 +1696,24 @@ vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) return VPPCOM_OK; } + /* Attempt to connect a connectionless listener */ + if (PREDICT_FALSE (session->session_state & STATE_LISTEN)) + { + if (session->session_type != VPPCOM_PROTO_UDP) + return VPPCOM_EINVAL; + vcl_send_session_unlisten (wrk, session); + session->session_state = STATE_CLOSED; + } + session->transport.is_ip4 = server_ep->is_ip4; - if (session->transport.is_ip4) - clib_memcpy_fast (&session->transport.rmt_ip.ip4, server_ep->ip, - sizeof (ip4_address_t)); - else - clib_memcpy_fast (&session->transport.rmt_ip.ip6, server_ep->ip, - sizeof (ip6_address_t)); + vcl_ip_copy_from_ep (&session->transport.rmt_ip, server_ep); session->transport.rmt_port = server_ep->port; + session->parent_handle = VCL_INVALID_SESSION_HANDLE; + session->flags |= VCL_SESSION_F_CONNECTED; - VDBG (0, "session handle %u [0x%llx]: connecting to server %s %U " - "port %d proto %s", session_handle, session->vpp_handle, + VDBG (0, "session handle %u (%s): connecting to peer %s %U " + "port %d proto %s", session_handle, + vppcom_session_state_str (session->session_state), session->transport.is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &session->transport.rmt_ip, session->transport.is_ip4 ? @@ -1465,33 +1721,87 @@ vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) clib_net_to_host_u16 (session->transport.rmt_port), vppcom_proto_str (session->session_type)); + vcl_send_session_connect (wrk, session); + + if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)) + { + session->session_state = STATE_CONNECT; + return VPPCOM_EINPROGRESS; + } + /* - * Send connect request and wait for reply from vpp + * Wait for reply from vpp if blocking */ - vppcom_send_connect_sock (session); rv = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT, vcm->cfg.session_timeout); session = vcl_session_get (wrk, session_index); + VDBG (0, "session %u [0x%llx]: connect %s!", session->session_index, + session->vpp_handle, rv ? "failed" : "succeeded"); - if (PREDICT_FALSE (rv)) + return rv; +} + +int +vppcom_session_stream_connect (uint32_t session_handle, + uint32_t parent_session_handle) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session, *parent_session; + u32 session_index, parent_session_index; + int rv; + + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + parent_session = vcl_session_get_w_handle (wrk, parent_session_handle); + if (!parent_session) + return VPPCOM_EBADFD; + + session_index = session->session_index; + parent_session_index = parent_session->session_index; + if (PREDICT_FALSE (session->is_vep)) { - if (VPPCOM_DEBUG > 0) - { - if (session) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connect " - "failed! returning %d (%s)", getpid (), - session->vpp_handle, session_handle, rv, - vppcom_retval_str (rv)); - else - clib_warning ("VCL<%d>: no session for sid %u: connect failed! " - "returning %d (%s)", getpid (), - session_handle, rv, vppcom_retval_str (rv)); - } + VDBG (0, "ERROR: cannot connect epoll session %u!", + session->session_index); + return VPPCOM_EBADFD; } - else - VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: connected!", - getpid (), session->vpp_handle, session_handle); + + if (PREDICT_FALSE (session->session_state & CLIENT_STATE_OPEN)) + { + VDBG (0, "session handle %u [0x%llx]: session already " + "connected to session %u [0x%llx] proto %s, state 0x%x (%s)", + session_handle, session->vpp_handle, + parent_session_handle, parent_session->vpp_handle, + vppcom_proto_str (session->session_type), session->session_state, + vppcom_session_state_str (session->session_state)); + return VPPCOM_OK; + } + + /* Connect to quic session specifics */ + session->transport.is_ip4 = parent_session->transport.is_ip4; + session->transport.rmt_ip.ip4.as_u32 = (uint32_t) 1; + session->transport.rmt_port = 0; + session->parent_handle = parent_session->vpp_handle; + + VDBG (0, "session handle %u: connecting to session %u [0x%llx]", + session_handle, parent_session_handle, parent_session->vpp_handle); + + /* + * Send connect request and wait for reply from vpp + */ + vcl_send_session_connect (wrk, session); + rv = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT, + vcm->cfg.session_timeout); + + session->listener_index = parent_session_index; + parent_session = vcl_session_get_w_handle (wrk, parent_session_handle); + if (parent_session) + parent_session->n_accepted_sessions++; + + session = vcl_session_get (wrk, session_index); + VDBG (0, "session %u [0x%llx]: connect %s!", session->session_index, + session->vpp_handle, rv ? "failed" : "succeeded"); return rv; } @@ -1499,19 +1809,7 @@ vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) static u8 vcl_is_rx_evt_for_session (session_event_t * e, u32 sid, u8 is_ct) { - if (!is_ct) - return (e->event_type == FIFO_EVENT_APP_RX - && e->fifo->client_session_index == sid); - else - return (e->event_type == SESSION_IO_EVT_CT_TX); -} - -static inline u8 -vcl_session_is_readable (vcl_session_t * s) -{ - return ((s->session_state & STATE_OPEN) - || (s->session_state == STATE_LISTEN - && s->session_type == VPPCOM_PROTO_UDP)); + return (e->event_type == SESSION_IO_EVT_RX && e->session_index == sid); } static inline int @@ -1519,7 +1817,7 @@ vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, u8 peek) { vcl_worker_t *wrk = vcl_worker_get_current (); - int n_read = 0, rv, is_nonblocking; + int rv, n_read = 0, is_nonblocking; vcl_session_t *s = 0; svm_fifo_t *rx_fifo; svm_msg_q_msg_t msg; @@ -1534,33 +1832,35 @@ vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, if (PREDICT_FALSE (!s || s->is_vep)) return VPPCOM_EBADFD; - if (PREDICT_FALSE (!vcl_session_is_readable (s))) + if (PREDICT_FALSE (!vcl_session_is_open (s))) { - session_state_t state = s->session_state; - rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - - VDBG (0, "session handle %u[0x%llx] is not open! state 0x%x (%s)," - " returning %d (%s)", session_handle, s->vpp_handle, state, - vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); - return rv; + VDBG (0, "session %u[0x%llx] is not open! state 0x%x (%s)", + s->session_index, s->vpp_handle, s->session_state, + vppcom_session_state_str (s->session_state)); + return vcl_session_closed_error (s); } is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); is_ct = vcl_session_is_ct (s); - mq = is_ct ? s->our_evt_q : wrk->app_event_queue; - rx_fifo = s->rx_fifo; + mq = wrk->app_event_queue; + rx_fifo = is_ct ? s->ct_rx_fifo : s->rx_fifo; s->has_rx_evt = 0; - if (svm_fifo_is_empty (rx_fifo)) + if (svm_fifo_is_empty_cons (rx_fifo)) { if (is_nonblocking) { - svm_fifo_unset_event (rx_fifo); + if (vcl_session_is_closing (s)) + return vcl_session_closing_error (s); + svm_fifo_unset_event (s->rx_fifo); return VPPCOM_EWOULDBLOCK; } - while (svm_fifo_is_empty (rx_fifo)) + while (svm_fifo_is_empty_cons (rx_fifo)) { - svm_fifo_unset_event (rx_fifo); + if (vcl_session_is_closing (s)) + return vcl_session_closing_error (s); + + svm_fifo_unset_event (s->rx_fifo); svm_msg_q_lock (mq); if (svm_msg_q_is_empty (mq)) svm_msg_q_wait (mq); @@ -1571,29 +1871,48 @@ vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, if (!vcl_is_rx_evt_for_session (e, s->session_index, is_ct)) vcl_handle_mq_event (wrk, e); svm_msg_q_free_msg (mq, &msg); - - if (PREDICT_FALSE (s->session_state == STATE_DISCONNECT)) - return VPPCOM_ECONNRESET; } } +read_again: + if (s->is_dgram) - n_read = app_recv_dgram_raw (rx_fifo, buf, n, &s->transport, 0, peek); + rv = app_recv_dgram_raw (rx_fifo, buf, n, &s->transport, 0, peek); else - n_read = app_recv_stream_raw (rx_fifo, buf, n, 0, peek); + rv = app_recv_stream_raw (rx_fifo, buf, n, 0, peek); - if (svm_fifo_is_empty (rx_fifo)) - svm_fifo_unset_event (rx_fifo); + ASSERT (rv >= 0); + n_read += rv; - if (is_ct && svm_fifo_needs_tx_ntf (rx_fifo, n_read)) + if (svm_fifo_is_empty_cons (rx_fifo)) { - svm_fifo_clear_tx_ntf (s->rx_fifo); - app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo, SESSION_IO_EVT_CT_RX, - SVM_Q_WAIT); + svm_fifo_unset_event (s->rx_fifo); + if (!svm_fifo_is_empty_cons (rx_fifo) + && svm_fifo_set_event (s->rx_fifo) && is_nonblocking) + { + vec_add2 (wrk->unhandled_evts_vector, e, 1); + e->event_type = SESSION_IO_EVT_RX; + e->session_index = s->session_index; + } + } + else if (PREDICT_FALSE (rv < n)) + { + /* More data enqueued while reading. Try to drain it + * or fill the buffer */ + buf += rv; + n -= rv; + goto read_again; + } + + if (PREDICT_FALSE (svm_fifo_needs_deq_ntf (rx_fifo, n_read))) + { + svm_fifo_clear_deq_ntf (rx_fifo); + app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo->master_session_index, + SESSION_IO_EVT_RX, SVM_Q_WAIT); } - VDBG (2, "vpp handle 0x%llx, sid %u: read %d bytes from (%p)", - s->vpp_handle, session_handle, n_read, rx_fifo); + VDBG (2, "session %u[0x%llx]: read %d bytes from (%p)", s->session_index, + s->vpp_handle, n_read, rx_fifo); return n_read; } @@ -1615,7 +1934,7 @@ vppcom_session_read_segments (uint32_t session_handle, vppcom_data_segments_t ds) { vcl_worker_t *wrk = vcl_worker_get_current (); - int n_read = 0, rv, is_nonblocking; + int n_read = 0, is_nonblocking; vcl_session_t *s = 0; svm_fifo_t *rx_fifo; svm_msg_q_msg_t msg; @@ -1627,12 +1946,8 @@ vppcom_session_read_segments (uint32_t session_handle, if (PREDICT_FALSE (!s || s->is_vep)) return VPPCOM_EBADFD; - if (PREDICT_FALSE (!vcl_session_is_readable (s))) - { - session_state_t state = s->session_state; - rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - return rv; - } + if (PREDICT_FALSE (!vcl_session_is_open (s))) + return vcl_session_closed_error (s); is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); is_ct = vcl_session_is_ct (s); @@ -1640,15 +1955,21 @@ vppcom_session_read_segments (uint32_t session_handle, rx_fifo = s->rx_fifo; s->has_rx_evt = 0; - if (svm_fifo_is_empty (rx_fifo)) + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + + if (svm_fifo_is_empty_cons (rx_fifo)) { if (is_nonblocking) { svm_fifo_unset_event (rx_fifo); return VPPCOM_EWOULDBLOCK; } - while (svm_fifo_is_empty (rx_fifo)) + while (svm_fifo_is_empty_cons (rx_fifo)) { + if (vcl_session_is_closing (s)) + return vcl_session_closing_error (s); + svm_fifo_unset_event (rx_fifo); svm_msg_q_lock (mq); if (svm_msg_q_is_empty (mq)) @@ -1660,23 +1981,12 @@ vppcom_session_read_segments (uint32_t session_handle, if (!vcl_is_rx_evt_for_session (e, s->session_index, is_ct)) vcl_handle_mq_event (wrk, e); svm_msg_q_free_msg (mq, &msg); - - if (PREDICT_FALSE (s->session_state == STATE_DISCONNECT)) - return VPPCOM_ECONNRESET; } } - n_read = svm_fifo_segments (rx_fifo, (svm_fifo_segment_t *) ds); + n_read = svm_fifo_segments (rx_fifo, (svm_fifo_seg_t *) ds); svm_fifo_unset_event (rx_fifo); - if (is_ct && n_read + svm_fifo_max_dequeue (rx_fifo) == rx_fifo->nitems) - { - /* If the peer is not polling send notification */ - if (!svm_fifo_has_event (s->rx_fifo)) - app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo, - SESSION_IO_EVT_CT_RX, SVM_Q_WAIT); - } - return n_read; } @@ -1691,38 +2001,7 @@ vppcom_session_free_segments (uint32_t session_handle, if (PREDICT_FALSE (!s || s->is_vep)) return; - svm_fifo_segments_free (s->rx_fifo, (svm_fifo_segment_t *) ds); -} - -static inline int -vppcom_session_read_ready (vcl_session_t * session) -{ - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - if (PREDICT_FALSE (session->is_vep)) - { - clib_warning ("VCL<%d>: ERROR: sid %u: cannot read from an " - "epoll session!", getpid (), session->session_index); - return VPPCOM_EBADFD; - } - - if (PREDICT_FALSE (!(session->session_state & (STATE_OPEN | STATE_LISTEN)))) - { - session_state_t state = session->session_state; - int rv; - - rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session is not open!" - " state 0x%x (%s), returning %d (%s)", getpid (), - session->vpp_handle, session->session_index, state, - vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); - return rv; - } - - if (session->session_state & STATE_LISTEN) - return clib_fifo_elts (session->accept_evts_fifo); - - return svm_fifo_max_dequeue (session->rx_fifo); + svm_fifo_segments_free (s->rx_fifo, (svm_fifo_seg_t *) ds); } int @@ -1741,66 +2020,65 @@ vppcom_data_segment_copy (void *buf, vppcom_data_segments_t ds, u32 max_bytes) static u8 vcl_is_tx_evt_for_session (session_event_t * e, u32 sid, u8 is_ct) { - if (!is_ct) - return (e->event_type == FIFO_EVENT_APP_TX - && e->fifo->client_session_index == sid); + return (e->event_type == SESSION_IO_EVT_TX && e->session_index == sid); +} + +always_inline u8 +vcl_fifo_is_writeable (svm_fifo_t * f, u32 len, u8 is_dgram) +{ + u32 max_enq = svm_fifo_max_enqueue_prod (f); + if (is_dgram) + return max_enq >= (sizeof (session_dgram_hdr_t) + len); else - return (e->event_type == SESSION_IO_EVT_CT_RX); + return max_enq > 0; } -static inline int -vppcom_session_write_inline (uint32_t session_handle, void *buf, size_t n, - u8 is_flush) +always_inline int +vppcom_session_write_inline (vcl_worker_t * wrk, vcl_session_t * s, void *buf, + size_t n, u8 is_flush, u8 is_dgram) { - vcl_worker_t *wrk = vcl_worker_get_current (); - int rv, n_write, is_nonblocking; - vcl_session_t *s = 0; - svm_fifo_t *tx_fifo = 0; + int n_write, is_nonblocking; session_evt_type_t et; svm_msg_q_msg_t msg; + svm_fifo_t *tx_fifo; session_event_t *e; svm_msg_q_t *mq; u8 is_ct; - if (PREDICT_FALSE (!buf)) + if (PREDICT_FALSE (!buf || n == 0)) return VPPCOM_EINVAL; - s = vcl_session_get_w_handle (wrk, session_handle); - if (PREDICT_FALSE (!s)) - return VPPCOM_EBADFD; - if (PREDICT_FALSE (s->is_vep)) { - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "cannot write to an epoll session!", - getpid (), s->vpp_handle, session_handle); - + VDBG (0, "ERROR: session %u [0x%llx]: cannot write to an epoll" + " session!", s->session_index, s->vpp_handle); return VPPCOM_EBADFD; } - if (PREDICT_FALSE (!(s->session_state & STATE_OPEN))) + if (PREDICT_FALSE (!vcl_session_is_open (s))) { - session_state_t state = s->session_state; - rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session is not open! " - "state 0x%x (%s)", getpid (), s->vpp_handle, session_handle, - state, vppcom_session_state_str (state)); - return rv; + VDBG (1, "session %u [0x%llx]: is not open! state 0x%x (%s)", + s->session_index, s->vpp_handle, s->session_state, + vppcom_session_state_str (s->session_state)); + return vcl_session_closed_error (s);; } - tx_fifo = s->tx_fifo; is_ct = vcl_session_is_ct (s); + tx_fifo = is_ct ? s->ct_tx_fifo : s->tx_fifo; is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); - mq = is_ct ? s->our_evt_q : wrk->app_event_queue; - if (svm_fifo_is_full (tx_fifo)) + + mq = wrk->app_event_queue; + if (!vcl_fifo_is_writeable (tx_fifo, n, is_dgram)) { if (is_nonblocking) { return VPPCOM_EWOULDBLOCK; } - while (svm_fifo_is_full (tx_fifo)) + while (!vcl_fifo_is_writeable (tx_fifo, n, is_dgram)) { - svm_fifo_add_want_tx_ntf (tx_fifo, SVM_FIFO_WANT_TX_NOTIF); + svm_fifo_add_want_deq_ntf (tx_fifo, SVM_FIFO_WANT_DEQ_NOTIF); + if (vcl_session_is_closing (s)) + return vcl_session_closing_error (s); svm_msg_q_lock (mq); if (svm_msg_q_is_empty (mq)) svm_msg_q_wait (mq); @@ -1812,28 +2090,31 @@ vppcom_session_write_inline (uint32_t session_handle, void *buf, size_t n, if (!vcl_is_tx_evt_for_session (e, s->session_index, is_ct)) vcl_handle_mq_event (wrk, e); svm_msg_q_free_msg (mq, &msg); - - if (PREDICT_FALSE (!(s->session_state & STATE_OPEN))) - return VPPCOM_ECONNRESET; } } - ASSERT (FIFO_EVENT_APP_TX + 1 == SESSION_IO_EVT_CT_TX); - et = FIFO_EVENT_APP_TX + vcl_session_is_ct (s); - if (is_flush && !vcl_session_is_ct (s)) + et = SESSION_IO_EVT_TX; + if (is_flush && !is_ct) et = SESSION_IO_EVT_TX_FLUSH; - if (s->is_dgram) + if (is_dgram) n_write = app_send_dgram_raw (tx_fifo, &s->transport, - s->vpp_evt_q, buf, n, et, SVM_Q_WAIT); + s->vpp_evt_q, buf, n, et, + 0 /* do_evt */ , SVM_Q_WAIT); else n_write = app_send_stream_raw (tx_fifo, s->vpp_evt_q, buf, n, et, - SVM_Q_WAIT); + 0 /* do_evt */ , SVM_Q_WAIT); + + if (svm_fifo_set_event (s->tx_fifo)) + app_send_io_evt_to_vpp (s->vpp_evt_q, s->tx_fifo->master_session_index, + et, SVM_Q_WAIT); - ASSERT (n_write > 0); + /* The underlying fifo segment can run out of memory */ + if (PREDICT_FALSE (n_write < 0)) + return VPPCOM_EAGAIN; - VDBG (2, "VCL<%d>: vpp handle 0x%llx, sid %u: wrote %d bytes", getpid (), - s->vpp_handle, session_handle, n_write); + VDBG (2, "session %u [0x%llx]: wrote %d bytes", s->session_index, + s->vpp_handle, n_write); return n_write; } @@ -1841,85 +2122,49 @@ vppcom_session_write_inline (uint32_t session_handle, void *buf, size_t n, int vppcom_session_write (uint32_t session_handle, void *buf, size_t n) { - return vppcom_session_write_inline (session_handle, buf, n, - 0 /* is_flush */ ); + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s)) + return VPPCOM_EBADFD; + + return vppcom_session_write_inline (wrk, s, buf, n, + 0 /* is_flush */ , s->is_dgram ? 1 : 0); } int vppcom_session_write_msg (uint32_t session_handle, void *buf, size_t n) { - return vppcom_session_write_inline (session_handle, buf, n, - 1 /* is_flush */ ); -} - - -static vcl_session_t * -vcl_ct_session_get_from_fifo (vcl_worker_t * wrk, svm_fifo_t * f, u8 type) -{ + vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *s; - s = vcl_session_get (wrk, f->client_session_index); - if (s) - { - /* rx fifo */ - if (type == 0 && s->rx_fifo == f) - return s; - /* tx fifo */ - if (type == 1 && s->tx_fifo == f) - return s; - } - s = vcl_session_get (wrk, f->master_session_index); - if (s) - { - if (type == 0 && s->rx_fifo == f) - return s; - if (type == 1 && s->tx_fifo == f) - return s; - } - return 0; -} - -static inline int -vppcom_session_write_ready (vcl_session_t * session) -{ - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - if (PREDICT_FALSE (session->is_vep)) - { - VDBG (0, "session %u [0x%llx]: cannot write to an epoll session!", - session->session_index, session->vpp_handle); - return VPPCOM_EBADFD; - } - if (PREDICT_FALSE (session->session_state & STATE_LISTEN)) - { - if (session->tx_fifo) - return svm_fifo_max_enqueue (session->tx_fifo); - else - return VPPCOM_EBADFD; - } - - if (PREDICT_FALSE (!(session->session_state & STATE_OPEN))) - { - session_state_t state = session->session_state; - int rv; - - rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - VDBG (0, "session %u [0x%llx]: session is not open! state 0x%x (%s), " - "returning %d (%s)", session->session_index, session->vpp_handle, - state, vppcom_session_state_str (state), rv, - vppcom_retval_str (rv)); - return rv; - } - - return svm_fifo_max_enqueue (session->tx_fifo); -} + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s)) + return VPPCOM_EBADFD; -#define vcl_fifo_rx_evt_valid_or_break(_fifo) \ -if (PREDICT_FALSE (svm_fifo_is_empty (_fifo))) \ - { \ - svm_fifo_unset_event (_fifo); \ - if (svm_fifo_is_empty (_fifo)) \ - break; \ - } \ + return vppcom_session_write_inline (wrk, s, buf, n, + 1 /* is_flush */ , s->is_dgram ? 1 : 0); +} + +#define vcl_fifo_rx_evt_valid_or_break(_s) \ +if (PREDICT_FALSE (!_s->rx_fifo)) \ + break; \ +if (PREDICT_FALSE (svm_fifo_is_empty (_s->rx_fifo))) \ + { \ + if (!vcl_session_is_ct (_s)) \ + { \ + svm_fifo_unset_event (_s->rx_fifo); \ + if (svm_fifo_is_empty (_s->rx_fifo)) \ + break; \ + } \ + else if (svm_fifo_is_empty (_s->ct_rx_fifo)) \ + { \ + svm_fifo_unset_event (_s->rx_fifo); /* rx evts on actual fifo*/ \ + if (svm_fifo_is_empty (_s->ct_rx_fifo)) \ + break; \ + } \ + } \ static void vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, @@ -1934,22 +2179,22 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, switch (e->event_type) { - case FIFO_EVENT_APP_RX: - vcl_fifo_rx_evt_valid_or_break (e->fifo); - sid = e->fifo->client_session_index; + case SESSION_IO_EVT_RX: + sid = e->session_index; session = vcl_session_get (wrk, sid); - if (!session) + if (!session || !vcl_session_is_open (session)) break; + vcl_fifo_rx_evt_valid_or_break (session); if (sid < n_bits && read_map) { clib_bitmap_set_no_check ((uword *) read_map, sid, 1); *bits_set += 1; } break; - case FIFO_EVENT_APP_TX: - sid = e->fifo->client_session_index; + case SESSION_IO_EVT_TX: + sid = e->session_index; session = vcl_session_get (wrk, sid); - if (!session) + if (!session || !vcl_session_is_open (session)) break; if (sid < n_bits && write_map) { @@ -1957,9 +2202,9 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, *bits_set += 1; } break; - case SESSION_IO_EVT_CT_TX: - vcl_fifo_rx_evt_valid_or_break (e->fifo); - session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 0); + case SESSION_CTRL_EVT_ACCEPTED: + session = vcl_session_accepted (wrk, + (session_accepted_msg_t *) e->data); if (!session) break; sid = session->session_index; @@ -1969,33 +2214,17 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, *bits_set += 1; } break; - case SESSION_IO_EVT_CT_RX: - session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 1); - if (!session) + case SESSION_CTRL_EVT_CONNECTED: + connected_msg = (session_connected_msg_t *) e->data; + sid = vcl_session_connected_handler (wrk, connected_msg); + if (sid == VCL_INVALID_SESSION_INDEX) break; - sid = session->session_index; if (sid < n_bits && write_map) { clib_bitmap_set_no_check ((uword *) write_map, sid, 1); *bits_set += 1; } break; - case SESSION_CTRL_EVT_ACCEPTED: - session = vcl_session_accepted (wrk, - (session_accepted_msg_t *) e->data); - if (!session) - break; - sid = session->session_index; - if (sid < n_bits && read_map) - { - clib_bitmap_set_no_check ((uword *) read_map, sid, 1); - *bits_set += 1; - } - break; - case SESSION_CTRL_EVT_CONNECTED: - connected_msg = (session_connected_msg_t *) e->data; - vcl_session_connected_handler (wrk, connected_msg); - break; case SESSION_CTRL_EVT_DISCONNECTED: disconnected_msg = (session_disconnected_msg_t *) e->data; session = vcl_session_disconnected_handler (wrk, disconnected_msg); @@ -2016,12 +2245,30 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, *bits_set += 1; } break; + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + vcl_session_unlisten_reply_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_MIGRATED: + vcl_session_migrated_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_CLEANUP: + vcl_session_cleanup_handler (wrk, e->data); + break; case SESSION_CTRL_EVT_WORKER_UPDATE_REPLY: vcl_session_worker_update_reply_handler (wrk, e->data); break; case SESSION_CTRL_EVT_REQ_WORKER_UPDATE: vcl_session_req_worker_update_handler (wrk, e->data); break; + case SESSION_CTRL_EVT_APP_ADD_SEGMENT: + vcl_session_app_add_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_DEL_SEGMENT: + vcl_session_app_del_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_WRK_RPC: + vcl_worker_rpc_handler (wrk, e->data); + break; default: clib_warning ("unhandled: %u", e->event_type); break; @@ -2065,7 +2312,7 @@ vcl_select_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, } } } - vcl_mq_dequeue_batch (wrk, mq); + vcl_mq_dequeue_batch (wrk, mq, ~0); svm_msg_q_unlock (mq); for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) @@ -2087,29 +2334,26 @@ vppcom_select_condvar (vcl_worker_t * wrk, int n_bits, vcl_si_set * except_map, double time_to_wait, u32 * bits_set) { - double total_wait = 0, wait_slice; - vcl_cut_through_registration_t *cr; + double wait = 0, start = 0; - time_to_wait = (time_to_wait == -1) ? 1e6 : time_to_wait; - wait_slice = wrk->cut_through_registrations ? 10e-6 : time_to_wait; - do + if (!*bits_set) { - vcl_ct_registration_lock (wrk); - /* *INDENT-OFF* */ - pool_foreach (cr, wrk->cut_through_registrations, ({ - vcl_select_handle_mq (wrk, cr->mq, n_bits, read_map, write_map, except_map, - 0, bits_set); - })); - /* *INDENT-ON* */ - vcl_ct_registration_unlock (wrk); + wait = time_to_wait; + start = clib_time_now (&wrk->clib_time); + } + do + { vcl_select_handle_mq (wrk, wrk->app_event_queue, n_bits, read_map, - write_map, except_map, wait_slice, bits_set); - total_wait += wait_slice; + write_map, except_map, wait, bits_set); if (*bits_set) return *bits_set; + if (wait == -1) + continue; + + wait = wait - (clib_time_now (&wrk->clib_time) - start); } - while (total_wait < time_to_wait); + while (wait > 0); return 0; } @@ -2146,7 +2390,7 @@ vppcom_select (int n_bits, vcl_si_set * read_map, vcl_si_set * write_map, u32 sid, minbits = clib_max (n_bits, BITS (uword)), bits_set = 0; vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *session = 0; - int rv, i; + int i; if (n_bits && read_map) { @@ -2180,19 +2424,18 @@ vppcom_select (int n_bits, vcl_si_set * read_map, vcl_si_set * write_map, clib_bitmap_foreach (sid, wrk->wr_bitmap, ({ if (!(session = vcl_session_get (wrk, sid))) { - if (except_map && sid < minbits) - clib_bitmap_set_no_check (except_map, sid, 1); - continue; + clib_bitmap_set_no_check ((uword*)write_map, sid, 1); + bits_set++; + continue; } - rv = svm_fifo_is_full (session->tx_fifo); - if (!rv) + if (vcl_session_write_ready (session)) { clib_bitmap_set_no_check ((uword*)write_map, sid, 1); bits_set++; } else - svm_fifo_add_want_tx_ntf (session->tx_fifo, SVM_FIFO_WANT_TX_NOTIF); + svm_fifo_add_want_deq_ntf (session->tx_fifo, SVM_FIFO_WANT_DEQ_NOTIF); })); check_rd: @@ -2202,13 +2445,12 @@ check_rd: clib_bitmap_foreach (sid, wrk->rd_bitmap, ({ if (!(session = vcl_session_get (wrk, sid))) { - if (except_map && sid < minbits) - clib_bitmap_set_no_check (except_map, sid, 1); - continue; + clib_bitmap_set_no_check ((uword*)read_map, sid, 1); + bits_set++; + continue; } - rv = vppcom_session_read_ready (session); - if (rv) + if (vcl_session_read_ready (session)) { clib_bitmap_set_no_check ((uword*)read_map, sid, 1); bits_set++; @@ -2236,85 +2478,75 @@ check_mq: } static inline void -vep_verify_epoll_chain (vcl_worker_t * wrk, u32 vep_idx) +vep_verify_epoll_chain (vcl_worker_t * wrk, u32 vep_handle) { vcl_session_t *session; vppcom_epoll_t *vep; - u32 sid = vep_idx; + u32 sh = vep_handle; - if (VPPCOM_DEBUG <= 1) + if (VPPCOM_DEBUG <= 2) return; - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - session = vcl_session_get (wrk, vep_idx); + session = vcl_session_get_w_handle (wrk, vep_handle); if (PREDICT_FALSE (!session)) { - clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", - getpid (), vep_idx); + VDBG (0, "ERROR: Invalid vep_sh (%u)!", vep_handle); goto done; } if (PREDICT_FALSE (!session->is_vep)) { - clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", - getpid (), vep_idx); + VDBG (0, "ERROR: vep_sh (%u) is not a vep!", vep_handle); goto done; } vep = &session->vep; - clib_warning ("VCL<%d>: vep_idx (%u): Dumping epoll chain\n" - "{\n" - " is_vep = %u\n" - " is_vep_session = %u\n" - " next_sid = 0x%x (%u)\n" - " wait_cont_idx = 0x%x (%u)\n" - "}\n", getpid (), vep_idx, - session->is_vep, session->is_vep_session, - vep->next_sh, vep->next_sh, - session->wait_cont_idx, session->wait_cont_idx); + VDBG (0, "vep_sh (%u): Dumping epoll chain\n" + "{\n" + " is_vep = %u\n" + " is_vep_session = %u\n" + " next_sh = 0x%x (%u)\n" + "}\n", vep_handle, session->is_vep, session->is_vep_session, + vep->next_sh, vep->next_sh); - for (sid = vep->next_sh; sid != ~0; sid = vep->next_sh) + for (sh = vep->next_sh; sh != ~0; sh = vep->next_sh) { - session = vcl_session_get (wrk, sid); + session = vcl_session_get_w_handle (wrk, sh); if (PREDICT_FALSE (!session)) { - clib_warning ("VCL<%d>: ERROR: Invalid sid (%u)!", getpid (), sid); + VDBG (0, "ERROR: Invalid sh (%u)!", sh); goto done; } if (PREDICT_FALSE (session->is_vep)) - clib_warning ("VCL<%d>: ERROR: sid (%u) is a vep!", - getpid (), vep_idx); + { + VDBG (0, "ERROR: sh (%u) is a vep!", vep_handle); + } else if (PREDICT_FALSE (!session->is_vep_session)) { - clib_warning ("VCL<%d>: ERROR: session (%u) " - "is not a vep session!", getpid (), sid); + VDBG (0, "ERROR: sh (%u) is not a vep session handle!", sh); goto done; } vep = &session->vep; - if (PREDICT_FALSE (vep->vep_sh != vep_idx)) - clib_warning ("VCL<%d>: ERROR: session (%u) vep_idx (%u) != " - "vep_idx (%u)!", getpid (), - sid, session->vep.vep_sh, vep_idx); + if (PREDICT_FALSE (vep->vep_sh != vep_handle)) + VDBG (0, "ERROR: session (%u) vep_sh (%u) != vep_sh (%u)!", + sh, session->vep.vep_sh, vep_handle); if (session->is_vep_session) { - clib_warning ("vep_idx[%u]: sid 0x%x (%u)\n" - "{\n" - " next_sid = 0x%x (%u)\n" - " prev_sid = 0x%x (%u)\n" - " vep_idx = 0x%x (%u)\n" - " ev.events = 0x%x\n" - " ev.data.u64 = 0x%llx\n" - " et_mask = 0x%x\n" - "}\n", - vep_idx, sid, sid, - vep->next_sh, vep->next_sh, - vep->prev_sh, vep->prev_sh, - vep->vep_sh, vep->vep_sh, - vep->ev.events, vep->ev.data.u64, vep->et_mask); + VDBG (0, "vep_sh[%u]: sh 0x%x (%u)\n" + "{\n" + " next_sh = 0x%x (%u)\n" + " prev_sh = 0x%x (%u)\n" + " vep_sh = 0x%x (%u)\n" + " ev.events = 0x%x\n" + " ev.data.u64 = 0x%llx\n" + " et_mask = 0x%x\n" + "}\n", + vep_handle, sh, sh, vep->next_sh, vep->next_sh, vep->prev_sh, + vep->prev_sh, vep->vep_sh, vep->vep_sh, vep->ev.events, + vep->ev.data.u64, vep->et_mask); } } done: - clib_warning ("VCL<%d>: vep_idx (%u): Dump complete!\n", - getpid (), vep_idx); + VDBG (0, "vep_sh (%u): Dump complete!\n", vep_handle); } int @@ -2329,7 +2561,6 @@ vppcom_epoll_create (void) vep_session->vep.vep_sh = ~0; vep_session->vep.next_sh = ~0; vep_session->vep.prev_sh = ~0; - vep_session->wait_cont_idx = ~0; vep_session->vpp_handle = ~0; vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_session->session_index); @@ -2344,8 +2575,9 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, { vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *vep_session; - vcl_session_t *session; int rv = VPPCOM_OK; + vcl_session_t *s; + svm_fifo_t *txf; if (vep_handle == session_handle) { @@ -2368,13 +2600,13 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, ASSERT (vep_session->vep.vep_sh == ~0); ASSERT (vep_session->vep.prev_sh == ~0); - session = vcl_session_get_w_handle (wrk, session_handle); - if (PREDICT_FALSE (!session)) + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s)) { VDBG (0, "Invalid session_handle (%u)!", session_handle); return VPPCOM_EBADFD; } - if (PREDICT_FALSE (session->is_vep)) + if (PREDICT_FALSE (s->is_vep)) { VDBG (0, "session_handle (%u) is a vep!", vep_handle); return VPPCOM_EINVAL; @@ -2395,29 +2627,45 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, vep_session->vep.next_sh); if (PREDICT_FALSE (!next_session)) { - VDBG (0, "EPOLL_CTL_ADD: Invalid vep.next_sid (%u) on " + VDBG (0, "EPOLL_CTL_ADD: Invalid vep.next_sh (%u) on " "vep_idx (%u)!", vep_session->vep.next_sh, vep_handle); return VPPCOM_EBADFD; } ASSERT (next_session->vep.prev_sh == vep_handle); next_session->vep.prev_sh = session_handle; } - session->vep.next_sh = vep_session->vep.next_sh; - session->vep.prev_sh = vep_handle; - session->vep.vep_sh = vep_handle; - session->vep.et_mask = VEP_DEFAULT_ET_MASK; - session->vep.ev = *event; - session->is_vep = 0; - session->is_vep_session = 1; + s->vep.next_sh = vep_session->vep.next_sh; + s->vep.prev_sh = vep_handle; + s->vep.vep_sh = vep_handle; + s->vep.et_mask = VEP_DEFAULT_ET_MASK; + s->vep.ev = *event; + s->is_vep = 0; + s->is_vep_session = 1; vep_session->vep.next_sh = session_handle; - if (session->tx_fifo) - svm_fifo_add_want_tx_ntf (session->tx_fifo, - SVM_FIFO_WANT_TX_NOTIF_IF_FULL); + txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + if (txf && (event->events & EPOLLOUT)) + svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + /* Generate EPOLLOUT if tx fifo not full */ + if ((event->events & EPOLLOUT) && (vcl_session_write_ready (s) > 0)) + { + session_event_t e = { 0 }; + e.event_type = SESSION_IO_EVT_TX; + e.session_index = s->session_index; + vec_add1 (wrk->unhandled_evts_vector, e); + } + /* Generate EPOLLIN if rx fifo has data */ + if ((event->events & EPOLLIN) && (vcl_session_read_ready (s) > 0)) + { + session_event_t e = { 0 }; + e.event_type = SESSION_IO_EVT_RX; + e.session_index = s->session_index; + vec_add1 (wrk->unhandled_evts_vector, e); + } VDBG (1, "EPOLL_CTL_ADD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!", vep_handle, session_handle, event->events, event->data.u64); - vcl_evt (VCL_EVT_EPOLL_CTLADD, session, event->events, event->data.u64); + vcl_evt (VCL_EVT_EPOLL_CTLADD, s, event->events, event->data.u64); break; case EPOLL_CTL_MOD: @@ -2427,86 +2675,97 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, rv = VPPCOM_EINVAL; goto done; } - else if (PREDICT_FALSE (!session->is_vep_session)) + else if (PREDICT_FALSE (!s->is_vep_session)) { - VDBG (0, "sid %u EPOLL_CTL_MOD: not a vep session!", - session_handle); + VDBG (0, "sh %u EPOLL_CTL_MOD: not a vep session!", session_handle); rv = VPPCOM_EINVAL; goto done; } - else if (PREDICT_FALSE (session->vep.vep_sh != vep_handle)) + else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle)) { VDBG (0, "EPOLL_CTL_MOD: sh %u vep_sh (%u) != vep_sh (%u)!", - session_handle, session->vep.vep_sh, vep_handle); + session_handle, s->vep.vep_sh, vep_handle); rv = VPPCOM_EINVAL; goto done; } - session->vep.et_mask = VEP_DEFAULT_ET_MASK; - session->vep.ev = *event; + + /* Generate EPOLLOUT when tx_fifo/ct_tx_fifo not full */ + if ((event->events & EPOLLOUT) && + !(s->vep.ev.events & EPOLLOUT) && (vcl_session_write_ready (s) > 0)) + { + session_event_t e = { 0 }; + e.event_type = SESSION_IO_EVT_TX; + e.session_index = s->session_index; + vec_add1 (wrk->unhandled_evts_vector, e); + } + s->vep.et_mask = VEP_DEFAULT_ET_MASK; + s->vep.ev = *event; + txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + if (event->events & EPOLLOUT) + svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + else + svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); VDBG (1, "EPOLL_CTL_MOD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!", vep_handle, session_handle, event->events, event->data.u64); break; case EPOLL_CTL_DEL: - if (PREDICT_FALSE (!session->is_vep_session)) + if (PREDICT_FALSE (!s->is_vep_session)) { VDBG (0, "EPOLL_CTL_DEL: %u not a vep session!", session_handle); rv = VPPCOM_EINVAL; goto done; } - else if (PREDICT_FALSE (session->vep.vep_sh != vep_handle)) + else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle)) { VDBG (0, "EPOLL_CTL_DEL: sh %u vep_sh (%u) != vep_sh (%u)!", - session_handle, session->vep.vep_sh, vep_handle); + session_handle, s->vep.vep_sh, vep_handle); rv = VPPCOM_EINVAL; goto done; } - vep_session->wait_cont_idx = - (vep_session->wait_cont_idx == session_handle) ? - session->vep.next_sh : vep_session->wait_cont_idx; - - if (session->vep.prev_sh == vep_handle) - vep_session->vep.next_sh = session->vep.next_sh; + if (s->vep.prev_sh == vep_handle) + vep_session->vep.next_sh = s->vep.next_sh; else { vcl_session_t *prev_session; - prev_session = vcl_session_get_w_handle (wrk, session->vep.prev_sh); + prev_session = vcl_session_get_w_handle (wrk, s->vep.prev_sh); if (PREDICT_FALSE (!prev_session)) { - VDBG (0, "EPOLL_CTL_DEL: Invalid prev_sid (%u) on sid (%u)!", - session->vep.prev_sh, session_handle); + VDBG (0, "EPOLL_CTL_DEL: Invalid prev_sh (%u) on sh (%u)!", + s->vep.prev_sh, session_handle); return VPPCOM_EBADFD; } ASSERT (prev_session->vep.next_sh == session_handle); - prev_session->vep.next_sh = session->vep.next_sh; + prev_session->vep.next_sh = s->vep.next_sh; } - if (session->vep.next_sh != ~0) + if (s->vep.next_sh != ~0) { vcl_session_t *next_session; - next_session = vcl_session_get_w_handle (wrk, session->vep.next_sh); + next_session = vcl_session_get_w_handle (wrk, s->vep.next_sh); if (PREDICT_FALSE (!next_session)) { - VDBG (0, "EPOLL_CTL_DEL: Invalid next_sid (%u) on sid (%u)!", - session->vep.next_sh, session_handle); + VDBG (0, "EPOLL_CTL_DEL: Invalid next_sh (%u) on sh (%u)!", + s->vep.next_sh, session_handle); return VPPCOM_EBADFD; } ASSERT (next_session->vep.prev_sh == session_handle); - next_session->vep.prev_sh = session->vep.prev_sh; + next_session->vep.prev_sh = s->vep.prev_sh; } - memset (&session->vep, 0, sizeof (session->vep)); - session->vep.next_sh = ~0; - session->vep.prev_sh = ~0; - session->vep.vep_sh = ~0; - session->is_vep_session = 0; + memset (&s->vep, 0, sizeof (s->vep)); + s->vep.next_sh = ~0; + s->vep.prev_sh = ~0; + s->vep.vep_sh = ~0; + s->is_vep_session = 0; - if (session->tx_fifo) - svm_fifo_del_want_tx_ntf (session->tx_fifo, SVM_FIFO_NO_TX_NOTIF); + txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + if (txf) + svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); - VDBG (1, "EPOLL_CTL_DEL: vep_idx %u, sid %u!", vep_handle, + VDBG (1, "EPOLL_CTL_DEL: vep_idx %u, sh %u!", vep_handle, session_handle); - vcl_evt (VCL_EVT_EPOLL_CTLDEL, session, vep_sh); + vcl_evt (VCL_EVT_EPOLL_CTLDEL, s, vep_sh); break; default: @@ -2533,38 +2792,12 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, switch (e->event_type) { - case FIFO_EVENT_APP_RX: - ASSERT (e->fifo->client_thread_index == vcl_get_worker_index ()); - vcl_fifo_rx_evt_valid_or_break (e->fifo); - sid = e->fifo->client_session_index; - if (!(session = vcl_session_get (wrk, sid))) - break; - session_events = session->vep.ev.events; - if (!(EPOLLIN & session->vep.ev.events) || session->has_rx_evt) - break; - add_event = 1; - events[*num_ev].events |= EPOLLIN; - session_evt_data = session->vep.ev.data.u64; - session->has_rx_evt = 1; - break; - case FIFO_EVENT_APP_TX: - sid = e->fifo->client_session_index; - if (!(session = vcl_session_get (wrk, sid))) - break; - session_events = session->vep.ev.events; - if (!(EPOLLOUT & session_events)) - break; - add_event = 1; - events[*num_ev].events |= EPOLLOUT; - session_evt_data = session->vep.ev.data.u64; - svm_fifo_reset_tx_ntf (session->tx_fifo); - break; - case SESSION_IO_EVT_CT_TX: - vcl_fifo_rx_evt_valid_or_break (e->fifo); - session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 0); - if (PREDICT_FALSE (!session)) + case SESSION_IO_EVT_RX: + sid = e->session_index; + session = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (session)) break; - sid = session->session_index; + vcl_fifo_rx_evt_valid_or_break (session); session_events = session->vep.ev.events; if (!(EPOLLIN & session->vep.ev.events) || session->has_rx_evt) break; @@ -2573,18 +2806,19 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, session_evt_data = session->vep.ev.data.u64; session->has_rx_evt = 1; break; - case SESSION_IO_EVT_CT_RX: - session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 1); - if (PREDICT_FALSE (!session)) + case SESSION_IO_EVT_TX: + sid = e->session_index; + session = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (session)) break; - sid = session->session_index; session_events = session->vep.ev.events; if (!(EPOLLOUT & session_events)) break; add_event = 1; events[*num_ev].events |= EPOLLOUT; session_evt_data = session->vep.ev.data.u64; - svm_fifo_reset_tx_ntf (session->tx_fifo); + svm_fifo_reset_has_deq_ntf (vcl_session_is_ct (session) ? + session->ct_tx_fifo : session->tx_fifo); break; case SESSION_CTRL_EVT_ACCEPTED: session = vcl_session_accepted (wrk, @@ -2602,10 +2836,10 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, break; case SESSION_CTRL_EVT_CONNECTED: connected_msg = (session_connected_msg_t *) e->data; - vcl_session_connected_handler (wrk, connected_msg); + sid = vcl_session_connected_handler (wrk, connected_msg); /* Generate EPOLLOUT because there's no connected event */ - sid = vcl_session_index_from_vpp_handle (wrk, connected_msg->handle); - if (!(session = vcl_session_get (wrk, sid))) + session = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (session)) break; session_events = session->vep.ev.events; if (!(EPOLLOUT & session_events)) @@ -2613,36 +2847,53 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, add_event = 1; events[*num_ev].events |= EPOLLOUT; session_evt_data = session->vep.ev.data.u64; + if (session->session_state & STATE_DETACHED) + events[*num_ev].events |= EPOLLHUP; break; case SESSION_CTRL_EVT_DISCONNECTED: disconnected_msg = (session_disconnected_msg_t *) e->data; session = vcl_session_disconnected_handler (wrk, disconnected_msg); - if (!session) + if (vcl_session_is_closed (session)) break; session_events = session->vep.ev.events; - if (!((EPOLLHUP | EPOLLRDHUP) & session_events)) - break; add_event = 1; events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; session_evt_data = session->vep.ev.data.u64; break; case SESSION_CTRL_EVT_RESET: sid = vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); - if (!(session = vcl_session_get (wrk, sid))) + session = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (session)) break; session_events = session->vep.ev.events; - if (!((EPOLLHUP | EPOLLRDHUP) & session_events)) - break; add_event = 1; events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; session_evt_data = session->vep.ev.data.u64; break; + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + vcl_session_unlisten_reply_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_MIGRATED: + vcl_session_migrated_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_CLEANUP: + vcl_session_cleanup_handler (wrk, e->data); + break; case SESSION_CTRL_EVT_REQ_WORKER_UPDATE: vcl_session_req_worker_update_handler (wrk, e->data); break; case SESSION_CTRL_EVT_WORKER_UPDATE_REPLY: vcl_session_worker_update_reply_handler (wrk, e->data); break; + case SESSION_CTRL_EVT_APP_ADD_SEGMENT: + vcl_session_app_add_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_DEL_SEGMENT: + vcl_session_app_del_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_WRK_RPC: + vcl_worker_rpc_handler (wrk, e->data); + break; default: VDBG (0, "unhandled: %u", e->event_type); break; @@ -2693,7 +2944,8 @@ vcl_epoll_wait_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, } } } - vcl_mq_dequeue_batch (wrk, mq); + ASSERT (maxevents > *num_ev); + vcl_mq_dequeue_batch (wrk, mq, ~0); svm_msg_q_unlock (mq); handle_dequeued: @@ -2704,7 +2956,7 @@ handle_dequeued: if (*num_ev < maxevents) vcl_epoll_wait_handle_mq_event (wrk, e, events, num_ev); else - vec_add1 (wrk->unhandled_evts_vector, *e); + vcl_handle_mq_event (wrk, e); svm_msg_q_free_msg (mq, msg); } vec_reset_length (wrk->mq_msg_vector); @@ -2716,33 +2968,30 @@ static int vppcom_epoll_wait_condvar (vcl_worker_t * wrk, struct epoll_event *events, int maxevents, u32 n_evts, double wait_for_time) { - vcl_cut_through_registration_t *cr; - double total_wait = 0, wait_slice; - int rv; + double wait = 0, start = 0, now; - wait_for_time = (wait_for_time == -1) ? (double) 1e6 : wait_for_time; - wait_slice = wrk->cut_through_registrations ? 10e-6 : wait_for_time; + if (!n_evts) + { + wait = wait_for_time; + start = clib_time_now (&wrk->clib_time); + } do { - vcl_ct_registration_lock (wrk); - /* *INDENT-OFF* */ - pool_foreach (cr, wrk->cut_through_registrations, ({ - vcl_epoll_wait_handle_mq (wrk, cr->mq, events, maxevents, 0, &n_evts); - })); - /* *INDENT-ON* */ - vcl_ct_registration_unlock (wrk); - - rv = vcl_epoll_wait_handle_mq (wrk, wrk->app_event_queue, events, - maxevents, n_evts ? 0 : wait_slice, - &n_evts); - if (rv) - total_wait += wait_slice; + vcl_epoll_wait_handle_mq (wrk, wrk->app_event_queue, events, maxevents, + wait, &n_evts); if (n_evts) return n_evts; + if (wait == -1) + continue; + + now = clib_time_now (&wrk->clib_time); + wait -= (now - start) * 1e3; + start = now; } - while (total_wait < wait_for_time); - return n_evts; + while (wait > 0); + + return 0; } static int @@ -2781,8 +3030,7 @@ vppcom_epoll_wait (uint32_t vep_handle, struct epoll_event *events, if (PREDICT_FALSE (maxevents <= 0)) { - clib_warning ("VCL<%d>: ERROR: Invalid maxevents (%d)!", - getpid (), maxevents); + VDBG (0, "ERROR: Invalid maxevents (%d)!", maxevents); return VPPCOM_EINVAL; } @@ -2792,8 +3040,7 @@ vppcom_epoll_wait (uint32_t vep_handle, struct epoll_event *events, if (PREDICT_FALSE (!vep_session->is_vep)) { - clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", - getpid (), vep_handle); + VDBG (0, "ERROR: vep_idx (%u) is not a vep!", vep_handle); return VPPCOM_EINVAL; } @@ -2807,12 +3054,11 @@ vppcom_epoll_wait (uint32_t vep_handle, struct epoll_event *events, events, &n_evts); if (n_evts == maxevents) { - i += 1; - break; + vec_delete (wrk->unhandled_evts_vector, i + 1, 0); + return n_evts; } } - - vec_delete (wrk->unhandled_evts_vector, i, 0); + vec_reset_length (wrk->unhandled_evts_vector); } if (vcm->cfg.use_mq_eventfd) @@ -2840,25 +3086,27 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, switch (op) { case VPPCOM_ATTR_GET_NREAD: - rv = vppcom_session_read_ready (session); - VDBG (2, "VPPCOM_ATTR_GET_NREAD: sid %u, nread = %d", rv); + rv = vcl_session_read_ready (session); + VDBG (2, "VPPCOM_ATTR_GET_NREAD: sh %u, nread = %d", session_handle, + rv); break; case VPPCOM_ATTR_GET_NWRITE: - rv = vppcom_session_write_ready (session); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_NWRITE: sid %u, nwrite = %d", - getpid (), session_handle, rv); + rv = vcl_session_write_ready (session); + VDBG (2, "VPPCOM_ATTR_GET_NWRITE: sh %u, nwrite = %d", session_handle, + rv); break; case VPPCOM_ATTR_GET_FLAGS: if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*flags)))) { - *flags = O_RDWR | (VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_NONBLOCK)); + *flags = + O_RDWR | + (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK) ? + O_NONBLOCK : 0); *buflen = sizeof (*flags); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_FLAGS: sid %u, flags = 0x%08x, " - "is_nonblocking = %u", getpid (), - session_handle, *flags, + VDBG (2, "VPPCOM_ATTR_GET_FLAGS: sh %u, flags = 0x%08x, " + "is_nonblocking = %u", session_handle, *flags, VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); } else @@ -2873,9 +3121,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_FLAGS: sid %u, flags = 0x%08x," - " is_nonblocking = %u", - getpid (), session_handle, *flags, + VDBG (2, "VPPCOM_ATTR_SET_FLAGS: sh %u, flags = 0x%08x," + " is_nonblocking = %u", session_handle, *flags, VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); } else @@ -2895,10 +3142,9 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, clib_memcpy_fast (ep->ip, &session->transport.rmt_ip.ip6, sizeof (ip6_address_t)); *buflen = sizeof (*ep); - VDBG (1, "VCL<%d>: VPPCOM_ATTR_GET_PEER_ADDR: sid %u, is_ip4 = %u, " - "addr = %U, port %u", getpid (), - session_handle, ep->is_ip4, format_ip46_address, - &session->transport.rmt_ip, + VDBG (1, "VPPCOM_ATTR_GET_PEER_ADDR: sh %u, is_ip4 = %u, " + "addr = %U, port %u", session_handle, ep->is_ip4, + format_ip46_address, &session->transport.rmt_ip, ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, clib_net_to_host_u16 (ep->port)); } @@ -2919,9 +3165,26 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, clib_memcpy_fast (ep->ip, &session->transport.lcl_ip.ip6, sizeof (ip6_address_t)); *buflen = sizeof (*ep); - VDBG (1, "VCL<%d>: VPPCOM_ATTR_GET_LCL_ADDR: sid %u, is_ip4 = %u," - " addr = %U port %d", getpid (), - session_handle, ep->is_ip4, format_ip46_address, + VDBG (1, "VPPCOM_ATTR_GET_LCL_ADDR: sh %u, is_ip4 = %u, addr = %U" + " port %d", session_handle, ep->is_ip4, format_ip46_address, + &session->transport.lcl_ip, + ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (ep->port)); + } + else + rv = VPPCOM_EINVAL; + break; + + case VPPCOM_ATTR_SET_LCL_ADDR: + if (PREDICT_TRUE (buffer && buflen && + (*buflen >= sizeof (*ep)) && ep->ip)) + { + session->transport.is_ip4 = ep->is_ip4; + session->transport.lcl_port = ep->port; + vcl_ip_copy_from_ep (&session->transport.lcl_ip, ep); + *buflen = sizeof (*ep); + VDBG (1, "VPPCOM_ATTR_SET_LCL_ADDR: sh %u, is_ip4 = %u, addr = %U" + " port %d", session_handle, ep->is_ip4, format_ip46_address, &session->transport.lcl_ip, ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, clib_net_to_host_u16 (ep->port)); @@ -2932,8 +3195,7 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, case VPPCOM_ATTR_GET_LIBC_EPFD: rv = session->libc_epfd; - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d", - getpid (), rv); + VDBG (2, "VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d", rv); break; case VPPCOM_ATTR_SET_LIBC_EPFD: @@ -2943,8 +3205,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, session->libc_epfd = *(int *) buffer; *buflen = sizeof (session->libc_epfd); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd %d, " - "buflen %d", getpid (), session->libc_epfd, *buflen); + VDBG (2, "VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd %d, buflen %d", + session->libc_epfd, *buflen); } else rv = VPPCOM_EINVAL; @@ -2956,9 +3218,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, *(int *) buffer = session->session_type; *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_PROTOCOL: %d (%s), buflen %d", - getpid (), *(int *) buffer, *(int *) buffer ? "UDP" : "TCP", - *buflen); + VDBG (2, "VPPCOM_ATTR_GET_PROTOCOL: %d (%s), buflen %d", + *(int *) buffer, *(int *) buffer ? "UDP" : "TCP", *buflen); } else rv = VPPCOM_EINVAL; @@ -2971,8 +3232,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VCL_SESS_ATTR_LISTEN); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LISTEN: %d, buflen %d", - getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_LISTEN: %d, buflen %d", *(int *) buffer, + *buflen); } else rv = VPPCOM_EINVAL; @@ -2984,8 +3245,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, *(int *) buffer = 0; *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_ERROR: %d, buflen %d, #VPP-TBD#", - getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_ERROR: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -2997,13 +3258,14 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, /* VPP-TBD */ *(size_t *) buffer = (session->sndbuf_size ? session->sndbuf_size : - session->tx_fifo ? session->tx_fifo->nitems : + session->tx_fifo ? + svm_fifo_size (session->tx_fifo) : vcm->cfg.tx_fifo_size); *buflen = sizeof (u32); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - *(size_t *) buffer, *(size_t *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_TX_FIFO_LEN: %u (0x%x), buflen %d," + " #VPP-TBD#", *(size_t *) buffer, *(size_t *) buffer, + *buflen); } else rv = VPPCOM_EINVAL; @@ -3014,9 +3276,9 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, { /* VPP-TBD */ session->sndbuf_size = *(u32 *) buffer; - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - session->sndbuf_size, session->sndbuf_size, *buflen); + VDBG (2, "VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), buflen %d," + " #VPP-TBD#", session->sndbuf_size, session->sndbuf_size, + *buflen); } else rv = VPPCOM_EINVAL; @@ -3028,13 +3290,13 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, /* VPP-TBD */ *(size_t *) buffer = (session->rcvbuf_size ? session->rcvbuf_size : - session->rx_fifo ? session->rx_fifo->nitems : + session->rx_fifo ? + svm_fifo_size (session->rx_fifo) : vcm->cfg.rx_fifo_size); *buflen = sizeof (u32); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_RX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - *(size_t *) buffer, *(size_t *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_RX_FIFO_LEN: %u (0x%x), buflen %d, " + "#VPP-TBD#", *(size_t *) buffer, *(size_t *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3045,9 +3307,9 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, { /* VPP-TBD */ session->rcvbuf_size = *(u32 *) buffer; - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_RX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - session->sndbuf_size, session->sndbuf_size, *buflen); + VDBG (2, "VPPCOM_ATTR_SET_RX_FIFO_LEN: %u (0x%x), buflen %d," + " #VPP-TBD#", session->sndbuf_size, session->sndbuf_size, + *buflen); } else rv = VPPCOM_EINVAL; @@ -3061,8 +3323,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VCL_SESS_ATTR_REUSEADDR); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEADDR: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_REUSEADDR: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3078,10 +3340,9 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEADDR); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_REUSEADDR: %d, buflen %d," - " #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEADDR), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_REUSEADDR: %d, buflen %d, #VPP-TBD#", + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_REUSEADDR), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3095,8 +3356,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VCL_SESS_ATTR_REUSEPORT); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEPORT: %d, buflen %d," - " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_REUSEPORT: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3112,10 +3373,9 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEPORT); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_REUSEPORT: %d, buflen %d," - " #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEPORT), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_REUSEPORT: %d, buflen %d, #VPP-TBD#", + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_REUSEPORT), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3129,8 +3389,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VCL_SESS_ATTR_BROADCAST); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_BROADCAST: %d, buflen %d," - " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_BROADCAST: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3145,10 +3405,9 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_BROADCAST); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_BROADCAST: %d, buflen %d, " - "#VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_BROADCAST), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_BROADCAST: %d, buflen %d, #VPP-TBD#", + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_BROADCAST), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3162,8 +3421,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VCL_SESS_ATTR_V6ONLY); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_V6ONLY: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_V6ONLY: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3178,10 +3437,9 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_V6ONLY); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_V6ONLY: %d, buflen %d, " - "#VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_V6ONLY), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_V6ONLY: %d, buflen %d, #VPP-TBD#", + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_V6ONLY), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3195,8 +3453,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VCL_SESS_ATTR_KEEPALIVE); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_KEEPALIVE: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_KEEPALIVE: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3211,10 +3469,9 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_KEEPALIVE); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_KEEPALIVE: %d, buflen %d, " - "#VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_KEEPALIVE), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_KEEPALIVE: %d, buflen %d, #VPP-TBD#", + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_KEEPALIVE), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3228,8 +3485,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VCL_SESS_ATTR_TCP_NODELAY); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_NODELAY: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_TCP_NODELAY: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3244,10 +3501,9 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_NODELAY); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_NODELAY: %d, buflen %d, " - "#VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_NODELAY), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_TCP_NODELAY: %d, buflen %d, #VPP-TBD#", + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_TCP_NODELAY), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3261,8 +3517,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VCL_SESS_ATTR_TCP_KEEPIDLE); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3277,8 +3533,7 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d, buflen %d, " - "#VPP-TBD#", getpid (), + VDBG (2, "VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d, buflen %d, #VPP-TBD#", VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE), *buflen); } @@ -3294,8 +3549,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VCL_SESS_ATTR_TCP_KEEPINTVL); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3310,8 +3565,7 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d, buflen %d, " - "#VPP-TBD#", getpid (), + VDBG (2, "VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d, buflen %d, #VPP-TBD#", VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL), *buflen); } @@ -3326,8 +3580,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, *(u32 *) buffer = session->user_mss; *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_USER_MSS: %d, buflen %d," - " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_TCP_USER_MSS: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3339,8 +3593,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, /* VPP-TBD */ session->user_mss = *(u32 *) buffer; - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_USER_MSS: %u, buflen %d, " - "#VPP-TBD#", getpid (), session->user_mss, *buflen); + VDBG (2, "VPPCOM_ATTR_SET_TCP_USER_MSS: %u, buflen %d, #VPP-TBD#", + session->user_mss, *buflen); } else rv = VPPCOM_EINVAL; @@ -3366,6 +3620,11 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, *(int *) buffer = SHUT_RDWR; *buflen = sizeof (int); break; + + case VPPCOM_ATTR_SET_CONNECTED: + session->flags |= VCL_SESSION_F_CONNECTED; + break; + default: rv = VPPCOM_EINVAL; break; @@ -3379,21 +3638,8 @@ vppcom_session_recvfrom (uint32_t session_handle, void *buffer, uint32_t buflen, int flags, vppcom_endpt_t * ep) { vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; int rv = VPPCOM_OK; - vcl_session_t *session = 0; - - if (ep) - { - session = vcl_session_get_w_handle (wrk, session_handle); - if (PREDICT_FALSE (!session)) - { - VDBG (0, "VCL<%d>: invalid session, sid (%u) has been closed!", - getpid (), session_handle); - return VPPCOM_EBADFD; - } - ep->is_ip4 = session->transport.is_ip4; - ep->port = session->transport.rmt_port; - } if (flags == 0) rv = vppcom_session_read (session_handle, buffer, buflen); @@ -3405,14 +3651,17 @@ vppcom_session_recvfrom (uint32_t session_handle, void *buffer, return VPPCOM_EAFNOSUPPORT; } - if (ep) + if (ep && rv > 0) { + session = vcl_session_get_w_handle (wrk, session_handle); if (session->transport.is_ip4) clib_memcpy_fast (ep->ip, &session->transport.rmt_ip.ip4, sizeof (ip4_address_t)); else clib_memcpy_fast (ep->ip, &session->transport.rmt_ip.ip6, sizeof (ip6_address_t)); + ep->is_ip4 = session->transport.is_ip4; + ep->port = session->transport.rmt_port; } return rv; @@ -3422,23 +3671,43 @@ int vppcom_session_sendto (uint32_t session_handle, void *buffer, uint32_t buflen, int flags, vppcom_endpt_t * ep) { + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (!s) + return VPPCOM_EBADFD; + if (!buffer) return VPPCOM_EINVAL; if (ep) { - // TBD - return VPPCOM_EINVAL; + if (s->session_type != VPPCOM_PROTO_UDP + || (s->flags & VCL_SESSION_F_CONNECTED)) + return VPPCOM_EINVAL; + + /* Session not connected/bound in vpp. Create it by 'connecting' it */ + if (PREDICT_FALSE (s->session_state == STATE_CLOSED)) + { + vcl_send_session_connect (wrk, s); + } + else + { + s->transport.is_ip4 = ep->is_ip4; + s->transport.rmt_port = ep->port; + vcl_ip_copy_from_ep (&s->transport.rmt_ip, ep); + } } if (flags) { // TBD check the flags and do the right thing - VDBG (2, "VCL<%d>: handling flags 0x%u (%d) not implemented yet.", - getpid (), flags, flags); + VDBG (2, "handling flags 0x%u (%d) not implemented yet.", flags, flags); } - return (vppcom_session_write_inline (session_handle, buffer, buflen, 1)); + return (vppcom_session_write_inline (wrk, s, buffer, buflen, 1, + s->is_dgram ? 1 : 0)); } int @@ -3451,8 +3720,7 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) session_event_t *e; int rv, num_ev = 0; - VDBG (3, "VCL<%d>: vp %p, nsids %u, wait_for_time %f", - getpid (), vp, n_sids, wait_for_time); + VDBG (3, "vp %p, nsids %u, wait_for_time %f", vp, n_sids, wait_for_time); if (!vp) return VPPCOM_EFAULT; @@ -3484,7 +3752,7 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) if (POLLIN & vp[i].events) { - rv = vppcom_session_read_ready (session); + rv = vcl_session_read_ready (session); if (rv > 0) { vp[i].revents |= POLLIN; @@ -3508,7 +3776,7 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) if (POLLOUT & vp[i].events) { - rv = vppcom_session_write_ready (session); + rv = vcl_session_write_ready (session); if (rv > 0) { vp[i].revents |= POLLOUT; @@ -3541,16 +3809,6 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) } while ((num_ev == 0) && keep_trying); - if (VPPCOM_DEBUG > 3) - { - clib_warning ("VCL<%d>: returning %d", getpid (), num_ev); - for (i = 0; i < n_sids; i++) - { - clib_warning ("VCL<%d>: vp[%d].sid %d (0x%x), .events 0x%x, " - ".revents 0x%x", getpid (), i, vp[i].sh, vp[i].sh, - vp[i].events, vp[i].revents); - } - } return num_ev; } @@ -3579,15 +3837,25 @@ vppcom_worker_register (void) if (!vcl_worker_alloc_and_init ()) return VPPCOM_EEXIST; - if (vcl_worker_set_bapi ()) - return VPPCOM_EEXIST; - if (vcl_worker_register_with_vpp ()) return VPPCOM_EEXIST; return VPPCOM_OK; } +void +vppcom_worker_unregister (void) +{ + vcl_worker_cleanup (vcl_worker_get_current (), 1 /* notify vpp */ ); + vcl_set_worker_index (~0); +} + +void +vppcom_worker_index_set (int index) +{ + vcl_set_worker_index (index); +} + int vppcom_worker_index (void) { @@ -3603,6 +3871,132 @@ vppcom_worker_mqs_epfd (void) return wrk->mqs_epfd; } +int +vppcom_session_is_connectable_listener (uint32_t session_handle) +{ + vcl_session_t *session; + vcl_worker_t *wrk = vcl_worker_get_current (); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + return vcl_session_is_connectable_listener (wrk, session); +} + +int +vppcom_session_listener (uint32_t session_handle) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *listen_session, *session; + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + if (session->listener_index == VCL_INVALID_SESSION_INDEX) + return VPPCOM_EBADFD; + listen_session = vcl_session_get_w_handle (wrk, session->listener_index); + if (!listen_session) + return VPPCOM_EBADFD; + return vcl_session_handle (listen_session); +} + +int +vppcom_session_n_accepted (uint32_t session_handle) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + return session->n_accepted_sessions; +} + +const char * +vppcom_proto_str (vppcom_proto_t proto) +{ + char const *proto_str; + + switch (proto) + { + case VPPCOM_PROTO_TCP: + proto_str = "TCP"; + break; + case VPPCOM_PROTO_UDP: + proto_str = "UDP"; + break; + case VPPCOM_PROTO_TLS: + proto_str = "TLS"; + break; + case VPPCOM_PROTO_QUIC: + proto_str = "QUIC"; + break; + default: + proto_str = "UNKNOWN"; + break; + } + return proto_str; +} + +const char * +vppcom_retval_str (int retval) +{ + char const *st; + + switch (retval) + { + case VPPCOM_OK: + st = "VPPCOM_OK"; + break; + + case VPPCOM_EAGAIN: + st = "VPPCOM_EAGAIN"; + break; + + case VPPCOM_EFAULT: + st = "VPPCOM_EFAULT"; + break; + + case VPPCOM_ENOMEM: + st = "VPPCOM_ENOMEM"; + break; + + case VPPCOM_EINVAL: + st = "VPPCOM_EINVAL"; + break; + + case VPPCOM_EBADFD: + st = "VPPCOM_EBADFD"; + break; + + case VPPCOM_EAFNOSUPPORT: + st = "VPPCOM_EAFNOSUPPORT"; + break; + + case VPPCOM_ECONNABORTED: + st = "VPPCOM_ECONNABORTED"; + break; + + case VPPCOM_ECONNRESET: + st = "VPPCOM_ECONNRESET"; + break; + + case VPPCOM_ENOTCONN: + st = "VPPCOM_ENOTCONN"; + break; + + case VPPCOM_ECONNREFUSED: + st = "VPPCOM_ECONNREFUSED"; + break; + + case VPPCOM_ETIMEDOUT: + st = "VPPCOM_ETIMEDOUT"; + break; + + default: + st = "UNKNOWN_STATE"; + break; + } + + return st; +} + /* * fd.io coding-style-patch-verification: ON *