X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=f20167226e8c23a9b68475cf3da620090a2882aa;hp=acfeb205e2d520cf64ac6f008af5688d3eba74a0;hb=c1f5a43;hpb=faf9d7730828b80814a233eeecf7affc046193d3 diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index acfeb205e2d..f20167226e8 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -15,206 +15,56 @@ #include #include -#include #include -#include -#include -#include #include -#include -#include +#include +#include -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs +__thread uword __vcl_worker_index = ~0; -/* declare message handlers for each api */ +static u8 not_ready; -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include -#undef vl_printfun - -#if (CLIB_DEBUG > 0) -/* Set VPPCOM_DEBUG 2 for connection debug, 3 for read/write debug output */ -#define VPPCOM_DEBUG 1 -#else -#define VPPCOM_DEBUG 0 -#endif - -/* - * VPPCOM Private definitions and functions. - */ -typedef enum -{ - STATE_APP_START, - STATE_APP_CONN_VPP, - STATE_APP_ENABLED, - STATE_APP_ATTACHED, -} app_state_t; - -typedef enum -{ - STATE_START, - STATE_CONNECT, - STATE_LISTEN, - STATE_ACCEPT, - STATE_DISCONNECT, - STATE_FAILED -} session_state_t; - -typedef struct epoll_event vppcom_epoll_event_t; - -typedef struct -{ - u32 next_sid; - u32 prev_sid; - u32 vep_idx; - vppcom_epoll_event_t ev; -#define VEP_DEFAULT_ET_MASK (EPOLLIN|EPOLLOUT) - u32 et_mask; -} vppcom_epoll_t; - -typedef struct -{ - u8 is_ip4; - ip46_address_t ip46; -} vppcom_ip46_t; - -typedef struct +void +sigsegv_signal (int signum) { - volatile session_state_t state; - - svm_fifo_t *server_rx_fifo; - svm_fifo_t *server_tx_fifo; - u32 sm_seg_index; - u64 vpp_session_handle; - unix_shared_memory_queue_t *vpp_event_queue; + not_ready = 1; +} - /* Socket configuration state */ - /* TBD: covert 'is_*' vars to bit in u8 flags; */ - u8 is_server; - u8 is_listen; - u8 is_cut_thru; - u8 is_nonblocking; - u8 is_vep; - u8 is_vep_session; - u32 wait_cont_idx; - vppcom_epoll_t vep; - u32 vrf; - vppcom_ip46_t lcl_addr; - vppcom_ip46_t peer_addr; - u16 lcl_port; // network order - u16 peer_port; // network order - u8 proto; - u64 client_queue_address; - u64 options[16]; -} session_t; - -typedef struct vppcom_cfg_t_ -{ - u64 heapsize; - u64 segment_baseva; - u32 segment_size; - u32 add_segment_size; - u32 preallocated_fifo_pairs; - u32 rx_fifo_size; - u32 tx_fifo_size; - u32 event_queue_size; - u32 listen_queue_size; - u8 session_scope_local; - u8 session_scope_global; - u8 *namespace_id; - u64 namespace_secret; - f64 app_timeout; - f64 session_timeout; - f64 accept_timeout; -} vppcom_cfg_t; - -typedef struct vppcom_main_t_ -{ - u8 init; - u32 *client_session_index_fifo; - volatile u32 bind_session_index; - int main_cpu; - - /* vpe input queue */ - unix_shared_memory_queue_t *vl_input_queue; - - /* API client handle */ - u32 my_client_index; - - /* Session pool */ - clib_spinlock_t sessions_lockp; - session_t *sessions; - - /* Hash table for disconnect processing */ - uword *session_index_by_vpp_handles; - - /* Select bitmaps */ - clib_bitmap_t *rd_bitmap; - clib_bitmap_t *wr_bitmap; - clib_bitmap_t *ex_bitmap; - - /* Our event queue */ - unix_shared_memory_queue_t *app_event_queue; - - /* unique segment name counter */ - u32 unique_segment_index; - - pid_t my_pid; - - /* For deadman timers */ - clib_time_t clib_time; - - /* State of the connection, shared between msg RX thread and main thread */ - volatile app_state_t app_state; - - vppcom_cfg_t cfg; - - /* VNET_API_ERROR_FOO -> "Foo" hash table */ - uword *error_string_by_error_number; -} vppcom_main_t; - -vppcom_main_t vppcom_main = {.my_client_index = ~0 }; - -static const char * -vppcom_app_state_str (app_state_t state) +static void +vcl_wait_for_memory (void *mem) { - char *st; - - switch (state) + u8 __clib_unused test; + if (vcm->mounting_segment) { - case STATE_APP_START: - st = "STATE_APP_START"; - break; - - case STATE_APP_CONN_VPP: - st = "STATE_APP_CONN_VPP"; - break; - - case STATE_APP_ENABLED: - st = "STATE_APP_ENABLED"; - break; - - case STATE_APP_ATTACHED: - st = "STATE_APP_ATTACHED"; - break; + while (vcm->mounting_segment) + ; + return; + } + if (1 || vcm->debug) + { + usleep (1e5); + return; + } + if (signal (SIGSEGV, sigsegv_signal)) + { + perror ("signal()"); + return; + } + not_ready = 0; - default: - st = "UNKNOWN_APP_STATE"; - break; +again: + test = *(u8 *) mem; + if (not_ready) + { + not_ready = 0; + usleep (1); + goto again; } - return st; + signal (SIGSEGV, SIG_DFL); } -static const char * +const char * vppcom_session_state_str (session_state_t state) { char *st; @@ -237,6 +87,10 @@ vppcom_session_state_str (session_state_t state) st = "STATE_ACCEPT"; break; + case STATE_CLOSE_ON_EMPTY: + st = "STATE_CLOSE_ON_EMPTY"; + break; + case STATE_DISCONNECT: st = "STATE_DISCONNECT"; break; @@ -253,3221 +107,3257 @@ vppcom_session_state_str (session_state_t state) return st; } -/* - * VPPCOM Utility Functions - */ -static inline int -vppcom_session_at_index (u32 session_index, session_t * volatile *sess) +u8 * +format_ip4_address (u8 * s, va_list * args) +{ + u8 *a = va_arg (*args, u8 *); + return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]); +} + +u8 * +format_ip6_address (u8 * s, va_list * args) { - vppcom_main_t *vcm = &vppcom_main; + ip6_address_t *a = va_arg (*args, ip6_address_t *); + u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon; - /* Assumes that caller has acquired spinlock: vcm->sessions_lockp */ - if (PREDICT_FALSE ((session_index == ~0) || - pool_is_free_index (vcm->sessions, session_index))) + i_max_n_zero = ARRAY_LEN (a->as_u16); + max_n_zeros = 0; + i_first_zero = i_max_n_zero; + n_zeros = 0; + for (i = 0; i < ARRAY_LEN (a->as_u16); i++) { - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - return VPPCOM_EBADFD; + u32 is_zero = a->as_u16[i] == 0; + if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16)) + { + i_first_zero = i; + n_zeros = 0; + } + n_zeros += is_zero; + if ((!is_zero && n_zeros > max_n_zeros) + || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros)) + { + i_max_n_zero = i_first_zero; + max_n_zeros = n_zeros; + i_first_zero = ARRAY_LEN (a->as_u16); + n_zeros = 0; + } } - *sess = pool_elt_at_index (vcm->sessions, session_index); - return VPPCOM_OK; + + last_double_colon = 0; + for (i = 0; i < ARRAY_LEN (a->as_u16); i++) + { + if (i == i_max_n_zero && max_n_zeros > 1) + { + s = format (s, "::"); + i += max_n_zeros - 1; + last_double_colon = 1; + } + else + { + s = format (s, "%s%x", + (last_double_colon || i == 0) ? "" : ":", + clib_net_to_host_u16 (a->as_u16[i])); + last_double_colon = 0; + } + } + + return s; } -static int -vppcom_connect_to_vpp (char *app_name) +/* Format an IP46 address. */ +u8 * +format_ip46_address (u8 * s, va_list * args) { - api_main_t *am = &api_main; - vppcom_main_t *vcm = &vppcom_main; + ip46_address_t *ip46 = va_arg (*args, ip46_address_t *); + ip46_type_t type = va_arg (*args, ip46_type_t); + int is_ip4 = 1; - if (VPPCOM_DEBUG > 0) - printf ("\nConnecting to VPP api..."); - if (vl_client_connect_to_vlib ("/vpe-api", app_name, 32) < 0) + switch (type) { - clib_warning ("[%d] connect to vpp (%s) failed!", - vcm->my_pid, app_name); - return VPPCOM_ECONNREFUSED; + case IP46_TYPE_ANY: + is_ip4 = ip46_address_is_ip4 (ip46); + break; + case IP46_TYPE_IP4: + is_ip4 = 1; + break; + case IP46_TYPE_IP6: + is_ip4 = 0; + break; } - vcm->vl_input_queue = am->shmem_hdr->vl_input_queue; - vcm->my_client_index = am->my_client_index; - if (VPPCOM_DEBUG > 0) - printf (" connected!\n"); + return is_ip4 ? + format (s, "%U", format_ip4_address, &ip46->ip4) : + format (s, "%U", format_ip6_address, &ip46->ip6); +} - vcm->app_state = STATE_APP_CONN_VPP; - return VPPCOM_OK; +/* + * VPPCOM Utility Functions + */ + + +static svm_msg_q_t * +vcl_session_vpp_evt_q (vcl_worker_t * wrk, vcl_session_t * s) +{ + if (vcl_session_is_ct (s)) + return wrk->vpp_event_queues[0]; + else + return wrk->vpp_event_queues[s->tx_fifo->master_thread_index]; +} + +static void +vcl_send_session_accepted_reply (svm_msg_q_t * mq, u32 context, + session_handle_t handle, int retval) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_accepted_reply_msg_t *rmp; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_ACCEPTED_REPLY); + rmp = (session_accepted_reply_msg_t *) app_evt->evt->data; + rmp->handle = handle; + rmp->context = context; + rmp->retval = retval; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} + +static void +vcl_send_session_disconnected_reply (svm_msg_q_t * mq, u32 context, + session_handle_t handle, int retval) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_disconnected_reply_msg_t *rmp; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, + SESSION_CTRL_EVT_DISCONNECTED_REPLY); + rmp = (session_disconnected_reply_msg_t *) app_evt->evt->data; + rmp->handle = handle; + rmp->context = context; + rmp->retval = retval; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} + +static void +vcl_send_session_reset_reply (svm_msg_q_t * mq, u32 context, + session_handle_t handle, int retval) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_reset_reply_msg_t *rmp; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_RESET_REPLY); + rmp = (session_reset_reply_msg_t *) app_evt->evt->data; + rmp->handle = handle; + rmp->context = context; + rmp->retval = retval; + app_send_ctrl_evt_to_vpp (mq, app_evt); } -static u8 * -format_api_error (u8 * s, va_list * args) +static u32 +vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp) { - vppcom_main_t *vcm = &vppcom_main; - i32 error = va_arg (*args, u32); - uword *p; + vcl_session_t *session, *listen_session; + svm_fifo_t *rx_fifo, *tx_fifo; + u32 vpp_wrk_index; + svm_msg_q_t *evt_q; + + session = vcl_session_alloc (wrk); + + listen_session = vcl_session_table_lookup_listener (wrk, + mp->listener_handle); + if (!listen_session) + { + 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; + } - p = hash_get (vcm->error_string_by_error_number, -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 (p) - s = format (s, "%s (%d)", p[0], error); + 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 *); + vcl_wait_for_memory (session->vpp_evt_q); + 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 - s = format (s, "%d", error); - return s; + { + 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->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, + 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); + vcl_evt (VCL_EVT_ACCEPT, session, listen_session, session_index); + + return session->session_index; } -static void -vppcom_init_error_string_table (void) +static u32 +vcl_session_connected_handler (vcl_worker_t * wrk, + session_connected_msg_t * mp) { - vppcom_main_t *vcm = &vppcom_main; + 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); + 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; + session->vpp_handle = mp->handle; + return session_index; + } - vcm->error_string_by_error_number = hash_create (0, sizeof (uword)); + rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); + tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); + vcl_wait_for_memory (rx_fifo); + rx_fifo->client_session_index = session_index; + tx_fifo->client_session_index = session_index; + 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 *); + + 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 + { + 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->rx_fifo = rx_fifo; + session->tx_fifo = tx_fifo; + session->vpp_handle = mp->handle; + session->transport.is_ip4 = mp->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; -#define _(n,v,s) hash_set (vcm->error_string_by_error_number, -v, s); - foreach_vnet_api_error; -#undef _ + /* Add it to lookup table */ + hash_set (wrk->session_index_by_vpp_handles, 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, + session->rx_fifo->refcnt, session->tx_fifo, session->tx_fifo->refcnt); - hash_set (vcm->error_string_by_error_number, 99, "Misc"); + return session_index; } -static inline int -vppcom_wait_for_app_state_change (app_state_t app_state) +static u32 +vcl_session_reset_handler (vcl_worker_t * wrk, + session_reset_msg_t * reset_msg) { - vppcom_main_t *vcm = &vppcom_main; - f64 timeout = clib_time_now (&vcm->clib_time) + vcm->cfg.app_timeout; + vcl_session_t *session; + u32 sid; - while (clib_time_now (&vcm->clib_time) < timeout) + sid = vcl_session_index_from_vpp_handle (wrk, reset_msg->handle); + session = vcl_session_get (wrk, sid); + if (!session) { - if (vcm->app_state == app_state) - return VPPCOM_OK; + VDBG (0, "request to reset unknown handle 0x%llx", reset_msg->handle); + return VCL_INVALID_SESSION_INDEX; } - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] timeout waiting for state %s (%d)", vcm->my_pid, - vppcom_app_state_str (app_state), app_state); - return VPPCOM_ETIMEDOUT; + session->session_state = STATE_CLOSE_ON_EMPTY; + VDBG (0, "reset handle 0x%llx, sid %u ", reset_msg->handle, sid); + vcl_send_session_reset_reply (vcl_session_vpp_evt_q (wrk, session), + vcm->my_client_index, reset_msg->handle, 0); + return sid; } -static inline int -vppcom_wait_for_session_state_change (u32 session_index, - session_state_t state, - f64 wait_for_time) +static u32 +vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) { - vppcom_main_t *vcm = &vppcom_main; - f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time; - session_t *volatile session; - int rv; + vcl_session_t *session; + u32 sid = mp->context; - do + session = vcl_session_get (wrk, sid); + if (mp->retval) { - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) + VDBG (0, "VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: bind failed: %U", + getpid (), mp->handle, sid, format_api_error, ntohl (mp->retval)); + if (session) { - clib_spinlock_unlock (&vcm->sessions_lockp); - return rv; + session->session_state = STATE_FAILED; + session->vpp_handle = mp->handle; + return sid; } - if (session->state == state) + else { - clib_spinlock_unlock (&vcm->sessions_lockp); - return VPPCOM_OK; + clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: " + "Invalid session index (%u)!", + getpid (), mp->handle, sid); + return VCL_INVALID_SESSION_INDEX; } - clib_spinlock_unlock (&vcm->sessions_lockp); } - while (clib_time_now (&vcm->clib_time) < timeout); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] timeout waiting for state %s (%d)", vcm->my_pid, - vppcom_session_state_str (state), state); - return VPPCOM_ETIMEDOUT; + session->vpp_handle = mp->handle; + session->transport.is_ip4 = mp->lcl_is_ip4; + clib_memcpy_fast (&session->transport.lcl_ip, mp->lcl_ip, + sizeof (ip46_address_t)); + session->transport.lcl_port = mp->lcl_port; + vcl_session_table_add_listener (wrk, mp->handle, sid); + session->session_state = STATE_LISTEN; + + if (session->is_dgram) + { + svm_fifo_t *rx_fifo, *tx_fifo; + session->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); + rx_fifo = uword_to_pointer (mp->rx_fifo, svm_fifo_t *); + rx_fifo->client_session_index = sid; + tx_fifo = uword_to_pointer (mp->tx_fifo, svm_fifo_t *); + tx_fifo->client_session_index = sid; + session->rx_fifo = rx_fifo; + session->tx_fifo = tx_fifo; + } + + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!", + getpid (), mp->handle, sid); + return sid; +} + +static int +vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) +{ + session_accepted_msg_t *accepted_msg; + session_disconnected_msg_t *disconnected_msg; + vcl_session_msg_t *vcl_msg; + vcl_session_t *session; + u64 handle; + u32 sid; + + 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: + vec_add1 (wrk->unhandled_evts_vector, *e); + break; + case SESSION_CTRL_EVT_ACCEPTED: + accepted_msg = (session_accepted_msg_t *) e->data; + handle = accepted_msg->listener_handle; + session = vcl_session_table_lookup_listener (wrk, handle); + if (!session) + { + clib_warning ("VCL<%d>: ERROR: couldn't find listen session:" + "listener handle %llx", getpid (), handle); + break; + } + + clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); + vcl_msg->accepted_msg = *accepted_msg; + break; + case SESSION_CTRL_EVT_CONNECTED: + vcl_session_connected_handler (wrk, + (session_connected_msg_t *) e->data); + break; + case SESSION_CTRL_EVT_DISCONNECTED: + disconnected_msg = (session_disconnected_msg_t *) e->data; + sid = vcl_session_index_from_vpp_handle (wrk, disconnected_msg->handle); + session = vcl_session_get (wrk, sid); + if (!session) + { + VDBG (0, "request to disconnect unknown handle 0x%llx", + disconnected_msg->handle); + break; + } + session->session_state = STATE_DISCONNECT; + VDBG (0, "disconnected handle 0x%llx, sid %u", disconnected_msg->handle, + sid); + break; + case SESSION_CTRL_EVT_RESET: + vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + break; + case SESSION_CTRL_EVT_BOUND: + vcl_session_bound_handler (wrk, (session_bound_msg_t *) e->data); + break; + default: + clib_warning ("unhandled %u", e->event_type); + } + return VPPCOM_OK; } static inline int -vppcom_wait_for_client_session_index (f64 wait_for_time) +vppcom_wait_for_session_state_change (u32 session_index, + session_state_t state, + f64 wait_for_time) { - vppcom_main_t *vcm = &vppcom_main; - f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time; + vcl_worker_t *wrk = vcl_worker_get_current (); + f64 timeout = clib_time_now (&wrk->clib_time) + wait_for_time; + vcl_session_t *volatile session; + svm_msg_q_msg_t msg; + session_event_t *e; do { - if (clib_fifo_elts (vcm->client_session_index_fifo)) - return VPPCOM_OK; + session = vcl_session_get (wrk, session_index); + if (PREDICT_FALSE (!session)) + { + return VPPCOM_EBADFD; + } + if (session->session_state & state) + { + return VPPCOM_OK; + } + if (session->session_state & STATE_FAILED) + { + return VPPCOM_ECONNREFUSED; + } + + if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_NOWAIT, 0)) + continue; + e = svm_msg_q_msg_data (wrk->app_event_queue, &msg); + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); } - while (clib_time_now (&vcm->clib_time) < timeout); + while (clib_time_now (&wrk->clib_time) < timeout); - if (wait_for_time == 0) - return VPPCOM_EAGAIN; + VDBG (0, "VCL<%d>: timeout waiting for state 0x%x (%s)", getpid (), state, + vppcom_session_state_str (state)); + vcl_evt (VCL_EVT_SESSION_TIMEOUT, session, session_state); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] timeout waiting for client_session_index", - vcm->my_pid); return VPPCOM_ETIMEDOUT; } -/* - * VPP-API message functions - */ -static void -vppcom_send_session_enable_disable (u8 is_enable) -{ - vppcom_main_t *vcm = &vppcom_main; - vl_api_session_enable_disable_t *bmp; - bmp = vl_msg_api_alloc (sizeof (*bmp)); - memset (bmp, 0, sizeof (*bmp)); - - bmp->_vl_msg_id = ntohs (VL_API_SESSION_ENABLE_DISABLE); - bmp->client_index = vcm->my_client_index; - bmp->context = htonl (0xfeedface); - bmp->is_enable = is_enable; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); -} - static int vppcom_app_session_enable (void) { - vppcom_main_t *vcm = &vppcom_main; int rv; if (vcm->app_state != STATE_APP_ENABLED) { vppcom_send_session_enable_disable (1 /* is_enabled == TRUE */ ); - rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); + rv = vcl_wait_for_app_state_change (STATE_APP_ENABLED); if (PREDICT_FALSE (rv)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] Session enable timed out, rv = %s (%d)", - vcm->my_pid, vppcom_retval_str (rv), 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 void - vl_api_session_enable_disable_reply_t_handler - (vl_api_session_enable_disable_reply_t * mp) +static int +vppcom_app_attach (void) { - vppcom_main_t *vcm = &vppcom_main; + int rv; - if (mp->retval) + vppcom_app_send_attach (); + rv = vcl_wait_for_app_state_change (STATE_APP_ATTACHED); + if (PREDICT_FALSE (rv)) { - clib_warning ("[%d] session_enable_disable failed: %U", vcm->my_pid, - format_api_error, ntohl (mp->retval)); + VDBG (0, "VCL<%d>: application attach timed out! returning %d (%s)", + getpid (), rv, vppcom_retval_str (rv)); + return rv; } - else - vcm->app_state = STATE_APP_ENABLED; + + return VPPCOM_OK; } -static void -vppcom_app_send_attach (void) +static int +vppcom_session_unbind (u32 session_handle) { - vppcom_main_t *vcm = &vppcom_main; - vl_api_application_attach_t *bmp; - u8 nsid_len = vec_len (vcm->cfg.namespace_id); + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; + u64 vpp_handle; - bmp = vl_msg_api_alloc (sizeof (*bmp)); - memset (bmp, 0, sizeof (*bmp)); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; - bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_ATTACH); - bmp->client_index = vcm->my_client_index; - bmp->context = htonl (0xfeedface); - bmp->options[APP_OPTIONS_FLAGS] = - APP_OPTIONS_FLAGS_ACCEPT_REDIRECT | APP_OPTIONS_FLAGS_ADD_SEGMENT | - (vcm->cfg.session_scope_local ? APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE : 0) | - (vcm->cfg.session_scope_global ? APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE : 0); - bmp->options[SESSION_OPTIONS_SEGMENT_SIZE] = vcm->cfg.segment_size; - bmp->options[SESSION_OPTIONS_ADD_SEGMENT_SIZE] = vcm->cfg.add_segment_size; - bmp->options[SESSION_OPTIONS_RX_FIFO_SIZE] = vcm->cfg.rx_fifo_size; - bmp->options[SESSION_OPTIONS_TX_FIFO_SIZE] = vcm->cfg.tx_fifo_size; - if (nsid_len) - { - bmp->namespace_id_len = nsid_len; - clib_memcpy (bmp->namespace_id, vcm->cfg.namespace_id, nsid_len); - bmp->options[APP_OPTIONS_NAMESPACE_SECRET] = vcm->cfg.namespace_secret; - } - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); + vpp_handle = session->vpp_handle; + vcl_session_table_del_listener (wrk, vpp_handle); + session->vpp_handle = ~0; + session->session_state = STATE_DISCONNECT; + + 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_evt (VCL_EVT_UNBIND, session); + vppcom_send_unbind_sock (vpp_handle); + + return VPPCOM_OK; } static int -vppcom_app_attach (void) +vppcom_session_disconnect (u32 session_handle) { - vppcom_main_t *vcm = &vppcom_main; - int rv; + vcl_worker_t *wrk = vcl_worker_get_current (); + svm_msg_q_t *vpp_evt_q; + vcl_session_t *session; + session_state_t state; + u64 vpp_handle; - vppcom_app_send_attach (); - rv = vppcom_wait_for_app_state_change (STATE_APP_ATTACHED); - if (PREDICT_FALSE (rv)) + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + + 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)); + + if (PREDICT_FALSE (state & STATE_LISTEN)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] application attach timed out, rv = %s (%d)", - vcm->my_pid, vppcom_retval_str (rv), rv); - return rv; + clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " + "Cannot disconnect a listen socket!", + getpid (), vpp_handle, session_handle); + return VPPCOM_EBADFD; } + + if (state & STATE_CLOSE_ON_EMPTY) + { + vpp_evt_q = vcl_session_vpp_evt_q (wrk, session); + vcl_send_session_disconnected_reply (vpp_evt_q, vcm->my_client_index, + vpp_handle, 0); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect " + "REPLY...", getpid (), vpp_handle, session_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); + } + return VPPCOM_OK; } static void -vppcom_app_detach (void) +vcl_cleanup_bapi (void) { - vppcom_main_t *vcm = &vppcom_main; - vl_api_application_detach_t *bmp; - bmp = vl_msg_api_alloc (sizeof (*bmp)); - memset (bmp, 0, sizeof (*bmp)); + api_main_t *am = &api_main; - bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_DETACH); - bmp->client_index = vcm->my_client_index; - bmp->context = htonl (0xfeedface); - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); + am->my_client_index = ~0; + am->my_registration = 0; + am->vl_input_queue = 0; + am->msg_index_by_name_and_crc = 0; + + vl_client_api_unmap (); } -static void -vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t * - mp) +void +vcl_app_fork_child_handler (void) { - vppcom_main_t *vcm = &vppcom_main; - static svm_fifo_segment_create_args_t _a; - svm_fifo_segment_create_args_t *a = &_a; + u8 *child_name; int rv; - memset (a, 0, sizeof (*a)); - if (mp->retval) + vcm->current_pid = getpid (); + vcl_set_worker_index (0); + + VDBG (0, "initializing forked child"); + child_name = format (0, "%v-child-%u%c", vcm->app_name, getpid (), 0); + + vcl_cleanup_bapi (); + vppcom_api_hookup (); + vcm->app_state = STATE_APP_START; + rv = vppcom_connect_to_vpp ((char *) child_name); + vec_free (child_name); + if (rv) { - clib_warning ("[%d] attach failed: %U", vcm->my_pid, - format_api_error, ntohl (mp->retval)); + VERR ("couldn't connect to VPP!"); return; } - if (mp->segment_name_length == 0) + vcm->app_state = STATE_APP_ADDING_WORKER; + vcl_send_app_worker_add_del (1 /* is_add */ ); + if (vcl_wait_for_app_state_change (STATE_APP_READY)) { - clib_warning ("[%d] segment_name_length zero", vcm->my_pid); + VERR ("failed to add worker to vpp"); return; } + VDBG (0, "forked child main worker initialized"); +} + +/* + * VPPCOM Public API functions + */ +int +vppcom_app_create (char *app_name) +{ + vppcom_cfg_t *vcl_cfg = &vcm->cfg; + int rv; - a->segment_name = (char *) mp->segment_name; - a->segment_size = mp->segment_size; + if (!vcm->is_init) + { + vcm->is_init = 1; + vppcom_cfg (&vcm->cfg); + vcl_cfg = &vcm->cfg; - ASSERT (mp->app_event_queue_address); + vcm->main_cpu = pthread_self (); + vcm->main_pid = vcm->current_pid = getpid (); + vcm->app_name = format (0, "%s", app_name); + vppcom_init_error_string_table (); + svm_fifo_segment_main_init (vcl_cfg->segment_baseva, + 20 /* timeout in secs */ ); + pool_init_fixed (vcm->workers, vcl_cfg->max_workers); + clib_spinlock_init (&vcm->workers_lock); + vcl_worker_alloc_and_init (); + pthread_atfork (NULL, NULL, vcl_app_fork_child_handler); + } - /* Attach to the segment vpp created */ - rv = svm_fifo_segment_attach (a); - vec_reset_length (a->new_segment_indices); - if (PREDICT_FALSE (rv)) + if (vcm->my_client_index == ~0) { - clib_warning ("[%d] svm_fifo_segment_attach ('%s') failed", vcm->my_pid, - mp->segment_name); - return; + /* 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; + } + + VDBG (0, "app_name '%s', my_client_index %d (0x%x)", + app_name, vcm->my_client_index, vcm->my_client_index); } - vcm->app_event_queue = - uword_to_pointer (mp->app_event_queue_address, - unix_shared_memory_queue_t *); + return VPPCOM_OK; +} + +void +vppcom_app_destroy (void) +{ + int rv; + f64 orig_app_timeout; + + if (vcm->my_client_index == ~0) + return; + + VDBG (0, "detaching from VPP, my_client_index %d (0x%x)", + vcm->my_client_index, vcm->my_client_index); + vcl_evt (VCL_EVT_DETACH, vcm); + + 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)); - vcm->app_state = STATE_APP_ATTACHED; + vcl_elog_stop (vcm); + vl_client_disconnect_from_vlib (); + vec_free (vcm->app_name); + vcm->my_client_index = ~0; + vcm->app_state = STATE_APP_START; } -static void -vl_api_application_detach_reply_t_handler (vl_api_application_detach_reply_t * - mp) +int +vppcom_session_create (u8 proto, u8 is_nonblocking) { - vppcom_main_t *vcm = &vppcom_main; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; - if (mp->retval) - clib_warning ("[%d] detach failed: %U", vcm->my_pid, format_api_error, - ntohl (mp->retval)); + session = vcl_session_alloc (wrk); + + session->session_type = proto; + session->session_state = STATE_START; + session->vpp_handle = ~0; + session->is_dgram = proto == VPPCOM_PROTO_UDP; + + if (is_nonblocking) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK); + + vcl_evt (VCL_EVT_CREATE, session, session_type, session->session_state, + is_nonblocking, session_index); - vcm->app_state = STATE_APP_ENABLED; + VDBG (0, "created sid %u", session->session_index); + + return vcl_session_handle (session); } -static void -vl_api_disconnect_session_reply_t_handler (vl_api_disconnect_session_reply_t * - mp) +int +vppcom_session_close (uint32_t session_handle) { - vppcom_main_t *vcm = &vppcom_main; - uword *p; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; + u8 is_vep, is_vep_session; + session_state_t state; + u32 next_sh, vep_sh; + int rv = VPPCOM_OK; + u64 vpp_handle; - p = hash_get (vcm->session_index_by_vpp_handles, mp->handle); - if (p) + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + + is_vep = session->is_vep; + is_vep_session = session->is_vep_session; + next_sh = session->vep.next_sh; + vep_sh = session->vep.vep_sh; + state = session->session_state; + vpp_handle = session->vpp_handle; + + if (VPPCOM_DEBUG > 0) { - session_t *session = 0; - int rv; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (p[0], &session); - if (PREDICT_FALSE (rv)) + if (is_vep) + clib_warning ("VCL<%d>: vep_idx %u / sid %u: " + "closing epoll session...", + getpid (), session_handle, session_handle); + else + clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %d: " + "closing session...", + getpid (), vpp_handle, session_handle); + } + + if (is_vep) + { + while (next_sh != ~0) { - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, p[0]); + rv = vppcom_epoll_ctl (session_handle, EPOLL_CTL_DEL, next_sh, 0); + if (PREDICT_FALSE (rv < 0)) + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: EPOLL_CTL_DEL " + "vep_idx %u failed! rv %d (%s)", + getpid (), vpp_handle, next_sh, vep_sh, + rv, vppcom_retval_str (rv)); + + next_sh = session->vep.next_sh; } - hash_unset (vcm->session_index_by_vpp_handles, mp->handle); - session->state = STATE_DISCONNECT; - clib_spinlock_unlock (&vcm->sessions_lockp); } else { - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] couldn't find session key %llx", vcm->my_pid, - mp->handle); + if (is_vep_session) + { + rv = vppcom_epoll_ctl (vep_sh, EPOLL_CTL_DEL, session_handle, 0); + if (rv < 0) + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: EPOLL_CTL_DEL " + "vep_idx %u failed! rv %d (%s)", + getpid (), vpp_handle, session_handle, + vep_sh, rv, vppcom_retval_str (rv)); + } + + if (state & STATE_LISTEN) + { + rv = vppcom_session_unbind (session_handle); + if (PREDICT_FALSE (rv < 0)) + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: listener unbind " + "failed! rv %d (%s)", + getpid (), vpp_handle, session_handle, + rv, vppcom_retval_str (rv)); + } + else if (state & STATE_OPEN) + { + rv = vppcom_session_disconnect (session_handle); + if (PREDICT_FALSE (rv < 0)) + clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " + "session disconnect failed! rv %d (%s)", + getpid (), vpp_handle, session_handle, + rv, vppcom_retval_str (rv)); + } } - if (mp->retval) - clib_warning ("[%d] disconnect_session failed: %U", vcm->my_pid, - format_api_error, ntohl (mp->retval)); -} + if (vcl_session_is_ct (session)) + { + vcl_cut_through_registration_t *ctr; + uword mq_addr; -static void -vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) -{ - vppcom_main_t *vcm = &vppcom_main; - static svm_fifo_segment_create_args_t _a; - svm_fifo_segment_create_args_t *a = &_a; - int rv; + 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); + } - memset (a, 0, sizeof (*a)); - a->segment_name = (char *) mp->segment_name; - a->segment_size = mp->segment_size; - /* Attach to the segment vpp created */ - rv = svm_fifo_segment_attach (a); - vec_reset_length (a->new_segment_indices); - if (PREDICT_FALSE (rv)) + if (vpp_handle != ~0) { - clib_warning ("[%d] svm_fifo_segment_attach ('%s') failed", - vcm->my_pid, mp->segment_name); - return; + vcl_session_table_del_vpp_handle (wrk, vpp_handle); } - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] mapped new segment '%s' size %d", vcm->my_pid, - mp->segment_name, mp->segment_size); -} - -static void -vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp) -{ - vppcom_main_t *vcm = &vppcom_main; - session_t *session = 0; - vl_api_disconnect_session_reply_t *rmp; - uword *p; - int rv = 0; + vcl_session_free (wrk, session); - p = hash_get (vcm->session_index_by_vpp_handles, mp->handle); - if (p) + if (VPPCOM_DEBUG > 0) { - int rval; - clib_spinlock_lock (&vcm->sessions_lockp); - rval = vppcom_session_at_index (p[0], &session); - if (PREDICT_FALSE (rval)) - { - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, p[0]); - } + if (is_vep) + clib_warning ("VCL<%d>: vep_idx %u / sid %u: epoll session removed.", + getpid (), session_handle, session_handle); else - pool_put (vcm->sessions, session); - clib_spinlock_unlock (&vcm->sessions_lockp); - hash_unset (vcm->session_index_by_vpp_handles, mp->handle); - } - else - { - clib_warning ("[%d] couldn't find session key %llx", vcm->my_pid, - mp->handle); - rv = -11; + clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: session removed.", + getpid (), vpp_handle, session_handle); } - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); + vcl_evt (VCL_EVT_CLOSE, session, rv); - rmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION_REPLY); - rmp->retval = htonl (rv); - rmp->handle = mp->handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp); + return rv; } -static void -vl_api_reset_session_t_handler (vl_api_reset_session_t * mp) +int +vppcom_session_bind (uint32_t session_handle, vppcom_endpt_t * ep) { - vppcom_main_t *vcm = &vppcom_main; - session_t *session = 0; - vl_api_reset_session_reply_t *rmp; - uword *p; - int rv = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; + + if (!ep || !ep->ip) + return VPPCOM_EINVAL; + + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; - p = hash_get (vcm->session_index_by_vpp_handles, mp->handle); - if (p) + if (session->is_vep) { - int rval; - clib_spinlock_lock (&vcm->sessions_lockp); - rval = vppcom_session_at_index (p[0], &session); - if (PREDICT_FALSE (rval)) - { - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, p[0]); - } - else - pool_put (vcm->sessions, session); - clib_spinlock_unlock (&vcm->sessions_lockp); - hash_unset (vcm->session_index_by_vpp_handles, mp->handle); + clib_warning ("VCL<%d>: ERROR: sid %u: cannot " + "bind to an epoll session!", getpid (), session_handle); + return VPPCOM_EBADFD; } + + session->transport.is_ip4 = ep->is_ip4; + if (ep->is_ip4) + clib_memcpy_fast (&session->transport.lcl_ip.ip4, ep->ip, + sizeof (ip4_address_t)); else - { - clib_warning ("[%d] couldn't find session key %llx", vcm->my_pid, - mp->handle); - rv = -11; - } + clib_memcpy_fast (&session->transport.lcl_ip.ip6, ep->ip, + 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, + session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &session->transport.lcl_ip, + session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (session->transport.lcl_port), + session->session_type ? "UDP" : "TCP"); + vcl_evt (VCL_EVT_BIND, session); + + if (session->session_type == VPPCOM_PROTO_UDP) + vppcom_session_listen (session_handle, 10); - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_RESET_SESSION_REPLY); - rmp->retval = htonl (rv); - rmp->handle = mp->handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp); + return VPPCOM_OK; } -static void -vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp) +int +vppcom_session_listen (uint32_t listen_sh, uint32_t q_len) { - vppcom_main_t *vcm = &vppcom_main; - session_t *session; - u32 session_index; - svm_fifo_t *rx_fifo, *tx_fifo; - u8 is_cut_thru = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *listen_session = 0; + u64 listen_vpp_handle; int rv; - if (mp->retval) - { - clib_warning ("[%d] connect failed: %U", vcm->my_pid, format_api_error, - ntohl (mp->retval)); - return; - } + listen_session = vcl_session_get_w_handle (wrk, listen_sh); + if (!listen_session) + return VPPCOM_EBADFD; - session_index = mp->context; - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] session_index = %d 0x%08x", vcm->my_pid, - session_index, session_index); + if (q_len == 0 || q_len == ~0) + q_len = vcm->cfg.listen_queue_size; - clib_spinlock_lock (&vcm->sessions_lockp); - if (pool_is_free_index (vcm->sessions, session_index)) + if (listen_session->is_vep) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] invalid session, sid %d is closed!", - vcm->my_pid, session_index); - return; + clib_warning ("VCL<%d>: ERROR: sid %u: cannot listen on an " + "epoll session!", getpid (), listen_sh); + return VPPCOM_EBADFD; } - /* We've been redirected */ - if (mp->segment_name_length > 0) + listen_vpp_handle = listen_session->vpp_handle; + if (listen_session->session_state & STATE_LISTEN) { - static svm_fifo_segment_create_args_t _a; - svm_fifo_segment_create_args_t *a = &_a; - - is_cut_thru = 1; - memset (a, 0, sizeof (*a)); - a->segment_name = (char *) mp->segment_name; - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] cut-thru segment: %s", vcm->my_pid, - a->segment_name); - rv = svm_fifo_segment_attach (a); - vec_reset_length (a->new_segment_indices); - if (PREDICT_FALSE (rv)) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - clib_warning ("[%d] sm_fifo_segment_attach ('%s') failed", - vcm->my_pid, a->segment_name); - return; - } + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: already in listen state!", + getpid (), listen_vpp_handle, listen_sh); + return VPPCOM_OK; } + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: sending VPP bind+listen " + "request...", getpid (), listen_vpp_handle, listen_sh); + /* - * Setup session + * Send listen request to vpp and wait for reply */ - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] client sid %d", vcm->my_pid, session_index); + vppcom_send_bind_sock (listen_session); + rv = vppcom_wait_for_session_state_change (listen_session->session_index, + STATE_LISTEN, + vcm->cfg.session_timeout); - session = pool_elt_at_index (vcm->sessions, session_index); - session->is_cut_thru = is_cut_thru; - session->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address, - unix_shared_memory_queue_t *); + if (PREDICT_FALSE (rv)) + { + listen_session = vcl_session_get_w_handle (wrk, listen_sh); + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: bind+listen failed! " + "returning %d (%s)", getpid (), listen_session->vpp_handle, + listen_sh, rv, vppcom_retval_str (rv)); + return rv; + } - rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); - rx_fifo->client_session_index = session_index; - tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); - tx_fifo->client_session_index = session_index; + return VPPCOM_OK; +} - session->server_rx_fifo = rx_fifo; - session->server_tx_fifo = tx_fifo; - session->vpp_session_handle = mp->handle; - session->state = STATE_CONNECT; +static int +validate_args_session_accept_ (vcl_worker_t * wrk, + vcl_session_t * listen_session) +{ + /* Input validation - expects spinlock on sessions_lockp */ + if (listen_session->is_vep) + { + clib_warning ("VCL<%d>: ERROR: sid %u: cannot accept on an " + "epoll session!", getpid (), + listen_session->session_index); + return VPPCOM_EBADFD; + } - /* Add it to lookup table */ - hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + if (listen_session->session_state != STATE_LISTEN) + { + 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)); + return VPPCOM_EBADFD; + } + return VPPCOM_OK; } -static void -vppcom_send_connect_sock (session_t * session, u32 session_index) -{ - vppcom_main_t *vcm = &vppcom_main; - vl_api_connect_sock_t *cmp; +int +vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, + uint32_t flags) +{ + u32 client_session_index = ~0, listen_session_index; + vcl_worker_t *wrk = vcl_worker_get_current (); + 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; + int rv; - /* Assumes caller as acquired the spinlock: vcm->sessions_lockp */ - session->is_server = 0; - cmp = vl_msg_api_alloc (sizeof (*cmp)); - memset (cmp, 0, sizeof (*cmp)); - cmp->_vl_msg_id = ntohs (VL_API_CONNECT_SOCK); - cmp->client_index = vcm->my_client_index; - cmp->context = session_index; + listen_session = vcl_session_get_w_handle (wrk, listen_session_handle); + if (!listen_session) + return VPPCOM_EBADFD; - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] session_index = %d 0x%08x", - vcm->my_pid, session_index, session_index); + listen_session_index = listen_session->session_index; + if ((rv = validate_args_session_accept_ (wrk, listen_session))) + return rv; - cmp->vrf = session->vrf; - cmp->is_ip4 = session->peer_addr.is_ip4; - clib_memcpy (cmp->ip, &session->peer_addr.ip46, sizeof (cmp->ip)); - cmp->port = session->peer_port; - cmp->proto = session->proto; - clib_memcpy (cmp->options, session->options, sizeof (cmp->options)); - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & cmp); -} + if (clib_fifo_elts (listen_session->accept_evts_fifo)) + { + clib_fifo_sub2 (listen_session->accept_evts_fifo, evt); + accepted_msg = evt->accepted_msg; + goto handle; + } -static int -vppcom_send_disconnect (u32 session_index) -{ - vppcom_main_t *vcm = &vppcom_main; - vl_api_disconnect_session_t *dmp; - session_t *session = 0; - int rv; + 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; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) + while (1) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - return rv; + 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); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); + continue; + } + clib_memcpy_fast (&accepted_msg, e->data, sizeof (accepted_msg)); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); + break; } - dmp = vl_msg_api_alloc (sizeof (*dmp)); - memset (dmp, 0, sizeof (*dmp)); - dmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION); - dmp->client_index = vcm->my_client_index; - dmp->handle = session->vpp_session_handle; - clib_spinlock_unlock (&vcm->sessions_lockp); - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & dmp); - return VPPCOM_OK; -} +handle: -static void -vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_reply_t * mp) -{ - vppcom_main_t *vcm = &vppcom_main; - session_t *session = 0; - int rv; + client_session_index = vcl_session_accepted_handler (wrk, &accepted_msg); + listen_session = vcl_session_get (wrk, listen_session_index); + client_session = vcl_session_get (wrk, client_session_index); - if (mp->retval) - clib_warning ("[%d] bind failed: %U", vcm->my_pid, format_api_error, - ntohl (mp->retval)); + if (flags & O_NONBLOCK) + VCL_SESS_ATTR_SET (client_session->attr, VCL_SESS_ATTR_NONBLOCK); - ASSERT (vcm->bind_session_index != ~0); + listen_vpp_handle = listen_session->vpp_handle; + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: Got a client request! " + "vpp handle 0x%llx, sid %u, flags %d, is_nonblocking %u", + getpid (), 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)); - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (vcm->bind_session_index, &session); - if (rv == VPPCOM_OK) + if (ep) { - session->vpp_session_handle = mp->handle; - hash_set (vcm->session_index_by_vpp_handles, mp->handle, - vcm->bind_session_index); - session->state = mp->retval ? STATE_FAILED : STATE_LISTEN; - vcm->bind_session_index = ~0; + ep->is_ip4 = client_session->transport.is_ip4; + ep->port = client_session->transport.rmt_port; + if (client_session->transport.is_ip4) + clib_memcpy_fast (ep->ip, &client_session->transport.rmt_ip.ip4, + sizeof (ip4_address_t)); + else + clib_memcpy_fast (ep->ip, &client_session->transport.rmt_ip.ip6, + sizeof (ip6_address_t)); } - clib_spinlock_unlock (&vcm->sessions_lockp); + + 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, "VCL<%d>: vpp handle 0x%llx, sid %u: accepted vpp handle 0x%llx, " + "sid %u connection from peer %s address %U port %u to local %s " + "address %U port %u", getpid (), listen_vpp_handle, + listen_session_handle, client_session->vpp_handle, + client_session_index, + client_session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &client_session->transport.rmt_ip, + client_session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (client_session->transport.rmt_port), + client_session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &client_session->transport.lcl_ip, + client_session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (client_session->transport.lcl_port)); + vcl_evt (VCL_EVT_ACCEPT, client_session, listen_session, + client_session_index); + + return vcl_session_handle (client_session); } -static void -vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp) +int +vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) { - vppcom_main_t *vcm = &vppcom_main; - session_t *session = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; + u32 session_index; int rv; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (vcm->bind_session_index, &session); - if (rv == VPPCOM_OK) + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + session_index = session->session_index; + + if (PREDICT_FALSE (session->is_vep)) { - if ((VPPCOM_DEBUG > 1) && (mp->retval)) - clib_warning ("[%d] unbind failed: %U", vcm->my_pid, format_api_error, - ntohl (mp->retval)); + clib_warning ("VCL<%d>: ERROR: sid %u: cannot " + "connect on an epoll session!", getpid (), + session_handle); + return VPPCOM_EBADFD; + } - vcm->bind_session_index = ~0; - session->state = STATE_START; + if (PREDICT_FALSE (session->session_state & CLIENT_STATE_OPEN)) + { + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: session already " + "connected to %s %U port %d proto %s, state 0x%x (%s)", + getpid (), session->vpp_handle, session_handle, + 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), + session->session_type ? "UDP" : "TCP", session->session_state, + vppcom_session_state_str (session->session_state)); + return VPPCOM_OK; } - clib_spinlock_unlock (&vcm->sessions_lockp); -} -u8 * -format_ip4_address (u8 * s, va_list * args) -{ - u8 *a = va_arg (*args, u8 *); - return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]); -} + 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)); + session->transport.rmt_port = server_ep->port; + + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: connecting to server %s %U " + "port %d proto %s", + getpid (), session->vpp_handle, session_handle, + 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), + session->session_type ? "UDP" : "TCP"); -u8 * -format_ip6_address (u8 * s, va_list * args) -{ - ip6_address_t *a = va_arg (*args, ip6_address_t *); - u32 i, i_max_n_zero, max_n_zeros, i_first_zero, n_zeros, last_double_colon; + /* + * Send connect request and wait for reply from vpp + */ + vppcom_send_connect_sock (session); + rv = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT, + vcm->cfg.session_timeout); - i_max_n_zero = ARRAY_LEN (a->as_u16); - max_n_zeros = 0; - i_first_zero = i_max_n_zero; - n_zeros = 0; - for (i = 0; i < ARRAY_LEN (a->as_u16); i++) + session = vcl_session_get (wrk, session_index); + + if (PREDICT_FALSE (rv)) { - u32 is_zero = a->as_u16[i] == 0; - if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16)) - { - i_first_zero = i; - n_zeros = 0; - } - n_zeros += is_zero; - if ((!is_zero && n_zeros > max_n_zeros) - || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros)) + if (VPPCOM_DEBUG > 0) { - i_max_n_zero = i_first_zero; - max_n_zeros = n_zeros; - i_first_zero = ARRAY_LEN (a->as_u16); - n_zeros = 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)); } } + else + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: connected!", + getpid (), session->vpp_handle, session_handle); - last_double_colon = 0; - for (i = 0; i < ARRAY_LEN (a->as_u16); i++) - { - if (i == i_max_n_zero && max_n_zeros > 1) - { - s = format (s, "::"); - i += max_n_zeros - 1; - last_double_colon = 1; - } - else - { - s = format (s, "%s%x", - (last_double_colon || i == 0) ? "" : ":", - clib_net_to_host_u16 (a->as_u16[i])); - last_double_colon = 0; - } - } - - return s; + return rv; } -/* Format an IP46 address. */ -u8 * -format_ip46_address (u8 * s, va_list * args) +static u8 +vcl_is_rx_evt_for_session (session_event_t * e, u32 sid, u8 is_ct) { - ip46_address_t *ip46 = va_arg (*args, ip46_address_t *); - ip46_type_t type = va_arg (*args, ip46_type_t); - int is_ip4 = 1; - - switch (type) - { - case IP46_TYPE_ANY: - is_ip4 = ip46_address_is_ip4 (ip46); - break; - case IP46_TYPE_IP4: - is_ip4 = 1; - break; - case IP46_TYPE_IP6: - is_ip4 = 0; - break; - } + 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); +} - return is_ip4 ? - format (s, "%U", format_ip4_address, &ip46->ip4) : - format (s, "%U", format_ip6_address, &ip46->ip6); +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)); } -static void -vl_api_accept_session_t_handler (vl_api_accept_session_t * mp) +static inline int +vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, + u8 peek) { - vppcom_main_t *vcm = &vppcom_main; - vl_api_accept_session_reply_t *rmp; - svm_fifo_t *rx_fifo, *tx_fifo; - session_t *session; - u32 session_index; - int rv = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + int n_read = 0, rv, is_nonblocking; + vcl_session_t *s = 0; + svm_fifo_t *rx_fifo; + svm_msg_q_msg_t msg; + session_event_t *e; + svm_msg_q_t *mq; + u8 is_ct; + + if (PREDICT_FALSE (!buf)) + return VPPCOM_EINVAL; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || s->is_vep)) + return VPPCOM_EBADFD; - if (!clib_fifo_free_elts (vcm->client_session_index_fifo)) + if (PREDICT_FALSE (!vcl_session_is_readable (s))) { - clib_warning ("[%d] client session queue is full!", vcm->my_pid); - rv = VNET_API_ERROR_QUEUE_FULL; - goto send_reply; + session_state_t state = s->session_state; + rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); + + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: %s session is not open! " + "state 0x%x (%s), returning %d (%s)", + getpid (), s->vpp_handle, session_handle, state, + vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); + return rv; } - if (VPPCOM_DEBUG > 1) + 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; + s->has_rx_evt = 0; + + if (svm_fifo_is_empty (rx_fifo)) { - u8 *ip_str = format (0, "%U", format_ip46_address, &mp->ip, mp->is_ip4); - clib_warning ("[%d] accepted session from: %s:%d", vcm->my_pid, ip_str, - clib_net_to_host_u16 (mp->port)); - vec_free (ip_str); - } + if (is_nonblocking) + { + svm_fifo_unset_event (rx_fifo); + return VPPCOM_EWOULDBLOCK; + } + while (svm_fifo_is_empty (rx_fifo)) + { + svm_fifo_unset_event (rx_fifo); + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) + svm_msg_q_wait (mq); + + svm_msg_q_sub_w_lock (mq, &msg); + e = svm_msg_q_msg_data (mq, &msg); + svm_msg_q_unlock (mq); + 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); + continue; + } + svm_msg_q_free_msg (mq, &msg); - clib_spinlock_lock (&vcm->sessions_lockp); - /* Allocate local session and set it up */ - pool_get (vcm->sessions, session); - memset (session, 0, sizeof (*session)); - session_index = session - vcm->sessions; + if (PREDICT_FALSE (s->session_state == STATE_CLOSE_ON_EMPTY)) + return 0; + } + } - rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); - rx_fifo->client_session_index = session_index; - tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); - tx_fifo->client_session_index = session_index; + if (s->is_dgram) + n_read = 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); - session->server_rx_fifo = rx_fifo; - session->server_tx_fifo = tx_fifo; - session->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address, - unix_shared_memory_queue_t *); - session->state = STATE_ACCEPT; - session->is_cut_thru = 0; - session->is_server = 1; - session->peer_port = mp->port; - session->peer_addr.is_ip4 = mp->is_ip4; - clib_memcpy (&session->peer_addr.ip46, mp->ip, - sizeof (session->peer_addr.ip46)); + if (svm_fifo_is_empty (rx_fifo)) + svm_fifo_unset_event (rx_fifo); - /* Add it to lookup table */ - hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index); + if (is_ct && svm_fifo_want_tx_evt (rx_fifo)) + { + svm_fifo_set_want_tx_evt (s->rx_fifo, 0); + app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo, SESSION_IO_EVT_CT_RX, + SVM_Q_WAIT); + } - clib_fifo_add1 (vcm->client_session_index_fifo, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + VDBG (2, "VCL<%d>: vpp handle 0x%llx, sid %u: read %d bytes from (%p)", + getpid (), s->vpp_handle, session_handle, n_read, rx_fifo); - /* - * Send accept reply to vpp - */ -send_reply: - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_ACCEPT_SESSION_REPLY); - rmp->retval = htonl (rv); - rmp->handle = mp->handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp); + return n_read; } -/* - * Acting as server for redirected connect requests - */ -static void -vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp) +int +vppcom_session_read (uint32_t session_handle, void *buf, size_t n) { - static svm_fifo_segment_create_args_t _a; - svm_fifo_segment_create_args_t *a = &_a; - vppcom_main_t *vcm = &vppcom_main; - u32 session_index; - svm_fifo_segment_private_t *seg; - unix_shared_memory_queue_t *client_q; - vl_api_connect_session_reply_t *rmp; - session_t *session = 0; - int rv = 0; - svm_fifo_t *rx_fifo; - svm_fifo_t *tx_fifo; - unix_shared_memory_queue_t *event_q = 0; - - clib_spinlock_lock (&vcm->sessions_lockp); - if (!clib_fifo_free_elts (vcm->client_session_index_fifo)) - { - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] client session queue is full!", vcm->my_pid); - rv = VNET_API_ERROR_QUEUE_FULL; - clib_spinlock_unlock (&vcm->sessions_lockp); - goto send_reply; - } - - /* Create the segment */ - memset (a, 0, sizeof (*a)); - a->segment_name = (char *) format ((u8 *) a->segment_name, "%d:segment%d%c", - vcm->my_pid, vcm->unique_segment_index++, - 0); - a->segment_size = vcm->cfg.segment_size; - a->preallocated_fifo_pairs = vcm->cfg.preallocated_fifo_pairs; - a->rx_fifo_size = vcm->cfg.rx_fifo_size; - a->tx_fifo_size = vcm->cfg.tx_fifo_size; - - rv = svm_fifo_segment_create (a); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] svm_fifo_segment_create ('%s') failed", - vcm->my_pid, a->segment_name); - vec_reset_length (a->new_segment_indices); - rv = VNET_API_ERROR_URI_FIFO_CREATE_FAILED; - goto send_reply; - } - - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] created segment '%s'", vcm->my_pid, a->segment_name); - - pool_get (vcm->sessions, session); - memset (session, 0, sizeof (*session)); - session_index = session - vcm->sessions; - - session->sm_seg_index = a->new_segment_indices[0]; - vec_reset_length (a->new_segment_indices); - - seg = svm_fifo_segment_get_segment (session->sm_seg_index); - rx_fifo = session->server_rx_fifo = - svm_fifo_segment_alloc_fifo (seg, vcm->cfg.rx_fifo_size, - FIFO_SEGMENT_RX_FREELIST); - if (PREDICT_FALSE (!session->server_rx_fifo)) - { - svm_fifo_segment_delete (seg); - clib_warning ("[%d] rx fifo alloc failed, size %ld (0x%lx)", - vcm->my_pid, vcm->cfg.rx_fifo_size, - vcm->cfg.rx_fifo_size); - rv = VNET_API_ERROR_URI_FIFO_CREATE_FAILED; - clib_spinlock_unlock (&vcm->sessions_lockp); - goto send_reply; - } - - tx_fifo = session->server_tx_fifo = - svm_fifo_segment_alloc_fifo (seg, vcm->cfg.tx_fifo_size, - FIFO_SEGMENT_TX_FREELIST); - if (PREDICT_FALSE (!session->server_tx_fifo)) - { - svm_fifo_segment_delete (seg); - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] tx fifo alloc failed, size %ld (0x%lx)", - vcm->my_pid, vcm->cfg.tx_fifo_size, - vcm->cfg.tx_fifo_size); - rv = VNET_API_ERROR_URI_FIFO_CREATE_FAILED; - clib_spinlock_unlock (&vcm->sessions_lockp); - goto send_reply; - } - - session->server_rx_fifo->master_session_index = session_index; - session->server_tx_fifo->master_session_index = session_index; - session->client_queue_address = mp->client_queue_address; - session->is_cut_thru = 1; - session->is_server = 1; - session->peer_port = mp->port; - session->peer_addr.is_ip4 = mp->is_ip4; - clib_memcpy (&session->peer_addr.ip46, mp->ip, - sizeof (session->peer_addr.ip46)); - { - void *oldheap; - ssvm_shared_header_t *sh = seg->ssvm.sh; - - ssvm_lock_non_recursive (sh, 1); - oldheap = ssvm_push_heap (sh); - event_q = session->vpp_event_queue = - unix_shared_memory_queue_init (vcm->cfg.event_queue_size, - sizeof (session_fifo_event_t), - vcm->my_pid, 0 /* signal not sent */ ); - ssvm_pop_heap (oldheap); - ssvm_unlock_non_recursive (sh); - } - - session->state = STATE_ACCEPT; - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] Connected cut-thru to client: sid %d", - vcm->my_pid, session_index); - clib_fifo_add1 (vcm->client_session_index_fifo, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - -send_reply: - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - - rmp->_vl_msg_id = ntohs (VL_API_CONNECT_SESSION_REPLY); - rmp->context = mp->context; - rmp->retval = htonl (rv); - rmp->segment_name_length = vec_len (a->segment_name); - clib_memcpy (rmp->segment_name, a->segment_name, vec_len (a->segment_name)); - vec_reset_length (a->segment_name); - - if (event_q) - { - rmp->vpp_event_queue_address = pointer_to_uword (event_q); - rmp->server_rx_fifo = pointer_to_uword (rx_fifo); - rmp->server_tx_fifo = pointer_to_uword (tx_fifo); - } - client_q = - uword_to_pointer (mp->client_queue_address, unix_shared_memory_queue_t *); - - ASSERT (client_q); - vl_msg_api_send_shmem (client_q, (u8 *) & rmp); + return (vppcom_session_read_internal (session_handle, buf, n, 0)); } -static void -vppcom_send_bind_sock (session_t * session) +static int +vppcom_session_peek (uint32_t session_handle, void *buf, int n) { - vppcom_main_t *vcm = &vppcom_main; - vl_api_bind_sock_t *bmp; - - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - session->is_server = 1; - bmp = vl_msg_api_alloc (sizeof (*bmp)); - memset (bmp, 0, sizeof (*bmp)); - - bmp->_vl_msg_id = ntohs (VL_API_BIND_SOCK); - bmp->client_index = vcm->my_client_index; - bmp->context = htonl (0xfeedface); - bmp->vrf = session->vrf; - bmp->is_ip4 = session->lcl_addr.is_ip4; - clib_memcpy (bmp->ip, &session->lcl_addr.ip46, sizeof (bmp->ip)); - bmp->port = session->lcl_port; - bmp->proto = session->proto; - clib_memcpy (bmp->options, session->options, sizeof (bmp->options)); - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); + return (vppcom_session_read_internal (session_handle, buf, n, 1)); } -static void -vppcom_send_unbind_sock (u32 session_index) +int +vppcom_session_read_segments (uint32_t session_handle, + vppcom_data_segments_t ds) { - vppcom_main_t *vcm = &vppcom_main; - vl_api_unbind_sock_t *ump; - session_t *session = 0; - int rv; + vcl_worker_t *wrk = vcl_worker_get_current (); + int n_read = 0, rv, is_nonblocking; + vcl_session_t *s = 0; + svm_fifo_t *rx_fifo; + svm_msg_q_msg_t msg; + session_event_t *e; + svm_msg_q_t *mq; + u8 is_ct; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || s->is_vep)) + return VPPCOM_EBADFD; + + if (PREDICT_FALSE (!vcl_session_is_readable (s))) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - return; + session_state_t state = s->session_state; + rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); + return rv; } - ump = vl_msg_api_alloc (sizeof (*ump)); - memset (ump, 0, sizeof (*ump)); + 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; + s->has_rx_evt = 0; - ump->_vl_msg_id = ntohs (VL_API_UNBIND_SOCK); - ump->client_index = vcm->my_client_index; - ump->handle = session->vpp_session_handle; - clib_spinlock_unlock (&vcm->sessions_lockp); - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & ump); + if (svm_fifo_is_empty (rx_fifo)) + { + if (is_nonblocking) + { + svm_fifo_unset_event (rx_fifo); + return VPPCOM_EWOULDBLOCK; + } + while (svm_fifo_is_empty (rx_fifo)) + { + svm_fifo_unset_event (rx_fifo); + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) + svm_msg_q_wait (mq); + + svm_msg_q_sub_w_lock (mq, &msg); + e = svm_msg_q_msg_data (mq, &msg); + svm_msg_q_unlock (mq); + 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); + continue; + } + svm_msg_q_free_msg (mq, &msg); + + if (PREDICT_FALSE (s->session_state == STATE_CLOSE_ON_EMPTY)) + return 0; + } + } + + n_read = svm_fifo_segments (rx_fifo, (svm_fifo_segment_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; } -static int -vppcom_session_unbind_cut_thru (session_t * session) +void +vppcom_session_free_segments (uint32_t session_handle, + vppcom_data_segments_t ds) { - svm_fifo_segment_main_t *sm = &svm_fifo_segment_main; - svm_fifo_segment_private_t *seg; - int rv = VPPCOM_OK; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s; - seg = vec_elt_at_index (sm->segments, session->sm_seg_index); - svm_fifo_segment_free_fifo (seg, session->server_rx_fifo, - FIFO_SEGMENT_RX_FREELIST); - svm_fifo_segment_free_fifo (seg, session->server_tx_fifo, - FIFO_SEGMENT_TX_FREELIST); - svm_fifo_segment_delete (seg); + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || s->is_vep)) + return; - return rv; + svm_fifo_segments_free (s->rx_fifo, (svm_fifo_segment_t *) ds); } -static int -vppcom_session_unbind (u32 session_index) +static inline int +vppcom_session_read_ready (vcl_session_t * session) { - vppcom_main_t *vcm = &vppcom_main; - int rv; - - clib_spinlock_lock (&vcm->sessions_lockp); - if (PREDICT_FALSE (pool_is_free_index (vcm->sessions, session_index))) + /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ + if (PREDICT_FALSE (session->is_vep)) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); + clib_warning ("VCL<%d>: ERROR: sid %u: cannot read from an " + "epoll session!", getpid (), session->session_index); return VPPCOM_EBADFD; } - clib_spinlock_unlock (&vcm->sessions_lockp); - vcm->bind_session_index = session_index; - vppcom_send_unbind_sock (session_index); - rv = vppcom_wait_for_session_state_change (session_index, STATE_START, - vcm->cfg.session_timeout); - if (PREDICT_FALSE (rv)) + if (PREDICT_FALSE (!(session->session_state & (STATE_OPEN | STATE_LISTEN)))) { - vcm->bind_session_index = ~0; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] server unbind timed out, rv = %s (%d)", - vcm->my_pid, vppcom_retval_str (rv), rv); + 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; } - return VPPCOM_OK; -} -static int -vppcom_session_disconnect (u32 session_index) -{ - vppcom_main_t *vcm = &vppcom_main; - int rv; + if (session->session_state & STATE_LISTEN) + return clib_fifo_elts (session->accept_evts_fifo); - rv = vppcom_send_disconnect (session_index); - if (PREDICT_FALSE (rv)) - return rv; + return svm_fifo_max_dequeue (session->rx_fifo); +} - rv = vppcom_wait_for_session_state_change (session_index, STATE_DISCONNECT, - vcm->cfg.session_timeout); - if (PREDICT_FALSE (rv)) +int +vppcom_data_segment_copy (void *buf, vppcom_data_segments_t ds, u32 max_bytes) +{ + u32 first_copy = clib_min (ds[0].len, max_bytes); + clib_memcpy_fast (buf, ds[0].data, first_copy); + if (first_copy < max_bytes) { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] client disconnect timed out, rv = %s (%d)", - vcm->my_pid, vppcom_retval_str (rv), rv); - return rv; + clib_memcpy_fast (buf + first_copy, ds[1].data, + clib_min (ds[1].len, max_bytes - first_copy)); } - return VPPCOM_OK; + return 0; } -#define foreach_sock_msg \ -_(SESSION_ENABLE_DISABLE_REPLY, session_enable_disable_reply) \ -_(BIND_SOCK_REPLY, bind_sock_reply) \ -_(UNBIND_SOCK_REPLY, unbind_sock_reply) \ -_(ACCEPT_SESSION, accept_session) \ -_(CONNECT_SOCK, connect_sock) \ -_(CONNECT_SESSION_REPLY, connect_session_reply) \ -_(DISCONNECT_SESSION, disconnect_session) \ -_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \ -_(RESET_SESSION, reset_session) \ -_(APPLICATION_ATTACH_REPLY, application_attach_reply) \ -_(APPLICATION_DETACH_REPLY, application_detach_reply) \ -_(MAP_ANOTHER_SEGMENT, map_another_segment) - -static void -vppcom_api_hookup (void) +static u8 +vcl_is_tx_evt_for_session (session_event_t * e, u32 sid, u8 is_ct) { -#define _(N,n) \ - vl_msg_api_set_handlers(VL_API_##N, #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_sock_msg; -#undef _ + if (!is_ct) + return (e->event_type == FIFO_EVENT_APP_TX + && e->fifo->client_session_index == sid); + else + return (e->event_type == SESSION_IO_EVT_CT_RX); } -static void -vppcom_cfg_init (vppcom_cfg_t * vcl_cfg) -{ - ASSERT (vcl_cfg); +int +vppcom_session_write (uint32_t session_handle, void *buf, size_t n) +{ + 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; + session_evt_type_t et; + svm_msg_q_msg_t msg; + session_event_t *e; + svm_msg_q_t *mq; + u8 is_ct; + + if (PREDICT_FALSE (!buf)) + return VPPCOM_EINVAL; - vcl_cfg->heapsize = (256ULL << 20); - vcl_cfg->segment_baseva = 0x200000000ULL; - vcl_cfg->segment_size = (256 << 20); - vcl_cfg->add_segment_size = (128 << 20); - vcl_cfg->preallocated_fifo_pairs = 8; - vcl_cfg->rx_fifo_size = (1 << 20); - vcl_cfg->tx_fifo_size = (1 << 20); - vcl_cfg->event_queue_size = 2048; - vcl_cfg->listen_queue_size = CLIB_CACHE_LINE_BYTES / sizeof (u32); - vcl_cfg->app_timeout = 10 * 60.0; - vcl_cfg->session_timeout = 10 * 60.0; - vcl_cfg->accept_timeout = 60.0; -} + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s)) + return VPPCOM_EBADFD; -static void -vppcom_cfg_heapsize (char *conf_fname) -{ - vppcom_main_t *vcm = &vppcom_main; - vppcom_cfg_t *vcl_cfg = &vcm->cfg; - FILE *fp; - char inbuf[4096]; - int argc = 1; - char **argv = NULL; - char *arg = NULL; - char *p; - int i; - u8 *sizep; - u32 size; + 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); + + return VPPCOM_EBADFD; + } - fp = fopen (conf_fname, "r"); - if (fp == NULL) + if (PREDICT_FALSE (!(s->session_state & STATE_OPEN))) { - if (VPPCOM_DEBUG > 0) - fprintf (stderr, "open configuration file '%s' failed\n", conf_fname); - goto defaulted; + 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; } - argv = calloc (1, sizeof (char *)); - if (argv == NULL) - goto defaulted; - while (1) + tx_fifo = s->tx_fifo; + is_ct = vcl_session_is_ct (s); + 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)) { - if (fgets (inbuf, 4096, fp) == 0) - break; - p = strtok (inbuf, " \t\n"); - while (p != NULL) + if (is_nonblocking) + { + return VPPCOM_EWOULDBLOCK; + } + while (svm_fifo_is_full (tx_fifo)) { - if (*p == '#') - break; - argc++; - char **tmp = realloc (argv, argc * sizeof (char *)); - if (tmp == NULL) - goto defaulted; - argv = tmp; - arg = strndup (p, 1024); - if (arg == NULL) - goto defaulted; - argv[argc - 1] = arg; - p = strtok (NULL, " \t\n"); + svm_fifo_set_want_tx_evt (tx_fifo, 1); + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) + svm_msg_q_wait (mq); + + svm_msg_q_sub_w_lock (mq, &msg); + e = svm_msg_q_msg_data (mq, &msg); + svm_msg_q_unlock (mq); + + 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); } } - fclose (fp); - fp = NULL; + ASSERT (FIFO_EVENT_APP_TX + 1 == SESSION_IO_EVT_CT_TX); + et = FIFO_EVENT_APP_TX + vcl_session_is_ct (s); + if (s->is_dgram) + n_write = app_send_dgram_raw (tx_fifo, &s->transport, + s->vpp_evt_q, buf, n, et, SVM_Q_WAIT); + else + n_write = app_send_stream_raw (tx_fifo, s->vpp_evt_q, buf, n, et, + SVM_Q_WAIT); - char **tmp = realloc (argv, (argc + 1) * sizeof (char *)); - if (tmp == NULL) - goto defaulted; - argv = tmp; - argv[argc] = NULL; + ASSERT (n_write > 0); - /* - * Look for and parse the "heapsize" config parameter. - * Manual since none of the clib infra has been bootstrapped yet. - * - * Format: heapsize [mM][gG] - */ + VDBG (2, "VCL<%d>: vpp handle 0x%llx, sid %u: wrote %d bytes", getpid (), + s->vpp_handle, session_handle, n_write); - for (i = 1; i < (argc - 1); i++) - { - if (!strncmp (argv[i], "heapsize", 8)) - { - sizep = (u8 *) argv[i + 1]; - size = 0; - while (*sizep >= '0' && *sizep <= '9') - { - size *= 10; - size += *sizep++ - '0'; - } - if (size == 0) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] parse error '%s %s', " - "using default heapsize %lld (0x%llx)", - vcm->my_pid, argv[i], argv[i + 1], - vcl_cfg->heapsize, vcl_cfg->heapsize); - goto defaulted; - } + return n_write; +} - if (*sizep == 'g' || *sizep == 'G') - vcl_cfg->heapsize = size << 30; - else if (*sizep == 'm' || *sizep == 'M') - vcl_cfg->heapsize = size << 20; - else - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] parse error '%s %s', " - "using default heapsize %lld (0x%llx)", - vcm->my_pid, argv[i], argv[i + 1], - vcl_cfg->heapsize, vcl_cfg->heapsize); - goto defaulted; - } - } +static vcl_session_t * +vcl_ct_session_get_from_fifo (vcl_worker_t * wrk, svm_fifo_t * f, u8 type) +{ + 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; } - -defaulted: - if (fp != NULL) - fclose (fp); - if (argv != NULL) - free (argv); - if (!clib_mem_init (0, vcl_cfg->heapsize)) - clib_warning ("[%d] vppcom heap allocation failure!", vcm->my_pid); - else if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] allocated vppcom heapsize %lld (0x%llx)", - vcm->my_pid, vcl_cfg->heapsize, vcl_cfg->heapsize); + 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 void -vppcom_cfg_read (char *conf_fname) +static inline int +vppcom_session_write_ready (vcl_session_t * session) { - vppcom_main_t *vcm = &vppcom_main; - vppcom_cfg_t *vcl_cfg = &vcm->cfg; - int fd; - unformat_input_t _input, *input = &_input; - unformat_input_t _line_input, *line_input = &_line_input; - u8 vc_cfg_input = 0; - u8 *chroot_path; - struct stat s; - u32 uid, gid; + /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ + if (PREDICT_FALSE (session->is_vep)) + { + clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " + "cannot write to an epoll session!", + getpid (), session->vpp_handle, session->session_index); + return VPPCOM_EBADFD; + } - fd = open (conf_fname, O_RDONLY); - if (fd < 0) + if (PREDICT_FALSE (session->session_state & STATE_LISTEN)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] open configuration file '%s' failed!", - vcm->my_pid, conf_fname); - goto file_done; + clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " + "cannot write to a listen session!", + getpid (), session->vpp_handle, session->session_index); + return VPPCOM_EBADFD; } - if (fstat (fd, &s) < 0) + if (PREDICT_FALSE (!(session->session_state & STATE_OPEN))) { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] failed to stat `%s'", vcm->my_pid, conf_fname); - goto file_done; + session_state_t state = session->session_state; + int rv; + + rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); + clib_warning ("VCL<%d>: ERROR: 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 (!(S_ISREG (s.st_mode) || S_ISLNK (s.st_mode))) + VDBG (3, "VCL<%d>: vpp handle 0x%llx, sid %u: peek %s (%p), ready = %d", + getpid (), session->vpp_handle, session->session_index, + session->tx_fifo, svm_fifo_max_enqueue (session->tx_fifo)); + + return svm_fifo_max_enqueue (session->tx_fifo); +} + +static inline int +vcl_mq_dequeue_batch (vcl_worker_t * wrk, svm_msg_q_t * mq) +{ + svm_msg_q_msg_t *msg; + u32 n_msgs; + int i; + + n_msgs = svm_msg_q_size (mq); + for (i = 0; i < n_msgs; i++) { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] not a regular file `%s'", vcm->my_pid, - conf_fname); - goto file_done; + vec_add2 (wrk->mq_msg_vector, msg, 1); + svm_msg_q_sub_w_lock (mq, msg); } + return n_msgs; +} - unformat_init_clib_file (input, fd); +#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; \ + } \ + +static void +vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, + unsigned long n_bits, unsigned long *read_map, + unsigned long *write_map, + unsigned long *except_map, u32 * bits_set) +{ + session_disconnected_msg_t *disconnected_msg; + session_connected_msg_t *connected_msg; + session_accepted_msg_t *accepted_msg; + vcl_session_msg_t *vcl_msg; + vcl_session_t *session; + u64 handle; + u32 sid; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + switch (e->event_type) { - (void) unformat_user (input, unformat_line_input, line_input); - unformat_skip_white_space (line_input); + case FIFO_EVENT_APP_RX: + vcl_fifo_rx_evt_valid_or_break (e->fifo); + sid = e->fifo->client_session_index; + session = vcl_session_get (wrk, sid); + if (!session) + break; + if (sid < n_bits && read_map) + { + clib_bitmap_set_no_check (read_map, sid, 1); + *bits_set += 1; + } + break; + case FIFO_EVENT_APP_TX: + sid = e->fifo->client_session_index; + session = vcl_session_get (wrk, sid); + if (!session) + break; + if (sid < n_bits && write_map) + { + clib_bitmap_set_no_check (write_map, sid, 1); + *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); + if (!session) + break; + sid = session->session_index; + if (sid < n_bits && read_map) + { + clib_bitmap_set_no_check (read_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_IO_EVT_CT_RX: + session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 1); + if (!session) + break; + sid = session->session_index; + if (sid < n_bits && write_map) + { + clib_bitmap_set_no_check (write_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_CTRL_EVT_ACCEPTED: + accepted_msg = (session_accepted_msg_t *) e->data; + handle = accepted_msg->listener_handle; + session = vcl_session_table_lookup_listener (wrk, handle); + if (!session) + { + clib_warning ("VCL<%d>: ERROR: couldn't find listen session:" + "listener handle %llx", getpid (), handle); + break; + } - if (unformat (line_input, "vcl {")) + clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); + vcl_msg->accepted_msg = *accepted_msg; + sid = session->session_index; + if (sid < n_bits && read_map) { - vc_cfg_input = 1; - continue; + clib_bitmap_set_no_check (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; + sid = vcl_session_index_from_vpp_handle (wrk, disconnected_msg->handle); + if (sid < n_bits && except_map) + { + clib_bitmap_set_no_check (except_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_CTRL_EVT_RESET: + sid = vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + if (sid < n_bits && except_map) + { + clib_bitmap_set_no_check (except_map, sid, 1); + *bits_set += 1; + } + break; + default: + clib_warning ("unhandled: %u", e->event_type); + break; + } +} + +static int +vcl_select_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, + unsigned long n_bits, unsigned long *read_map, + unsigned long *write_map, unsigned long *except_map, + double time_to_wait, u32 * bits_set) +{ + svm_msg_q_msg_t *msg; + session_event_t *e; + u32 i; + + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) + { + if (*bits_set) + { + svm_msg_q_unlock (mq); + return 0; } - if (vc_cfg_input) + if (!time_to_wait) { - if (unformat (line_input, "heapsize %s", &chroot_path)) - { - vec_terminate_c_string (chroot_path); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured heapsize %s, " - "actual heapsize %lld (0x%llx)", - vcm->my_pid, chroot_path, vcl_cfg->heapsize, - vcl_cfg->heapsize); - vec_free (chroot_path); - } - else if (unformat (line_input, "api-prefix %s", &chroot_path)) - { - vec_terminate_c_string (chroot_path); - vl_set_memory_root_path ((char *) chroot_path); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured api-prefix %s", - vcm->my_pid, chroot_path); - chroot_path = 0; /* Don't vec_free() it! */ - } - else if (unformat (line_input, "uid %d", &uid)) + svm_msg_q_unlock (mq); + return 0; + } + else if (time_to_wait < 0) + { + svm_msg_q_wait (mq); + } + else + { + if (svm_msg_q_timedwait (mq, time_to_wait)) { - vl_set_memory_uid (uid); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured uid %d", vcm->my_pid, uid); - } - else if (unformat (line_input, "gid %d", &gid)) - { - vl_set_memory_gid (gid); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured gid %d", vcm->my_pid, gid); - } - else if (unformat (line_input, "segment-baseva 0x%lx", - &vcl_cfg->segment_baseva)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured segment_baseva 0x%lx", - vcm->my_pid, vcl_cfg->segment_baseva); - } - else if (unformat (line_input, "segment-size 0x%lx", - &vcl_cfg->segment_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured segment_size 0x%lx (%ld)", - vcm->my_pid, vcl_cfg->segment_size, - vcl_cfg->segment_size); - } - else if (unformat (line_input, "segment-size %ld", - &vcl_cfg->segment_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured segment_size %ld (0x%lx)", - vcm->my_pid, vcl_cfg->segment_size, - vcl_cfg->segment_size); - } - else if (unformat (line_input, "add-segment-size 0x%lx", - &vcl_cfg->add_segment_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning - ("[%d] configured add_segment_size 0x%lx (%ld)", - vcm->my_pid, vcl_cfg->add_segment_size, - vcl_cfg->add_segment_size); - } - else if (unformat (line_input, "add-segment-size %ld", - &vcl_cfg->add_segment_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning - ("[%d] configured add_segment_size %ld (0x%lx)", - vcm->my_pid, vcl_cfg->add_segment_size, - vcl_cfg->add_segment_size); - } - else if (unformat (line_input, "preallocated-fifo-pairs %d", - &vcl_cfg->preallocated_fifo_pairs)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured preallocated_fifo_pairs " - "%d (0x%x)", vcm->my_pid, - vcl_cfg->preallocated_fifo_pairs, - vcl_cfg->preallocated_fifo_pairs); - } - else if (unformat (line_input, "rx-fifo-size 0x%lx", - &vcl_cfg->rx_fifo_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured rx_fifo_size 0x%lx (%ld)", - vcm->my_pid, vcl_cfg->rx_fifo_size, - vcl_cfg->rx_fifo_size); - } - else if (unformat (line_input, "rx-fifo-size %ld", - &vcl_cfg->rx_fifo_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured rx_fifo_size %ld (0x%lx)", - vcm->my_pid, vcl_cfg->rx_fifo_size, - vcl_cfg->rx_fifo_size); - } - else if (unformat (line_input, "tx-fifo-size 0x%lx", - &vcl_cfg->tx_fifo_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured tx_fifo_size 0x%lx (%ld)", - vcm->my_pid, vcl_cfg->tx_fifo_size, - vcl_cfg->tx_fifo_size); - } - else if (unformat (line_input, "tx-fifo-size %ld", - &vcl_cfg->tx_fifo_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured tx_fifo_size %ld (0x%lx)", - vcm->my_pid, vcl_cfg->tx_fifo_size, - vcl_cfg->tx_fifo_size); - } - else if (unformat (line_input, "event-queue-size 0x%lx", - &vcl_cfg->event_queue_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured event_queue_size 0x%lx (%ld)", - vcm->my_pid, vcl_cfg->event_queue_size, - vcl_cfg->event_queue_size); - } - else if (unformat (line_input, "event-queue-size %ld", - &vcl_cfg->event_queue_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured event_queue_size %ld (0x%lx)", - vcm->my_pid, vcl_cfg->event_queue_size, - vcl_cfg->event_queue_size); - } - else if (unformat (line_input, "listen-queue-size 0x%lx", - &vcl_cfg->listen_queue_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured listen_queue_size 0x%lx (%ld)", - vcm->my_pid, vcl_cfg->listen_queue_size, - vcl_cfg->listen_queue_size); - } - else if (unformat (line_input, "listen-queue-size %ld", - &vcl_cfg->listen_queue_size)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured listen_queue_size %ld (0x%lx)", - vcm->my_pid, vcl_cfg->listen_queue_size, - vcl_cfg->listen_queue_size); - } - else if (unformat (line_input, "app-timeout %f", - &vcl_cfg->app_timeout)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured app_timeout %f", - vcm->my_pid, vcl_cfg->app_timeout); - } - else if (unformat (line_input, "session-timeout %f", - &vcl_cfg->session_timeout)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured session_timeout %f", - vcm->my_pid, vcl_cfg->session_timeout); - } - else if (unformat (line_input, "accept-timeout %f", - &vcl_cfg->accept_timeout)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured accept_timeout %f", - vcm->my_pid, vcl_cfg->accept_timeout); - } - else if (unformat (line_input, "session-scope-local")) - { - vcl_cfg->session_scope_local = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured session_scope_local (%d)", - vcm->my_pid, vcl_cfg->session_scope_local); - } - else if (unformat (line_input, "session-scope-global")) - { - vcl_cfg->session_scope_global = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured session_scope_global (%d)", - vcm->my_pid, vcl_cfg->session_scope_global); - } - else if (unformat (line_input, "namespace-secret 0x%lx", - &vcl_cfg->namespace_secret)) - { - if (VPPCOM_DEBUG > 0) - clib_warning - ("[%d] configured namespace_secret 0x%lx (%lu)", - vcm->my_pid, vcl_cfg->namespace_secret, - vcl_cfg->namespace_secret); - } - else if (unformat (line_input, "namespace-secret %lu", - &vcl_cfg->namespace_secret)) - { - if (VPPCOM_DEBUG > 0) - clib_warning - ("[%d] configured namespace_secret %lu (0x%lx)", - vcm->my_pid, vcl_cfg->namespace_secret, - vcl_cfg->namespace_secret); - } - else if (unformat (line_input, "namespace-id %v", - &vcl_cfg->namespace_id)) - { - vl_api_application_attach_t *mp; - u32 max_nsid_vec_len = sizeof (mp->namespace_id) - 1; - u32 nsid_vec_len = vec_len (vcl_cfg->namespace_id); - if (nsid_vec_len > max_nsid_vec_len) - { - _vec_len (vcl_cfg->namespace_id) = max_nsid_vec_len; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured namespace_id is too long," - " truncated to %d characters!", vcm->my_pid, - max_nsid_vec_len); - } - - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured namespace_id %v", - vcm->my_pid, vcl_cfg->namespace_id); - } - else if (unformat (line_input, "}")) - { - vc_cfg_input = 0; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] completed parsing vppcom config!", - vcm->my_pid); - goto input_done; - } - else - { - if (line_input->buffer[line_input->index] != '#') - { - clib_warning ("[%d] Unknown vppcom config option: '%s'", - vcm->my_pid, (char *) - &line_input->buffer[line_input->index]); - } + svm_msg_q_unlock (mq); + return 0; } } } + vcl_mq_dequeue_batch (wrk, mq); + svm_msg_q_unlock (mq); -input_done: - unformat_free (input); - -file_done: - if (fd >= 0) - close (fd); + for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) + { + msg = vec_elt_at_index (wrk->mq_msg_vector, i); + e = svm_msg_q_msg_data (mq, msg); + vcl_select_handle_mq_event (wrk, e, n_bits, read_map, write_map, + except_map, bits_set); + svm_msg_q_free_msg (mq, msg); + } + vec_reset_length (wrk->mq_msg_vector); + return *bits_set; } -/* - * VPPCOM Public API functions - */ -int -vppcom_app_create (char *app_name) +static int +vppcom_select_condvar (vcl_worker_t * wrk, unsigned long n_bits, + unsigned long *read_map, unsigned long *write_map, + unsigned long *except_map, double time_to_wait, + u32 * bits_set) { - vppcom_main_t *vcm = &vppcom_main; - vppcom_cfg_t *vcl_cfg = &vcm->cfg; - u8 *heap; - mheap_t *h; - int rv; - - if (!vcm->init) - { - char *conf_fname; - char *env_var_str; - - vcm->init = 1; - vcm->my_pid = getpid (); - clib_fifo_validate (vcm->client_session_index_fifo, - vcm->cfg.listen_queue_size); - vppcom_cfg_init (vcl_cfg); - conf_fname = getenv (VPPCOM_ENV_CONF); - if (!conf_fname) - { - conf_fname = VPPCOM_CONF_DEFAULT; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] getenv '%s' failed!", vcm->my_pid, - VPPCOM_ENV_CONF); - } - vppcom_cfg_heapsize (conf_fname); - vppcom_cfg_read (conf_fname); - env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_ID); - if (env_var_str) - { - u32 ns_id_vec_len = strlen (env_var_str); - - vec_reset_length (vcm->cfg.namespace_id); - vec_validate (vcm->cfg.namespace_id, ns_id_vec_len - 1); - clib_memcpy (vcm->cfg.namespace_id, env_var_str, ns_id_vec_len); - - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured namespace_id (%v) from " - VPPCOM_ENV_APP_NAMESPACE_ID "!", vcm->my_pid, - vcm->cfg.namespace_id); - } - env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_SECRET); - if (env_var_str) - { - u64 tmp; - if (sscanf (env_var_str, "%lu", &tmp) != 1) - clib_warning ("[%d] Invalid namespace secret specified in " - "the environment variable " - VPPCOM_ENV_APP_NAMESPACE_SECRET - " (%s)!\n", vcm->my_pid, env_var_str); - else - { - vcm->cfg.namespace_secret = tmp; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured namespace secret (%lu) from " - VPPCOM_ENV_APP_NAMESPACE_ID "!", vcm->my_pid, - vcm->cfg.namespace_secret); - } - } - if (getenv (VPPCOM_ENV_SESSION_SCOPE_LOCAL)) - { - vcm->cfg.session_scope_local = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured session_scope_local (%u) from " - VPPCOM_ENV_SESSION_SCOPE_LOCAL "!", vcm->my_pid, - vcm->cfg.session_scope_local); - } - if (getenv (VPPCOM_ENV_SESSION_SCOPE_GLOBAL)) - { - vcm->cfg.session_scope_global = 1; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] configured session_scope_global (%u) from " - VPPCOM_ENV_SESSION_SCOPE_GLOBAL "!", vcm->my_pid, - vcm->cfg.session_scope_global); - } - - vcm->bind_session_index = ~0; - vcm->main_cpu = os_get_thread_index (); - heap = clib_mem_get_per_cpu_heap (); - h = mheap_header (heap); - - /* make the main heap thread-safe */ - h->flags |= MHEAP_FLAG_THREAD_SAFE; - - vcm->session_index_by_vpp_handles = hash_create (0, sizeof (uword)); - - clib_time_init (&vcm->clib_time); - vppcom_init_error_string_table (); - svm_fifo_segment_init (vcl_cfg->segment_baseva, - 20 /* timeout in secs */ ); - clib_spinlock_init (&vcm->sessions_lockp); - vppcom_api_hookup (); - } + double total_wait = 0, wait_slice; + vcl_cut_through_registration_t *cr; - if (vcm->my_client_index == ~0) + time_to_wait = (time_to_wait == -1) ? 10e9 : time_to_wait; + wait_slice = wrk->cut_through_registrations ? 10e-6 : time_to_wait; + do { - vcm->app_state = STATE_APP_START; - rv = vppcom_connect_to_vpp (app_name); - if (rv) - { - clib_warning ("[%d] couldn't connect to VPP.", vcm->my_pid); - return rv; - } - - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sending session enable", vcm->my_pid); - - rv = vppcom_app_session_enable (); - if (rv) - { - clib_warning ("[%d] vppcom_app_session_enable() failed!", - vcm->my_pid); - return rv; - } - - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sending app attach", vcm->my_pid); + 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); - rv = vppcom_app_attach (); - if (rv) - { - clib_warning ("[%d] vppcom_app_attach() failed!", vcm->my_pid); - return rv; - } + vcl_select_handle_mq (wrk, wrk->app_event_queue, n_bits, read_map, + write_map, except_map, time_to_wait, bits_set); + total_wait += wait_slice; + if (*bits_set) + return *bits_set; } + while (total_wait < time_to_wait); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] app_name '%s', my_client_index %d (0x%x)", - vcm->my_pid, app_name, vcm->my_client_index, - vcm->my_client_index); - - return VPPCOM_OK; + return 0; } -void -vppcom_app_destroy (void) +static int +vppcom_select_eventfd (vcl_worker_t * wrk, unsigned long n_bits, + unsigned long *read_map, unsigned long *write_map, + unsigned long *except_map, double time_to_wait, + u32 * bits_set) { - vppcom_main_t *vcm = &vppcom_main; - int rv; - - if (vcm->my_client_index == ~0) - return; - - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] detaching from VPP, my_client_index %d (0x%x)", - vcm->my_pid, vcm->my_client_index, vcm->my_client_index); + vcl_mq_evt_conn_t *mqc; + int __clib_unused n_read; + int n_mq_evts, i; + u64 buf; - vppcom_app_detach (); - rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); - if (PREDICT_FALSE (rv)) + vec_validate (wrk->mq_events, pool_elts (wrk->mq_evt_conns)); + n_mq_evts = epoll_wait (wrk->mqs_epfd, wrk->mq_events, + vec_len (wrk->mq_events), time_to_wait); + for (i = 0; i < n_mq_evts; i++) { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] application detach timed out, rv = %s (%d)", - vcm->my_pid, vppcom_retval_str (rv), rv); + mqc = vcl_mq_evt_conn_get (wrk, wrk->mq_events[i].data.u32); + n_read = read (mqc->mq_fd, &buf, sizeof (buf)); + vcl_select_handle_mq (wrk, mqc->mq, n_bits, read_map, write_map, + except_map, 0, bits_set); } - vl_client_disconnect_from_vlib (); - vcm->my_client_index = ~0; - vcm->app_state = STATE_APP_START; + + return (n_mq_evts > 0 ? (int) *bits_set : 0); } int -vppcom_session_create (u32 vrf, u8 proto, u8 is_nonblocking) +vppcom_select (unsigned long n_bits, unsigned long *read_map, + unsigned long *write_map, unsigned long *except_map, + double time_to_wait) { - vppcom_main_t *vcm = &vppcom_main; - session_t *session; - u32 session_index; + 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; - clib_spinlock_lock (&vcm->sessions_lockp); - pool_get (vcm->sessions, session); - memset (session, 0, sizeof (*session)); - session_index = session - vcm->sessions; - - session->vrf = vrf; - session->proto = proto; - session->state = STATE_START; - session->is_nonblocking = is_nonblocking ? 1 : 0; - clib_spinlock_unlock (&vcm->sessions_lockp); + ASSERT (sizeof (clib_bitmap_t) == sizeof (long int)); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid %d", vcm->my_pid, session_index); + if (n_bits && read_map) + { + clib_bitmap_validate (wrk->rd_bitmap, minbits); + clib_memcpy_fast (wrk->rd_bitmap, read_map, + vec_len (wrk->rd_bitmap) * sizeof (clib_bitmap_t)); + memset (read_map, 0, vec_len (wrk->rd_bitmap) * sizeof (clib_bitmap_t)); + } + if (n_bits && write_map) + { + clib_bitmap_validate (wrk->wr_bitmap, minbits); + clib_memcpy_fast (wrk->wr_bitmap, write_map, + vec_len (wrk->wr_bitmap) * sizeof (clib_bitmap_t)); + memset (write_map, 0, + vec_len (wrk->wr_bitmap) * sizeof (clib_bitmap_t)); + } + if (n_bits && except_map) + { + clib_bitmap_validate (wrk->ex_bitmap, minbits); + clib_memcpy_fast (wrk->ex_bitmap, except_map, + vec_len (wrk->ex_bitmap) * sizeof (clib_bitmap_t)); + memset (except_map, 0, + vec_len (wrk->ex_bitmap) * sizeof (clib_bitmap_t)); + } + + if (!n_bits) + return 0; + + if (!write_map) + goto check_rd; + + /* *INDENT-OFF* */ + clib_bitmap_foreach (sid, wrk->wr_bitmap, ({ + if (!(session = vcl_session_get (wrk, sid))) + { + VDBG (0, "VCL<%d>: session %d specified in write_map is closed.", + getpid (), sid); + return VPPCOM_EBADFD; + } + + rv = svm_fifo_is_full (session->tx_fifo); + if (!rv) + { + clib_bitmap_set_no_check (write_map, sid, 1); + bits_set++; + } + })); + +check_rd: + if (!read_map) + goto check_mq; + + clib_bitmap_foreach (sid, wrk->rd_bitmap, ({ + if (!(session = vcl_session_get (wrk, sid))) + { + VDBG (0, "VCL<%d>: session %d specified in write_map is closed.", + getpid (), sid); + return VPPCOM_EBADFD; + } + + rv = vppcom_session_read_ready (session); + if (rv) + { + clib_bitmap_set_no_check (read_map, sid, 1); + bits_set++; + } + })); + /* *INDENT-ON* */ + +check_mq: + + for (i = 0; i < vec_len (wrk->unhandled_evts_vector); i++) + { + vcl_select_handle_mq_event (wrk, &wrk->unhandled_evts_vector[i], n_bits, + read_map, write_map, except_map, &bits_set); + } + vec_reset_length (wrk->unhandled_evts_vector); + + if (vcm->cfg.use_mq_eventfd) + vppcom_select_eventfd (wrk, n_bits, read_map, write_map, except_map, + time_to_wait, &bits_set); + else + vppcom_select_condvar (wrk, n_bits, read_map, write_map, except_map, + time_to_wait, &bits_set); - return (int) session_index; + return (bits_set); } -int -vppcom_session_close (uint32_t session_index) +static inline void +vep_verify_epoll_chain (vcl_worker_t * wrk, u32 vep_idx) { - vppcom_main_t *vcm = &vppcom_main; - session_t *session = 0; - int rv; + vcl_session_t *session; + vppcom_epoll_t *vep; + u32 sid = vep_idx; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) + if (VPPCOM_DEBUG <= 1) + return; + + /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ + session = vcl_session_get (wrk, vep_idx); + if (PREDICT_FALSE (!session)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", + getpid (), vep_idx); goto done; } - clib_spinlock_unlock (&vcm->sessions_lockp); - - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid %d", vcm->my_pid, session_index); - - if (session->is_vep) + if (PREDICT_FALSE (!session->is_vep)) { - u32 next_sid; - for (next_sid = session->vep.next_sid; next_sid != ~0; - next_sid = session->vep.next_sid) - { - rv = vppcom_epoll_ctl (session_index, EPOLL_CTL_DEL, next_sid, 0); - if ((VPPCOM_DEBUG > 0) && (rv < 0)) - clib_warning ("[%d] EPOLL_CTL_DEL vep_idx %u, sid %u failed, " - "rv = %s (%d)", session_index, next_sid, - vcm->my_pid, session_index, - vppcom_retval_str (rv), rv); - - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning - ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - goto done; - } - clib_spinlock_unlock (&vcm->sessions_lockp); - } + clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", + getpid (), vep_idx); + goto done; } - else - { - if (session->is_vep_session) - { - u32 vep_idx = session->vep.vep_idx; - rv = vppcom_epoll_ctl (vep_idx, EPOLL_CTL_DEL, session_index, 0); - if ((VPPCOM_DEBUG > 0) && (rv < 0)) - clib_warning ("[%d] EPOLL_CTL_DEL vep_idx %u, sid %u failed, " - "rv = %s (%d)", vep_idx, session_index, - vcm->my_pid, session_index, - vppcom_retval_str (rv), rv); - - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning - ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - goto done; - } - clib_spinlock_unlock (&vcm->sessions_lockp); - } - - if (session->is_cut_thru && session->is_server && - (session->state == STATE_ACCEPT)) + 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); + + for (sid = vep->next_sh; sid != ~0; sid = vep->next_sh) + { + session = vcl_session_get (wrk, sid); + if (PREDICT_FALSE (!session)) { - rv = vppcom_session_unbind_cut_thru (session); - if ((VPPCOM_DEBUG > 0) && (rv < 0)) - clib_warning ("[%d] unbind cut-thru (session %d) failed, " - "rv = %s (%d)", - vcm->my_pid, session_index, - vppcom_retval_str (rv), rv); + clib_warning ("VCL<%d>: ERROR: Invalid sid (%u)!", getpid (), sid); + goto done; } - else if (session->is_server && session->is_listen) + if (PREDICT_FALSE (session->is_vep)) + clib_warning ("VCL<%d>: ERROR: sid (%u) is a vep!", + getpid (), vep_idx); + else if (PREDICT_FALSE (!session->is_vep_session)) { - rv = vppcom_session_unbind (session_index); - if ((VPPCOM_DEBUG > 0) && (rv < 0)) - clib_warning ("[%d] unbind (session %d) failed, rv = %s (%d)", - vcm->my_pid, session_index, - vppcom_retval_str (rv), rv); + clib_warning ("VCL<%d>: ERROR: session (%u) " + "is not a vep session!", getpid (), sid); + goto done; } - else if (session->state == STATE_CONNECT) + 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 (session->is_vep_session) { - rv = vppcom_session_disconnect (session_index); - if ((VPPCOM_DEBUG > 0) && (rv < 0)) - clib_warning ("[%d] disconnect (session %d) failed, rv = %s (%d)", - vcm->my_pid, session_index, - vppcom_retval_str (rv), rv); + 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); } } - pool_put_index (vcm->sessions, session_index); + done: - return rv; + clib_warning ("VCL<%d>: vep_idx (%u): Dump complete!\n", + getpid (), vep_idx); } int -vppcom_session_bind (uint32_t session_index, vppcom_endpt_t * ep) +vppcom_epoll_create (void) { - vppcom_main_t *vcm = &vppcom_main; - session_t *session = 0; - int rv; - - if (!ep || !ep->ip) - return VPPCOM_EINVAL; - - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - return rv; - } + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *vep_session; - if (session->is_vep) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) is an epoll session!", - vcm->my_pid, session_index); - return VPPCOM_EBADFD; - } + vep_session = vcl_session_alloc (wrk); - session->vrf = ep->vrf; - session->lcl_addr.is_ip4 = ep->is_ip4; - session->lcl_addr.ip46 = to_ip46 (!ep->is_ip4, ep->ip); - session->lcl_port = ep->port; + vep_session->is_vep = 1; + 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; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid %d, bound to lcl address %U lcl port %u", - vcm->my_pid, session_index, format_ip46_address, - &session->lcl_addr.ip46, session->lcl_addr.is_ip4, - clib_net_to_host_u16 (session->lcl_port)); + vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_sh); + VDBG (0, "VCL<%d>: Created vep_idx %u / sid %u!", + getpid (), vep_session->session_index, vep_session->session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - return VPPCOM_OK; + return vcl_session_handle (vep_session); } int -vppcom_session_listen (uint32_t listen_session_index, uint32_t q_len) +vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, + struct epoll_event *event) { - vppcom_main_t *vcm = &vppcom_main; - session_t *listen_session = 0; - int rv; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *vep_session; + vcl_session_t *session; + int rv = VPPCOM_OK; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (listen_session_index, &listen_session); - if (PREDICT_FALSE (rv)) + if (vep_handle == session_handle) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, listen_session_index); - return rv; + clib_warning ("VCL<%d>: ERROR: vep_idx == session_index (%u)!", + getpid (), vep_handle); + return VPPCOM_EINVAL; } - if (listen_session->is_vep) + vep_session = vcl_session_get_w_handle (wrk, vep_handle); + if (PREDICT_FALSE (!vep_session)) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) is an epoll session!", - vcm->my_pid, listen_session_index); + clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", vep_handle); return VPPCOM_EBADFD; } - - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid %d", vcm->my_pid, listen_session_index); - - ASSERT (vcm->bind_session_index == ~0); - vcm->bind_session_index = listen_session_index; - vppcom_send_bind_sock (listen_session); - clib_spinlock_unlock (&vcm->sessions_lockp); - rv = - vppcom_wait_for_session_state_change (listen_session_index, STATE_LISTEN, - vcm->cfg.session_timeout); - if (PREDICT_FALSE (rv)) - { - vcm->bind_session_index = ~0; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] server listen timed out, rv = %d (%d)", - vcm->my_pid, vppcom_retval_str (rv), rv); - return rv; - } - - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (listen_session_index, &listen_session); - if (PREDICT_FALSE (rv)) + if (PREDICT_FALSE (!vep_session->is_vep)) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, listen_session_index); - return rv; + clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", + getpid (), vep_handle); + return VPPCOM_EINVAL; } - listen_session->is_listen = 1; - clib_fifo_validate (vcm->client_session_index_fifo, q_len); - clib_spinlock_unlock (&vcm->sessions_lockp); - - return VPPCOM_OK; -} -int -vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, - double wait_for_time) -{ - vppcom_main_t *vcm = &vppcom_main; - session_t *listen_session = 0; - session_t *client_session = 0; - u32 client_session_index; - int rv; - f64 wait_for; - - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (listen_session_index, &listen_session); - if (PREDICT_FALSE (rv)) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, listen_session_index); - return rv; - } + ASSERT (vep_session->vep.vep_sh == ~0); + ASSERT (vep_session->vep.prev_sh == ~0); - if (listen_session->is_vep) + session = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!session)) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) is an epoll session!", - vcm->my_pid, listen_session_index); + VDBG (0, "VCL<%d>: ERROR: Invalid session_handle (%u)!", + getpid (), session_handle); return VPPCOM_EBADFD; } - - if (listen_session->state != STATE_LISTEN) + if (PREDICT_FALSE (session->is_vep)) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] session not in listen state, state = %s", - vcm->my_pid, - vppcom_session_state_str (listen_session->state)); - return VPPCOM_EBADFD; + clib_warning ("ERROR: session_handle (%u) is a vep!", vep_handle); + return VPPCOM_EINVAL; } - wait_for = listen_session->is_nonblocking ? 0 : - (wait_for_time < 0) ? vcm->cfg.accept_timeout : wait_for_time; - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid %d: %s (%d)", vcm->my_pid, - listen_session_index, - vppcom_session_state_str (listen_session->state), - listen_session->state); - clib_spinlock_unlock (&vcm->sessions_lockp); - - while (1) + switch (op) { - rv = vppcom_wait_for_client_session_index (wait_for); - if (rv) + case EPOLL_CTL_ADD: + if (PREDICT_FALSE (!event)) { - if ((VPPCOM_DEBUG > 0)) - clib_warning ("[%d] sid %d, accept timed out, rv = %s (%d)", - vcm->my_pid, listen_session_index, - vppcom_retval_str (rv), rv); - if ((wait_for == 0) || (wait_for_time > 0)) - return rv; + clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_ADD: NULL pointer to " + "epoll_event structure!", getpid ()); + return VPPCOM_EINVAL; } - else - break; - } - - clib_spinlock_lock (&vcm->sessions_lockp); - clib_fifo_sub1 (vcm->client_session_index_fifo, client_session_index); - rv = vppcom_session_at_index (client_session_index, &client_session); - ASSERT (rv == VPPCOM_OK); - ASSERT (client_session->peer_addr.is_ip4 == - listen_session->lcl_addr.is_ip4); - - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] Got a request: client sid %d", vcm->my_pid, - client_session_index); - - // Copy the lcl information from the listening session to the client session - // client_session->lcl_port = listen_session->lcl_port; - // client_session->lcl_addr = listen_session->lcl_addr; - - ep->vrf = client_session->vrf; - ep->is_cut_thru = client_session->is_cut_thru; - ep->is_ip4 = client_session->peer_addr.is_ip4; - ep->port = client_session->peer_port; - if (client_session->peer_addr.is_ip4) - clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip4, - sizeof (ip4_address_t)); - else - clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip6, - sizeof (ip6_address_t)); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid %d, accepted peer address %U peer port %u", - vcm->my_pid, client_session_index, format_ip46_address, - &client_session->peer_addr.ip46, - client_session->peer_addr.is_ip4, - clib_net_to_host_u16 (client_session->peer_port)); - clib_spinlock_unlock (&vcm->sessions_lockp); - return (int) client_session_index; -} + if (vep_session->vep.next_sh != ~0) + { + vcl_session_t *next_session; + next_session = vcl_session_get_w_handle (wrk, + vep_session->vep.next_sh); + if (PREDICT_FALSE (!next_session)) + { + clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_ADD: Invalid " + "vep.next_sid (%u) on vep_idx (%u)!", + getpid (), 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; + vep_session->vep.next_sh = session_handle; -int -vppcom_session_connect (uint32_t session_index, vppcom_endpt_t * server_ep) -{ - vppcom_main_t *vcm = &vppcom_main; - session_t *session = 0; - int rv; + VDBG (1, "VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, sid %u, events 0x%x, " + "data 0x%llx!", getpid (), vep_handle, session_handle, + event->events, event->data.u64); + vcl_evt (VCL_EVT_EPOLL_CTLADD, session, event->events, event->data.u64); + break; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - return rv; - } + case EPOLL_CTL_MOD: + if (PREDICT_FALSE (!event)) + { + clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_MOD: NULL pointer to " + "epoll_event structure!", getpid ()); + rv = VPPCOM_EINVAL; + goto done; + } + else if (PREDICT_FALSE (!session->is_vep_session)) + { + clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: " + "not a vep session!", getpid (), session_handle); + rv = VPPCOM_EINVAL; + goto done; + } + else if (PREDICT_FALSE (session->vep.vep_sh != vep_handle)) + { + clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: " + "vep_idx (%u) != vep_idx (%u)!", + getpid (), session_handle, + session->vep.vep_sh, vep_handle); + rv = VPPCOM_EINVAL; + goto done; + } + session->vep.et_mask = VEP_DEFAULT_ET_MASK; + session->vep.ev = *event; + VDBG (1, "VCL<%d>: EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x," + " data 0x%llx!", getpid (), vep_handle, session_handle, + event->events, event->data.u64); + break; - if (session->is_vep) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) is an epoll session!", - vcm->my_pid, session_index); - return VPPCOM_EBADFD; - } + case EPOLL_CTL_DEL: + if (PREDICT_FALSE (!session->is_vep_session)) + { + clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: " + "not a vep session!", getpid (), session_handle); + rv = VPPCOM_EINVAL; + goto done; + } + else if (PREDICT_FALSE (session->vep.vep_sh != vep_handle)) + { + clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: " + "vep_idx (%u) != vep_idx (%u)!", + getpid (), session_handle, + session->vep.vep_sh, vep_handle); + rv = VPPCOM_EINVAL; + goto done; + } - if (session->state == STATE_CONNECT) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] session, sid (%u) already connected!", - vcm->my_pid, session_index); - return VPPCOM_OK; - } + vep_session->wait_cont_idx = + (vep_session->wait_cont_idx == session_handle) ? + session->vep.next_sh : vep_session->wait_cont_idx; - session->vrf = server_ep->vrf; - session->peer_addr.is_ip4 = server_ep->is_ip4; - session->peer_addr.ip46 = to_ip46 (!server_ep->is_ip4, server_ep->ip); - session->peer_port = server_ep->port; + if (session->vep.prev_sh == vep_handle) + vep_session->vep.next_sh = session->vep.next_sh; + else + { + vcl_session_t *prev_session; + prev_session = vcl_session_get_w_handle (wrk, session->vep.prev_sh); + if (PREDICT_FALSE (!prev_session)) + { + clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_DEL: Invalid " + "vep.prev_sid (%u) on sid (%u)!", + getpid (), session->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; + } + if (session->vep.next_sh != ~0) + { + vcl_session_t *next_session; + next_session = vcl_session_get_w_handle (wrk, session->vep.next_sh); + if (PREDICT_FALSE (!next_session)) + { + clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_DEL: Invalid " + "vep.next_sid (%u) on sid (%u)!", + getpid (), session->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; + } - if (VPPCOM_DEBUG > 0) - { - u8 *ip_str = format (0, "%U", format_ip46_address, - &session->peer_addr.ip46, - session->peer_addr.is_ip4); - clib_warning ("[%d] connect sid %d to %s server port %d proto %s", - vcm->my_pid, session_index, ip_str, - clib_net_to_host_u16 (session->peer_port), - session->proto ? "UDP" : "TCP"); - vec_free (ip_str); - } + 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; + VDBG (1, "VCL<%d>: EPOLL_CTL_DEL: vep_idx %u, sid %u!", + getpid (), vep_handle, session_handle); + vcl_evt (VCL_EVT_EPOLL_CTLDEL, session, vep_sh); + break; - vppcom_send_connect_sock (session, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - rv = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT, - vcm->cfg.session_timeout); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] connect timed out, rv = %s (%d)", - vcm->my_pid, vppcom_retval_str (rv), rv); - return rv; + default: + clib_warning ("VCL<%d>: ERROR: Invalid operation (%d)!", getpid (), op); + rv = VPPCOM_EINVAL; } - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid %d connected!", vcm->my_pid, session_index); - return VPPCOM_OK; + vep_verify_epoll_chain (wrk, vep_handle); + +done: + return rv; } -static inline int -vppcom_session_read_internal (uint32_t session_index, void *buf, int n, - u8 peek) -{ - vppcom_main_t *vcm = &vppcom_main; - session_t *session = 0; - svm_fifo_t *rx_fifo; - int n_read = 0; - int rv; - char *fifo_str; - u32 poll_et; +static inline void +vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, + struct epoll_event *events, u32 * num_ev) +{ + session_disconnected_msg_t *disconnected_msg; + session_connected_msg_t *connected_msg; + session_accepted_msg_t *accepted_msg; + u64 session_evt_data = ~0, handle; + u32 sid = ~0, session_events; + vcl_session_msg_t *vcl_msg; + vcl_session_t *session; + u8 add_event = 0; + + 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; + session = vcl_session_get (wrk, sid); + 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; + session = vcl_session_get (wrk, sid); + 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; + 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); + sid = session->session_index; + 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 SESSION_IO_EVT_CT_RX: + session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 1); + 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; + break; + case SESSION_CTRL_EVT_ACCEPTED: + accepted_msg = (session_accepted_msg_t *) e->data; + handle = accepted_msg->listener_handle; + session = vcl_session_table_lookup_listener (wrk, handle); + if (!session) + { + clib_warning ("VCL<%d>: ERROR: couldn't find listen session:" + "listener handle %llx", getpid (), handle); + break; + } - ASSERT (buf); + clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); + vcl_msg->accepted_msg = *accepted_msg; + session_events = session->vep.ev.events; + if (!(EPOLLIN & session_events)) + break; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - return rv; + add_event = 1; + events[*num_ev].events |= EPOLLIN; + session_evt_data = session->vep.ev.data.u64; + break; + case SESSION_CTRL_EVT_CONNECTED: + connected_msg = (session_connected_msg_t *) e->data; + 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); + session = vcl_session_get (wrk, sid); + session_events = session->vep.ev.events; + if (EPOLLOUT & session_events) + { + add_event = 1; + events[*num_ev].events |= EPOLLOUT; + session_evt_data = session->vep.ev.data.u64; + } + break; + case SESSION_CTRL_EVT_DISCONNECTED: + disconnected_msg = (session_disconnected_msg_t *) e->data; + sid = vcl_session_index_from_vpp_handle (wrk, disconnected_msg->handle); + if (!(session = vcl_session_get (wrk, sid))) + break; + add_event = 1; + events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; + session_evt_data = session->vep.ev.data.u64; + session_events = session->vep.ev.events; + 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))) + break; + add_event = 1; + events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; + session_evt_data = session->vep.ev.data.u64; + session_events = session->vep.ev.events; + break; + default: + VDBG (0, "unhandled: %u", e->event_type); + break; } - if (session->is_vep) + if (add_event) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) is an epoll session!", - vcm->my_pid, session_index); - return VPPCOM_EBADFD; + events[*num_ev].data.u64 = session_evt_data; + if (EPOLLONESHOT & session_events) + { + session = vcl_session_get (wrk, sid); + session->vep.ev.events = 0; + } + *num_ev += 1; } +} - if (session->state == STATE_DISCONNECT) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid (%u) has been closed by remote peer!", - vcm->my_pid, session_index); - return VPPCOM_ECONNRESET; - } +static int +vcl_epoll_wait_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, + struct epoll_event *events, u32 maxevents, + double wait_for_time, u32 * num_ev) +{ + svm_msg_q_msg_t *msg; + session_event_t *e; + int i; - rx_fifo = ((!session->is_cut_thru || session->is_server) ? - session->server_rx_fifo : session->server_tx_fifo); - fifo_str = ((!session->is_cut_thru || session->is_server) ? - "server_rx_fifo" : "server_tx_fifo"); - poll_et = EPOLLET & session->vep.ev.events; - clib_spinlock_unlock (&vcm->sessions_lockp); + if (vec_len (wrk->mq_msg_vector) && svm_msg_q_is_empty (mq)) + goto handle_dequeued; - do + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) { - if (peek) - n_read = svm_fifo_peek (rx_fifo, 0, n, buf); + if (!wait_for_time) + { + svm_msg_q_unlock (mq); + return 0; + } + else if (wait_for_time < 0) + { + svm_msg_q_wait (mq); + } else - n_read = svm_fifo_dequeue_nowait (rx_fifo, n, buf); + { + if (svm_msg_q_timedwait (mq, wait_for_time / 1e3)) + { + svm_msg_q_unlock (mq); + return 0; + } + } } - while (!session->is_nonblocking && (n_read <= 0)); + vcl_mq_dequeue_batch (wrk, mq); + svm_msg_q_unlock (mq); - if (poll_et && (n_read <= 0)) +handle_dequeued: + for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { - clib_spinlock_lock (&vcm->sessions_lockp); - session->vep.et_mask |= EPOLLIN; - clib_spinlock_unlock (&vcm->sessions_lockp); + msg = vec_elt_at_index (wrk->mq_msg_vector, i); + e = svm_msg_q_msg_data (mq, msg); + if (*num_ev < maxevents) + vcl_epoll_wait_handle_mq_event (wrk, e, events, num_ev); + else + vec_add1 (wrk->unhandled_evts_vector, *e); + svm_msg_q_free_msg (mq, msg); } + vec_reset_length (wrk->mq_msg_vector); - if ((VPPCOM_DEBUG > 2) && (n_read > 0)) - clib_warning ("[%d] sid %d, read %d bytes from %s (%p)", vcm->my_pid, - session_index, n_read, fifo_str, rx_fifo); - - return (n_read <= 0) ? VPPCOM_EAGAIN : n_read; + return *num_ev; } -int -vppcom_session_read (uint32_t session_index, void *buf, int n) +static int +vppcom_epoll_wait_condvar (vcl_worker_t * wrk, struct epoll_event *events, + int maxevents, u32 n_evts, double wait_for_time) { - return (vppcom_session_read_internal (session_index, buf, n, 0)); + vcl_cut_through_registration_t *cr; + double total_wait = 0, wait_slice; + int rv; + + wait_for_time = (wait_for_time == -1) ? (double) 10e9 : wait_for_time; + wait_slice = wrk->cut_through_registrations ? 10e-6 : wait_for_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; + if (n_evts) + return n_evts; + } + while (total_wait < wait_for_time); + return n_evts; } static int -vppcom_session_peek (uint32_t session_index, void *buf, int n) +vppcom_epoll_wait_eventfd (vcl_worker_t * wrk, struct epoll_event *events, + int maxevents, u32 n_evts, double wait_for_time) { - return (vppcom_session_read_internal (session_index, buf, n, 1)); + vcl_mq_evt_conn_t *mqc; + int __clib_unused n_read; + int n_mq_evts, i; + u64 buf; + + vec_validate (wrk->mq_events, pool_elts (wrk->mq_evt_conns)); +again: + n_mq_evts = epoll_wait (wrk->mqs_epfd, wrk->mq_events, + vec_len (wrk->mq_events), wait_for_time); + for (i = 0; i < n_mq_evts; i++) + { + mqc = vcl_mq_evt_conn_get (wrk, wrk->mq_events[i].data.u32); + n_read = read (mqc->mq_fd, &buf, sizeof (buf)); + vcl_epoll_wait_handle_mq (wrk, mqc->mq, events, maxevents, 0, &n_evts); + } + if (!n_evts && n_mq_evts > 0) + goto again; + + return (int) n_evts; } -static inline int -vppcom_session_read_ready (session_t * session, u32 session_index) +int +vppcom_epoll_wait (uint32_t vep_handle, struct epoll_event *events, + int maxevents, double wait_for_time) { - vppcom_main_t *vcm = &vppcom_main; - svm_fifo_t *rx_fifo; - int ready = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *vep_session; + u32 n_evts = 0; + int i; - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - if (session->is_vep) + if (PREDICT_FALSE (maxevents <= 0)) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) is an epoll session!", - vcm->my_pid, session_index); - return VPPCOM_EBADFD; + clib_warning ("VCL<%d>: ERROR: Invalid maxevents (%d)!", + getpid (), maxevents); + return VPPCOM_EINVAL; } - if (session->state == STATE_DISCONNECT) + vep_session = vcl_session_get_w_handle (wrk, vep_handle); + if (!vep_session) + return VPPCOM_EBADFD; + + if (PREDICT_FALSE (!vep_session->is_vep)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid (%u) has been closed by remote peer!", - vcm->my_pid, session_index); - return VPPCOM_ECONNRESET; + clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", + getpid (), vep_handle); + return VPPCOM_EINVAL; } - if (session->is_listen) - ready = clib_fifo_elts (vcm->client_session_index_fifo); - else + memset (events, 0, sizeof (*events) * maxevents); + + if (vec_len (wrk->unhandled_evts_vector)) { - rx_fifo = ((!session->is_cut_thru || session->is_server) ? - session->server_rx_fifo : session->server_tx_fifo); + for (i = 0; i < vec_len (wrk->unhandled_evts_vector); i++) + { + vcl_epoll_wait_handle_mq_event (wrk, &wrk->unhandled_evts_vector[i], + events, &n_evts); + if (n_evts == maxevents) + { + i += 1; + break; + } + } - ready = svm_fifo_max_dequeue (rx_fifo); + vec_delete (wrk->unhandled_evts_vector, i, 0); } - if (VPPCOM_DEBUG > 3) - clib_warning ("[%d] sid %d, peek %s (%p), ready = %d", vcm->my_pid, - session_index, - session->is_server ? "server_rx_fifo" : "server_tx_fifo", - rx_fifo, ready); - if ((session->vep.ev.events & EPOLLET) && (ready == 0)) - session->vep.et_mask |= EPOLLIN; + if (vcm->cfg.use_mq_eventfd) + return vppcom_epoll_wait_eventfd (wrk, events, maxevents, n_evts, + wait_for_time); - return ready; + return vppcom_epoll_wait_condvar (wrk, events, maxevents, n_evts, + wait_for_time); } int -vppcom_session_write (uint32_t session_index, void *buf, int n) +vppcom_session_attr (uint32_t session_handle, uint32_t op, + void *buffer, uint32_t * buflen) { - vppcom_main_t *vcm = &vppcom_main; - session_t *session = 0; - svm_fifo_t *tx_fifo; - unix_shared_memory_queue_t *q; - session_fifo_event_t evt; - int rv, n_write; - char *fifo_str; - u32 poll_et; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; + int rv = VPPCOM_OK; + u32 *flags = buffer; + vppcom_endpt_t *ep = buffer; - ASSERT (buf); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) + switch (op) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - return rv; - } + case VPPCOM_ATTR_GET_NREAD: + rv = vppcom_session_read_ready (session); + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_NREAD: sid %u, nread = %d", + getpid (), rv); + break; - if (session->is_vep) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) is an epoll session!", - vcm->my_pid, session_index); - return VPPCOM_EBADFD; - } + 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); + break; - if (session->state == STATE_DISCONNECT) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid (%u) has been closed by remote peer!", - vcm->my_pid, session_index); - return VPPCOM_ECONNRESET; - } + 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)); + *buflen = sizeof (*flags); + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_FLAGS: sid %u, flags = 0x%08x, " + "is_nonblocking = %u", getpid (), + session_handle, *flags, + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); + } + else + rv = VPPCOM_EINVAL; + break; - tx_fifo = ((!session->is_cut_thru || session->is_server) ? - session->server_tx_fifo : session->server_rx_fifo); - fifo_str = ((!session->is_cut_thru || session->is_server) ? - "server_tx_fifo" : "server_rx_fifo"); - q = session->vpp_event_queue; - poll_et = EPOLLET & session->vep.ev.events; - clib_spinlock_unlock (&vcm->sessions_lockp); + case VPPCOM_ATTR_SET_FLAGS: + if (PREDICT_TRUE (buffer && buflen && (*buflen == sizeof (*flags)))) + { + if (*flags & O_NONBLOCK) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK); + else + VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK); - do - { - n_write = svm_fifo_enqueue_nowait (tx_fifo, n, buf); - } - while (!session->is_nonblocking && (n_write <= 0)); + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_FLAGS: sid %u, flags = 0x%08x," + " is_nonblocking = %u", + getpid (), session_handle, *flags, + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); + } + else + rv = VPPCOM_EINVAL; + break; - /* If event wasn't set, add one */ - if (!session->is_cut_thru && (n_write > 0) && svm_fifo_set_event (tx_fifo)) - { - int rval; + case VPPCOM_ATTR_GET_PEER_ADDR: + if (PREDICT_TRUE (buffer && buflen && + (*buflen >= sizeof (*ep)) && ep->ip)) + { + ep->is_ip4 = session->transport.is_ip4; + ep->port = session->transport.rmt_port; + 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)); + *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, + ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (ep->port)); + } + else + rv = VPPCOM_EINVAL; + break; - /* Fabricate TX event, send to vpp */ - evt.fifo = tx_fifo; - evt.event_type = FIFO_EVENT_APP_TX; + case VPPCOM_ATTR_GET_LCL_ADDR: + if (PREDICT_TRUE (buffer && buflen && + (*buflen >= sizeof (*ep)) && ep->ip)) + { + ep->is_ip4 = session->transport.is_ip4; + ep->port = session->transport.lcl_port; + if (session->transport.is_ip4) + clib_memcpy_fast (ep->ip, &session->transport.lcl_ip.ip4, + sizeof (ip4_address_t)); + else + 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, + &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; - rval = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rval)) + case VPPCOM_ATTR_GET_LIBC_EPFD: + rv = session->libc_epfd; + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d", + getpid (), rv); + break; + + case VPPCOM_ATTR_SET_LIBC_EPFD: + if (PREDICT_TRUE (buffer && buflen && + (*buflen == sizeof (session->libc_epfd)))) { - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - return rval; + 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); } - ASSERT (q); - unix_shared_memory_queue_add (q, (u8 *) & evt, - 0 /* do wait for mutex */ ); - } + else + rv = VPPCOM_EINVAL; + break; - if (poll_et && (n_write <= 0)) - { - clib_spinlock_lock (&vcm->sessions_lockp); - session->vep.et_mask |= EPOLLOUT; - clib_spinlock_unlock (&vcm->sessions_lockp); - } + case VPPCOM_ATTR_GET_PROTOCOL: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + *(int *) buffer = session->session_type; + *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - { - if (n_write == -2) - clib_warning ("[%d] sid %d, FIFO-FULL %s (%p)", vcm->my_pid, - session_index, fifo_str, tx_fifo); + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_PROTOCOL: %d (%s), buflen %d", + getpid (), *(int *) buffer, *(int *) buffer ? "UDP" : "TCP", + *buflen); + } else - clib_warning ("[%d] sid %d, wrote %d bytes to %s (%p)", vcm->my_pid, - session_index, n_write, fifo_str, tx_fifo); - } - return (n_write < 0) ? VPPCOM_EAGAIN : n_write; -} + rv = VPPCOM_EINVAL; + break; -static inline int -vppcom_session_write_ready (session_t * session, u32 session_index) -{ - vppcom_main_t *vcm = &vppcom_main; - svm_fifo_t *tx_fifo; - char *fifo_str; - int ready; + case VPPCOM_ATTR_GET_LISTEN: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_LISTEN); + *buflen = sizeof (int); - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - if (session->is_vep) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) is an epoll session!", - vcm->my_pid, session_index); - return VPPCOM_EBADFD; - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LISTEN: %d, buflen %d", + getpid (), *(int *) buffer, *buflen); + } + else + rv = VPPCOM_EINVAL; + break; - if (session->state == STATE_DISCONNECT) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] sid (%u) has been closed by remote peer!", - vcm->my_pid, session_index); - return VPPCOM_ECONNRESET; - } + case VPPCOM_ATTR_GET_ERROR: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + *(int *) buffer = 0; + *buflen = sizeof (int); - tx_fifo = ((!session->is_cut_thru || session->is_server) ? - session->server_tx_fifo : session->server_rx_fifo); - fifo_str = ((!session->is_cut_thru || session->is_server) ? - "server_tx_fifo" : "server_rx_fifo"); + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_ERROR: %d, buflen %d, #VPP-TBD#", + getpid (), *(int *) buffer, *buflen); + } + else + rv = VPPCOM_EINVAL; + break; - ready = svm_fifo_max_enqueue (tx_fifo); + case VPPCOM_ATTR_GET_TX_FIFO_LEN: + if (buffer && buflen && (*buflen >= sizeof (u32))) + { - if (VPPCOM_DEBUG > 3) - clib_warning ("[%d] sid %d, peek %s (%p), ready = %d", vcm->my_pid, - session_index, fifo_str, tx_fifo, ready); - if ((session->vep.ev.events & EPOLLET) && (ready == 0)) - session->vep.et_mask |= EPOLLOUT; + /* VPP-TBD */ + *(size_t *) buffer = (session->sndbuf_size ? session->sndbuf_size : + session->tx_fifo ? session->tx_fifo->nitems : + vcm->cfg.tx_fifo_size); + *buflen = sizeof (u32); - return ready; -} + 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); + } + else + rv = VPPCOM_EINVAL; + break; -int -vppcom_select (unsigned long n_bits, unsigned long *read_map, - unsigned long *write_map, unsigned long *except_map, - double time_to_wait) -{ - vppcom_main_t *vcm = &vppcom_main; - u32 session_index; - session_t *session = 0; - int rv, bits_set = 0; - f64 timeout = clib_time_now (&vcm->clib_time) + time_to_wait; - u32 minbits = clib_max (n_bits, BITS (uword)); + case VPPCOM_ATTR_SET_TX_FIFO_LEN: + if (buffer && buflen && (*buflen == sizeof (u32))) + { + /* 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); + } + else + rv = VPPCOM_EINVAL; + break; - ASSERT (sizeof (clib_bitmap_t) == sizeof (long int)); + case VPPCOM_ATTR_GET_RX_FIFO_LEN: + if (buffer && buflen && (*buflen >= sizeof (u32))) + { - if (n_bits && read_map) - { - clib_bitmap_validate (vcm->rd_bitmap, minbits); - clib_memcpy (vcm->rd_bitmap, read_map, vec_len (vcm->rd_bitmap)); - memset (read_map, 0, vec_len (vcm->rd_bitmap)); - } - if (n_bits && write_map) - { - clib_bitmap_validate (vcm->wr_bitmap, minbits); - clib_memcpy (vcm->wr_bitmap, write_map, vec_len (vcm->wr_bitmap)); - memset (write_map, 0, vec_len (vcm->wr_bitmap)); - } - if (n_bits && except_map) - { - clib_bitmap_validate (vcm->ex_bitmap, minbits); - clib_memcpy (vcm->ex_bitmap, except_map, vec_len (vcm->ex_bitmap)); - memset (except_map, 0, vec_len (vcm->ex_bitmap)); - } + /* VPP-TBD */ + *(size_t *) buffer = (session->rcvbuf_size ? session->rcvbuf_size : + session->rx_fifo ? session->rx_fifo->nitems : + vcm->cfg.rx_fifo_size); + *buflen = sizeof (u32); - do - { - /* *INDENT-OFF* */ - if (n_bits) - { - if (read_map) - { - clib_bitmap_foreach (session_index, vcm->rd_bitmap, - ({ - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (rv < 0) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] session %d specified in " - "read_map is closed.", vcm->my_pid, - session_index); - bits_set = VPPCOM_EBADFD; - goto select_done; - } - - rv = vppcom_session_read_ready (session, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - if (except_map && vcm->ex_bitmap && - clib_bitmap_get (vcm->ex_bitmap, session_index) && - (rv < 0)) - { - // TBD: clib_warning - clib_bitmap_set_no_check (except_map, session_index, 1); - bits_set++; - } - else if (rv > 0) - { - // TBD: clib_warning - clib_bitmap_set_no_check (read_map, session_index, 1); - bits_set++; - } - })); - } - - if (write_map) - { - clib_bitmap_foreach (session_index, vcm->wr_bitmap, - ({ - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (rv < 0) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] session %d specified in " - "write_map is closed.", vcm->my_pid, - session_index); - bits_set = VPPCOM_EBADFD; - goto select_done; - } - - rv = vppcom_session_write_ready (session, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - if (write_map && (rv > 0)) - { - // TBD: clib_warning - clib_bitmap_set_no_check (write_map, session_index, 1); - bits_set++; - } - })); - } - - if (except_map) - { - clib_bitmap_foreach (session_index, vcm->ex_bitmap, - ({ - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (rv < 0) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("[%d] session %d specified in " - "except_map is closed.", vcm->my_pid, - session_index); - bits_set = VPPCOM_EBADFD; - goto select_done; - } - - rv = vppcom_session_read_ready (session, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - if (rv < 0) - { - // TBD: clib_warning - clib_bitmap_set_no_check (except_map, session_index, 1); - bits_set++; - } - })); - } - } - /* *INDENT-ON* */ - } - while (clib_time_now (&vcm->clib_time) < timeout); + 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); + } + else + rv = VPPCOM_EINVAL; + break; -select_done: - return (bits_set); -} + case VPPCOM_ATTR_SET_RX_FIFO_LEN: + if (buffer && buflen && (*buflen == sizeof (u32))) + { + /* 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); + } + else + rv = VPPCOM_EINVAL; + break; -static inline void -vep_verify_epoll_chain (u32 vep_idx) -{ - session_t *session; - vppcom_epoll_t *vep; - int rv; - u32 sid; + case VPPCOM_ATTR_GET_REUSEADDR: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + /* VPP-TBD */ + *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_REUSEADDR); + *buflen = sizeof (int); - if (VPPCOM_DEBUG < 1) - return; + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEADDR: %d, " + "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + } + else + rv = VPPCOM_EINVAL; + break; - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - rv = vppcom_session_at_index (vep_idx, &session); - if (PREDICT_FALSE (rv)) - { - clib_warning ("ERROR: Invalid vep_idx (%u)!", vep_idx); - goto done; - } - if (PREDICT_FALSE (!session->is_vep)) - { - clib_warning ("ERROR: vep_idx (%u) is not a vep!", vep_idx); - goto done; - } - if (VPPCOM_DEBUG > 1) - clib_warning ("vep_idx (%u): Dumping epoll chain\n" - "{\n" - " is_vep = %u\n" - " is_vep_session = %u\n" - " wait_cont_idx = 0x%x (%u)\n" - "}\n", - vep_idx, session->is_vep, session->is_vep_session, - session->wait_cont_idx, session->wait_cont_idx); - do - { - vep = &session->vep; - sid = vep->next_sid; - if (session->is_vep_session) + case VPPCOM_ATTR_SET_REUSEADDR: + if (buffer && buflen && (*buflen == sizeof (int)) && + !VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_LISTEN)) { - if (VPPCOM_DEBUG > 1) - 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_sid, vep->next_sid, - vep->prev_sid, vep->prev_sid, - vep->vep_idx, vep->vep_idx, - vep->ev.events, vep->ev.data.u64, vep->et_mask); - } - if (sid != ~0) - { - rv = vppcom_session_at_index (sid, &session); - if (PREDICT_FALSE (rv)) - { - clib_warning ("ERROR: Invalid sid (%u)!", sid); - goto done; - } - if (PREDICT_FALSE (session->is_vep)) - clib_warning ("ERROR: sid (%u) is a vep!", vep_idx); - else if (PREDICT_FALSE (!session->is_vep_session)) - { - clib_warning ("ERROR: session (%u) is not a vep session!", sid); - goto done; - } - if (PREDICT_FALSE (session->vep.vep_idx != vep_idx)) - clib_warning ("ERROR: session (%u) vep_idx (%u) != " - "vep_idx (%u)!", - sid, session->vep.vep_idx, vep_idx); + /* VPP-TBD */ + if (*(int *) buffer) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_REUSEADDR); + 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); } - } - while (sid != ~0); + else + rv = VPPCOM_EINVAL; + break; -done: - if (VPPCOM_DEBUG > 1) - clib_warning ("vep_idx (%u): Dump complete!", vep_idx); -} + case VPPCOM_ATTR_GET_REUSEPORT: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + /* VPP-TBD */ + *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_REUSEPORT); + *buflen = sizeof (int); -int -vppcom_epoll_create (void) -{ - vppcom_main_t *vcm = &vppcom_main; - session_t *vep_session; - u32 vep_idx; + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEPORT: %d, buflen %d," + " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + } + else + rv = VPPCOM_EINVAL; + break; - clib_spinlock_lock (&vcm->sessions_lockp); - pool_get (vcm->sessions, vep_session); - memset (vep_session, 0, sizeof (*vep_session)); - vep_idx = vep_session - vcm->sessions; + case VPPCOM_ATTR_SET_REUSEPORT: + if (buffer && buflen && (*buflen == sizeof (int)) && + !VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_LISTEN)) + { + /* VPP-TBD */ + if (*(int *) buffer) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_REUSEPORT); + else + VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEPORT); - vep_session->is_vep = 1; - vep_session->vep.vep_idx = ~0; - vep_session->vep.next_sid = ~0; - vep_session->vep.prev_sid = ~0; - vep_session->wait_cont_idx = ~0; - clib_spinlock_unlock (&vcm->sessions_lockp); + 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); + } + else + rv = VPPCOM_EINVAL; + break; - if (VPPCOM_DEBUG > 0) - clib_warning ("Created vep_idx %u!", vep_idx); + case VPPCOM_ATTR_GET_BROADCAST: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + /* VPP-TBD */ + *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_BROADCAST); + *buflen = sizeof (int); - return (vep_idx); -} + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_BROADCAST: %d, buflen %d," + " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + } + else + rv = VPPCOM_EINVAL; + break; -int -vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, - struct epoll_event *event) -{ - vppcom_main_t *vcm = &vppcom_main; - session_t *vep_session; - session_t *session; - int rv; + case VPPCOM_ATTR_SET_BROADCAST: + if (buffer && buflen && (*buflen == sizeof (int))) + { + /* VPP-TBD */ + if (*(int *) buffer) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_BROADCAST); + else + VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_BROADCAST); - if (vep_idx == session_index) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("ERROR: vep_idx == session_index (%u)!", vep_idx); - return VPPCOM_EINVAL; - } + 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); + } + else + rv = VPPCOM_EINVAL; + break; - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (vep_idx, &vep_session); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("ERROR: Invalid vep_idx (%u)!", vep_idx); - goto done; - } - if (PREDICT_FALSE (!vep_session->is_vep)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("ERROR: vep_idx (%u) is not a vep!", vep_idx); - rv = VPPCOM_EINVAL; - goto done; - } + case VPPCOM_ATTR_GET_V6ONLY: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + /* VPP-TBD */ + *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_V6ONLY); + *buflen = sizeof (int); - ASSERT (vep_session->vep.vep_idx == ~0); - ASSERT (vep_session->vep.prev_sid == ~0); + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_V6ONLY: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + } + else + rv = VPPCOM_EINVAL; + break; - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("ERROR: Invalid session_index (%u)!", session_index); - goto done; - } - if (PREDICT_FALSE (session->is_vep)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("ERROR: session_index (%u) is a vep!", vep_idx); - rv = VPPCOM_EINVAL; - goto done; - } + case VPPCOM_ATTR_SET_V6ONLY: + if (buffer && buflen && (*buflen == sizeof (int))) + { + /* VPP-TBD */ + if (*(int *) buffer) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_V6ONLY); + 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); + } + else + rv = VPPCOM_EINVAL; + break; + + case VPPCOM_ATTR_GET_KEEPALIVE: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + /* VPP-TBD */ + *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_KEEPALIVE); + *buflen = sizeof (int); + + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_KEEPALIVE: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + } + else + rv = VPPCOM_EINVAL; + break; - switch (op) - { - case EPOLL_CTL_ADD: - if (PREDICT_FALSE (!event)) + case VPPCOM_ATTR_SET_KEEPALIVE: + if (buffer && buflen && (*buflen == sizeof (int))) { - clib_warning ("NULL pointer to epoll_event structure!"); - rv = VPPCOM_EINVAL; - goto done; + /* VPP-TBD */ + if (*(int *) buffer) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_KEEPALIVE); + 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); } - if (vep_session->vep.next_sid != ~0) + else + rv = VPPCOM_EINVAL; + break; + + case VPPCOM_ATTR_GET_TCP_NODELAY: + if (buffer && buflen && (*buflen >= sizeof (int))) { - session_t *next_session; - rv = vppcom_session_at_index (vep_session->vep.next_sid, - &next_session); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("EPOLL_CTL_ADD: Invalid vep.next_sid (%u) on" - " vep_idx (%u)!", vep_session->vep.next_sid, - vep_idx); - goto done; - } - ASSERT (next_session->vep.prev_sid == vep_idx); - next_session->vep.prev_sid = session_index; + /* VPP-TBD */ + *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, + 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); } - session->vep.next_sid = vep_session->vep.next_sid; - session->vep.prev_sid = vep_idx; - session->vep.vep_idx = vep_idx; - session->vep.et_mask = VEP_DEFAULT_ET_MASK; - session->vep.ev = *event; - session->is_vep_session = 1; - vep_session->vep.next_sid = session_index; - if (VPPCOM_DEBUG > 1) - clib_warning ("EPOLL_CTL_ADD: vep_idx %u, sid %u, events 0x%x," - " data 0x%llx!", vep_idx, session_index, - event->events, event->data.u64); + else + rv = VPPCOM_EINVAL; break; - case EPOLL_CTL_MOD: - if (PREDICT_FALSE (!event)) + case VPPCOM_ATTR_SET_TCP_NODELAY: + if (buffer && buflen && (*buflen == sizeof (int))) { - clib_warning ("NULL pointer to epoll_event structure!"); - rv = VPPCOM_EINVAL; - goto done; + /* VPP-TBD */ + if (*(int *) buffer) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_NODELAY); + 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); } - if (PREDICT_FALSE (!session->is_vep_session && - (session->vep.vep_idx != vep_idx))) + else + rv = VPPCOM_EINVAL; + break; + + case VPPCOM_ATTR_GET_TCP_KEEPIDLE: + if (buffer && buflen && (*buflen >= sizeof (int))) { - if (VPPCOM_DEBUG > 0) - { - if (!session->is_vep_session) - clib_warning ("EPOLL_CTL_MOD: session (%u) is not " - "a vep session!", session_index); - else - clib_warning ("EPOLL_CTL_MOD: session (%u) vep_idx (%u) != " - "vep_idx (%u)!", session_index, - session->vep.vep_idx, vep_idx); - } - rv = VPPCOM_EINVAL; - goto done; + /* VPP-TBD */ + *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, + 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); } - session->vep.et_mask = VEP_DEFAULT_ET_MASK; - session->vep.ev = *event; - if (VPPCOM_DEBUG > 1) - clib_warning ("EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x," - " data 0x%llx!", vep_idx, session_index, - event->events, event->data.u64); + else + rv = VPPCOM_EINVAL; break; - case EPOLL_CTL_DEL: - if (PREDICT_FALSE (!session->is_vep_session && - (session->vep.vep_idx != vep_idx))) + case VPPCOM_ATTR_SET_TCP_KEEPIDLE: + if (buffer && buflen && (*buflen == sizeof (int))) { - if (VPPCOM_DEBUG > 0) - { - if (!session->is_vep_session) - clib_warning ("EPOLL_CTL_DEL: session (%u) is not " - "a vep session!", session_index); - else - clib_warning ("EPOLL_CTL_DEL: session (%u) vep_idx (%u) != " - "vep_idx (%u)!", session_index, - session->vep.vep_idx, vep_idx); - } - rv = VPPCOM_EINVAL; - goto done; + /* VPP-TBD */ + if (*(int *) buffer) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE); + 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 (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_TCP_KEEPIDLE), *buflen); } + else + rv = VPPCOM_EINVAL; + break; - vep_session->wait_cont_idx = - (vep_session->wait_cont_idx == session_index) ? - session->vep.next_sid : vep_session->wait_cont_idx; + case VPPCOM_ATTR_GET_TCP_KEEPINTVL: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + /* VPP-TBD */ + *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_TCP_KEEPINTVL); + *buflen = sizeof (int); - if (session->vep.prev_sid == vep_idx) - vep_session->vep.next_sid = session->vep.next_sid; + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + } else + rv = VPPCOM_EINVAL; + break; + + case VPPCOM_ATTR_SET_TCP_KEEPINTVL: + if (buffer && buflen && (*buflen == sizeof (int))) { - session_t *prev_session; - rv = vppcom_session_at_index (session->vep.prev_sid, &prev_session); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("EPOLL_CTL_DEL: Invalid vep.prev_sid (%u) on" - " sid (%u)!", session->vep.prev_sid, - session_index); - goto done; - } - ASSERT (prev_session->vep.next_sid == session_index); - prev_session->vep.next_sid = session->vep.next_sid; + /* VPP-TBD */ + if (*(int *) buffer) + VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL); + 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 (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_TCP_KEEPINTVL), *buflen); } - if (session->vep.next_sid != ~0) + else + rv = VPPCOM_EINVAL; + break; + + case VPPCOM_ATTR_GET_TCP_USER_MSS: + if (buffer && buflen && (*buflen >= sizeof (u32))) { - session_t *next_session; - rv = vppcom_session_at_index (session->vep.next_sid, &next_session); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("EPOLL_CTL_DEL: Invalid vep.next_sid (%u) on" - " sid (%u)!", session->vep.next_sid, - session_index); - goto done; - } - ASSERT (next_session->vep.prev_sid == session_index); - next_session->vep.prev_sid = session->vep.prev_sid; + /* VPP-TBD */ + *(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); } + else + rv = VPPCOM_EINVAL; + break; - memset (&session->vep, 0, sizeof (session->vep)); - session->vep.next_sid = ~0; - session->vep.prev_sid = ~0; - session->vep.vep_idx = ~0; - session->is_vep_session = 0; - if (VPPCOM_DEBUG > 1) - clib_warning ("EPOLL_CTL_DEL: vep_idx %u, sid %u!", vep_idx, - session_index); + case VPPCOM_ATTR_SET_TCP_USER_MSS: + if (buffer && buflen && (*buflen == sizeof (u32))) + { + /* 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); + } + else + rv = VPPCOM_EINVAL; break; default: - clib_warning ("Invalid operation (%d)!", op); rv = VPPCOM_EINVAL; + break; } - vep_verify_epoll_chain (vep_idx); - -done: - clib_spinlock_unlock (&vcm->sessions_lockp); return rv; } -#define VCL_LOCK_AND_GET_SESSION(I, S) \ -do { \ - vppcom_main_t *vcm = &vppcom_main; \ - \ - clib_spinlock_lock (&vcm->sessions_lockp); \ - rv = vppcom_session_at_index (I, S); \ - if (PREDICT_FALSE (rv)) \ - { \ - clib_spinlock_unlock (&vcm->sessions_lockp); \ - \ - if (VPPCOM_DEBUG > 0) \ - clib_warning ("ERROR: Invalid ##I (%u)!", I); \ - \ - goto done; \ - } \ -} while (0) - int -vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, - int maxevents, double wait_for_time) +vppcom_session_recvfrom (uint32_t session_handle, void *buffer, + uint32_t buflen, int flags, vppcom_endpt_t * ep) { - vppcom_main_t *vcm = &vppcom_main; - session_t *vep_session; - int rv; - f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time; - int num_ev = 0; - u32 vep_next_sid, wait_cont_idx; - u8 is_vep; + vcl_worker_t *wrk = vcl_worker_get_current (); + int rv = VPPCOM_OK; + vcl_session_t *session = 0; - if (PREDICT_FALSE (maxevents <= 0)) + if (ep) { - if (VPPCOM_DEBUG > 0) - clib_warning ("ERROR: Invalid maxevents (%d)!", maxevents); - return VPPCOM_EINVAL; + 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); + else if (flags & MSG_PEEK) + rv = vppcom_session_peek (session_handle, buffer, buflen); + else + { + clib_warning ("VCL<%d>: Unsupport flags for recvfrom %d", + getpid (), flags); + return VPPCOM_EAFNOSUPPORT; } - if (PREDICT_FALSE (wait_for_time < 0)) + + if (ep) { - if (VPPCOM_DEBUG > 0) - clib_warning ("ERROR: Invalid wait_for_time (%f)!", wait_for_time); - return VPPCOM_EINVAL; + 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)); } - memset (events, 0, sizeof (*events) * maxevents); - VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session); - vep_next_sid = vep_session->vep.next_sid; - is_vep = vep_session->is_vep; - wait_cont_idx = vep_session->wait_cont_idx; - clib_spinlock_unlock (&vcm->sessions_lockp); + return rv; +} + +int +vppcom_session_sendto (uint32_t session_handle, void *buffer, + uint32_t buflen, int flags, vppcom_endpt_t * ep) +{ + if (!buffer) + return VPPCOM_EINVAL; - if (PREDICT_FALSE (!is_vep)) + if (ep) { - if (VPPCOM_DEBUG > 0) - clib_warning ("ERROR: vep_idx (%u) is not a vep!", vep_idx); - rv = VPPCOM_EINVAL; - goto done; + // TBD + return VPPCOM_EINVAL; } - if ((VPPCOM_DEBUG > 0) && (PREDICT_FALSE (vep_next_sid == ~0))) + + if (flags) { - clib_warning ("WARNING: vep_idx (%u) is empty!", vep_idx); - goto done; + // TBD check the flags and do the right thing + VDBG (2, "VCL<%d>: handling flags 0x%u (%d) not implemented yet.", + getpid (), flags, flags); } + return (vppcom_session_write (session_handle, buffer, buflen)); +} + +int +vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + f64 timeout = clib_time_now (&wrk->clib_time) + wait_for_time; + u32 i, keep_trying = 1; + svm_msg_q_msg_t msg; + 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); + + if (!vp) + return VPPCOM_EFAULT; + do { - u32 sid; - u32 next_sid = ~0; - session_t *session; - - for (sid = (wait_cont_idx == ~0) ? vep_next_sid : wait_cont_idx; - sid != ~0; sid = next_sid) - { - u32 session_events, et_mask, clear_et_mask, session_vep_idx; - u8 add_event, is_vep_session; - int ready; - u64 session_ev_data; - - VCL_LOCK_AND_GET_SESSION (sid, &session); - next_sid = session->vep.next_sid; - session_events = session->vep.ev.events; - et_mask = session->vep.et_mask; - is_vep = session->is_vep; - is_vep_session = session->is_vep_session; - session_vep_idx = session->vep.vep_idx; - session_ev_data = session->vep.ev.data.u64; - clib_spinlock_unlock (&vcm->sessions_lockp); - - if (PREDICT_FALSE (is_vep)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("ERROR: sid (%u) is a vep!", vep_idx); - rv = VPPCOM_EINVAL; - goto done; - } - if (PREDICT_FALSE (!is_vep_session)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("EPOLL_CTL_MOD: session (%u) is not " - "a vep session!", sid); - rv = VPPCOM_EINVAL; - goto done; - } - if (PREDICT_FALSE (session_vep_idx != vep_idx)) + vcl_session_t *session; + + /* Dequeue all events and drop all unhandled io events */ + while (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_NOWAIT, 0) == 0) + { + e = svm_msg_q_msg_data (wrk->app_event_queue, &msg); + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); + } + vec_reset_length (wrk->unhandled_evts_vector); + + for (i = 0; i < n_sids; i++) + { + session = vcl_session_get (wrk, vp[i].sid); + if (!session) { - clib_warning ("EPOLL_CTL_MOD: session (%u) " - "vep_idx (%u) != vep_idx (%u)!", - sid, session->vep.vep_idx, vep_idx); - rv = VPPCOM_EINVAL; - goto done; + vp[i].revents = POLLHUP; + num_ev++; + continue; } - add_event = clear_et_mask = 0; + vp[i].revents = 0; - if ((EPOLLIN & session_events) && (EPOLLIN & et_mask)) + if (POLLIN & vp[i].events) { - VCL_LOCK_AND_GET_SESSION (sid, &session); - ready = vppcom_session_read_ready (session, sid); - clib_spinlock_unlock (&vcm->sessions_lockp); - if (ready > 0) + rv = vppcom_session_read_ready (session); + if (rv > 0) { - add_event = 1; - events[num_ev].events |= EPOLLIN; - if (EPOLLET & session_events) - clear_et_mask |= EPOLLIN; + vp[i].revents |= POLLIN; + num_ev++; } - else if (ready < 0) + else if (rv < 0) { - add_event = 1; - switch (ready) + switch (rv) { case VPPCOM_ECONNRESET: - events[num_ev].events |= EPOLLHUP | EPOLLRDHUP; + vp[i].revents = POLLHUP; break; default: - events[num_ev].events |= EPOLLERR; + vp[i].revents = POLLERR; break; } + num_ev++; } } - if ((EPOLLOUT & session_events) && (EPOLLOUT & et_mask)) + if (POLLOUT & vp[i].events) { - VCL_LOCK_AND_GET_SESSION (sid, &session); - ready = vppcom_session_write_ready (session, sid); - clib_spinlock_unlock (&vcm->sessions_lockp); - if (ready > 0) + rv = vppcom_session_write_ready (session); + if (rv > 0) { - add_event = 1; - events[num_ev].events |= EPOLLOUT; - if (EPOLLET & session_events) - clear_et_mask |= EPOLLOUT; + vp[i].revents |= POLLOUT; + num_ev++; } - else if (ready < 0) + else if (rv < 0) { - add_event = 1; - switch (ready) + switch (rv) { case VPPCOM_ECONNRESET: - events[num_ev].events |= EPOLLHUP; + vp[i].revents = POLLHUP; break; default: - events[num_ev].events |= EPOLLERR; + vp[i].revents = POLLERR; break; } + num_ev++; } } - if (add_event) + if (0) // Note "done:" label used by VCL_SESSION_LOCK_AND_GET() { - events[num_ev].data.u64 = session_ev_data; - if (EPOLLONESHOT & session_events) - { - VCL_LOCK_AND_GET_SESSION (sid, &session); - session->vep.ev.events = 0; - clib_spinlock_unlock (&vcm->sessions_lockp); - } + vp[i].revents = POLLNVAL; num_ev++; - if (num_ev == maxevents) - { - VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session); - vep_session->wait_cont_idx = next_sid; - clib_spinlock_unlock (&vcm->sessions_lockp); - goto done; - } - } - if (wait_cont_idx != ~0) - { - if (next_sid == ~0) - next_sid = vep_next_sid; - else if (next_sid == wait_cont_idx) - next_sid = ~0; } } + if (wait_for_time != -1) + keep_trying = (clib_time_now (&wrk->clib_time) <= timeout) ? 1 : 0; } - while ((num_ev == 0) && (clib_time_now (&vcm->clib_time) <= timeout)); + while ((num_ev == 0) && keep_trying); - if (wait_cont_idx != ~0) + if (VPPCOM_DEBUG > 3) { - VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session); - vep_session->wait_cont_idx = ~0; - clib_spinlock_unlock (&vcm->sessions_lockp); + 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].sid, vp[i].sid, + vp[i].events, vp[i].revents); + } } -done: - return (rv != VPPCOM_OK) ? rv : num_ev; + return num_ev; } int -vppcom_session_attr (uint32_t session_index, uint32_t op, - void *buffer, uint32_t * buflen) +vppcom_mq_epoll_fd (void) { - vppcom_main_t *vcm = &vppcom_main; - session_t *session; - int rv = VPPCOM_OK; - u32 *flags = buffer; - vppcom_endpt_t *ep = buffer; - - VCL_LOCK_AND_GET_SESSION (session_index, &session); - switch (op) - { - case VPPCOM_ATTR_GET_NREAD: - rv = vppcom_session_read_ready (session, session_index); - if (VPPCOM_DEBUG > 1) - clib_warning ("VPPCOM_ATTR_GET_NREAD: nread = %d", rv); - - break; - - case VPPCOM_ATTR_PEEK_NREAD: - /* TBD */ - break; - - case VPPCOM_ATTR_GET_FLAGS: - if (buffer && buflen && (*buflen >= sizeof (*flags))) - { - *flags = O_RDWR | ((session->is_nonblocking) ? O_NONBLOCK : 0); - *buflen = sizeof (*flags); - if (VPPCOM_DEBUG > 1) - clib_warning ("VPPCOM_ATTR_GET_FLAGS: flags = 0x%08x, " - "is_nonblocking = %u", *flags, - session->is_nonblocking); - } - else - rv = VPPCOM_EINVAL; - break; - - case VPPCOM_ATTR_SET_FLAGS: - if (buffer && buflen && (*buflen >= sizeof (*flags))) - { - session->is_nonblocking = (*flags & O_NONBLOCK) ? 1 : 0; - if (VPPCOM_DEBUG > 1) - clib_warning ("VPPCOM_ATTR_SET_FLAGS: flags = 0x%08x, " - "is_nonblocking = %u", *flags, - session->is_nonblocking); - } - else - rv = VPPCOM_EINVAL; - break; - - case VPPCOM_ATTR_GET_PEER_ADDR: - if (buffer && buflen && (*buflen >= sizeof (*ep))) - { - ep->vrf = session->vrf; - ep->is_ip4 = session->peer_addr.is_ip4; - ep->port = session->peer_port; - if (session->peer_addr.is_ip4) - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip4, - sizeof (ip4_address_t)); - else - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip6, - sizeof (ip6_address_t)); - *buflen = sizeof (*ep); - if (VPPCOM_DEBUG > 1) - clib_warning ("VPPCOM_ATTR_GET_PEER_ADDR: sid %u is_ip4 = %u, " - "addr = %U, port %u", session_index, - ep->is_ip4, format_ip46_address, - &session->peer_addr.ip46, ep->is_ip4, - clib_net_to_host_u16 (ep->port)); - } - else - rv = VPPCOM_EINVAL; - break; - - case VPPCOM_ATTR_GET_LCL_ADDR: - if (buffer && buflen && (*buflen >= sizeof (*ep))) - { - ep->vrf = session->vrf; - ep->is_ip4 = session->lcl_addr.is_ip4; - ep->port = session->lcl_port; - if (session->lcl_addr.is_ip4) - clib_memcpy (ep->ip, &session->lcl_addr.ip46.ip4, - sizeof (ip4_address_t)); - else - clib_memcpy (ep->ip, &session->lcl_addr.ip46.ip6, - sizeof (ip6_address_t)); - *buflen = sizeof (*ep); - if (VPPCOM_DEBUG > 1) - clib_warning ("VPPCOM_ATTR_GET_LCL_ADDR: sid %u is_ip4 = %u, " - "addr = %U port %d", session_index, - ep->is_ip4, format_ip46_address, - &session->lcl_addr.ip46, ep->is_ip4, - clib_net_to_host_u16 (ep->port)); - } - else - rv = VPPCOM_EINVAL; - break; - - case VPPCOM_ATTR_SET_REUSEADDR: - break; - - case VPPCOM_ATTR_SET_BROADCAST: - break; - - case VPPCOM_ATTR_SET_V6ONLY: - break; - - case VPPCOM_ATTR_SET_KEEPALIVE: - break; - - case VPPCOM_ATTR_SET_TCP_KEEPIDLE: - break; - - case VPPCOM_ATTR_SET_TCP_KEEPINTVL: - break; - - default: - rv = VPPCOM_EINVAL; - break; - } - -done: - clib_spinlock_unlock (&vcm->sessions_lockp); - return rv; + vcl_worker_t *wrk = vcl_worker_get_current (); + return wrk->mqs_epfd; } int -vppcom_session_recvfrom (uint32_t session_index, void *buffer, - uint32_t buflen, int flags, vppcom_endpt_t * ep) +vppcom_session_index (uint32_t session_handle) { - vppcom_main_t *vcm = &vppcom_main; - int rv = VPPCOM_OK; - session_t *session = 0; - - if (ep) - { - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("[%d] invalid session, sid (%u) has been closed!", - vcm->my_pid, session_index); - rv = VPPCOM_EBADFD; - clib_spinlock_unlock (&vcm->sessions_lockp); - goto done; - } - ep->vrf = session->vrf; - ep->is_ip4 = session->peer_addr.is_ip4; - ep->port = session->peer_port; - if (session->peer_addr.is_ip4) - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip4, - sizeof (ip4_address_t)); - else - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip6, - sizeof (ip6_address_t)); - clib_spinlock_unlock (&vcm->sessions_lockp); - } - - if (flags == 0) - rv = vppcom_session_read (session_index, buffer, buflen); - else if (flags & MSG_PEEK) - rv = vppcom_session_peek (session_index, buffer, buflen); - else - { - clib_warning ("Unsupport flags for recvfrom %d", flags); - rv = VPPCOM_EAFNOSUPPORT; - } - -done: - return rv; + return session_handle & 0xFFFFFF; } int -vppcom_session_sendto (uint32_t session_index, void *buffer, - uint32_t buflen, int flags, vppcom_endpt_t * ep) +vppcom_worker_register (void) { - vppcom_main_t *vcm = &vppcom_main; - - if (!buffer) - return VPPCOM_EINVAL; - - if (ep) - { - // TBD - return VPPCOM_EINVAL; - } - - if (flags) - { - // TBD check the flags and do the right thing - if (VPPCOM_DEBUG > 2) - clib_warning ("[%d] handling flags 0x%u (%d) not implemented yet.", - vcm->my_pid, flags, flags); - } - - return (vppcom_session_write (session_index, buffer, buflen)); + if (vcl_worker_alloc_and_init ()) + return VPPCOM_OK; + return VPPCOM_EEXIST; } /*