X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=0e5d4fab328340de3386a765f5c1e96dcebe336c;hb=72228a259b8f09fad271c2c117f7acd5348ae2c9;hp=794a030456e9fcd27ab1c4711925284117135457;hpb=0d427d8d8a48af404dfc6535ae72d334b790f809;p=vpp.git diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index 794a030456e..3847bf224a7 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this * You may obtain a copy of the License at: @@ -15,1983 +15,1373 @@ #include #include -#include -#include -#include -#include -#include #include -#include #include -#include -#include - -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs - -/* declare message handlers for each api */ - -#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_INIT 2 for connection debug, - * 3 for read/write debug output - * or - * export VCL_DEBUG=<#> to set dynamically. - */ -#define VPPCOM_DEBUG_INIT 1 -#else -#define VPPCOM_DEBUG_INIT 0 -#endif - -#define VPPCOM_DEBUG vcm->debug - -/* - * 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 = 0x01, - STATE_CONNECT = 0x02, - STATE_LISTEN = 0x04, - STATE_ACCEPT = 0x08, - STATE_CLOSE_ON_EMPTY = 0x10, - STATE_DISCONNECT = 0x20, - STATE_FAILED = 0x40 -} session_state_t; +#include +#include -#define SERVER_STATE_OPEN (STATE_ACCEPT|STATE_CLOSE_ON_EMPTY) -#define CLIENT_STATE_OPEN (STATE_CONNECT|STATE_CLOSE_ON_EMPTY) +__thread uword __vcl_worker_index = ~0; -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) -#define VEP_UNSUPPORTED_EVENTS (EPOLLONESHOT|EPOLLEXCLUSIVE) - u32 et_mask; -} vppcom_epoll_t; - -typedef struct -{ - u8 is_ip4; - ip46_address_t ip46; -} vppcom_ip46_t; - -enum -{ - VCL_SESS_ATTR_SERVER, - VCL_SESS_ATTR_CUT_THRU, - VCL_SESS_ATTR_VEP, - VCL_SESS_ATTR_VEP_SESSION, - VCL_SESS_ATTR_LISTEN, // SOL_SOCKET,SO_ACCEPTCONN - VCL_SESS_ATTR_NONBLOCK, // fcntl,O_NONBLOCK - VCL_SESS_ATTR_REUSEADDR, // SOL_SOCKET,SO_REUSEADDR - VCL_SESS_ATTR_REUSEPORT, // SOL_SOCKET,SO_REUSEPORT - VCL_SESS_ATTR_BROADCAST, // SOL_SOCKET,SO_BROADCAST - VCL_SESS_ATTR_V6ONLY, // SOL_TCP,IPV6_V6ONLY - VCL_SESS_ATTR_KEEPALIVE, // SOL_SOCKET,SO_KEEPALIVE - VCL_SESS_ATTR_TCP_NODELAY, // SOL_TCP,TCP_NODELAY - VCL_SESS_ATTR_TCP_KEEPIDLE, // SOL_TCP,TCP_KEEPIDLE - VCL_SESS_ATTR_TCP_KEEPINTVL, // SOL_TCP,TCP_KEEPINTVL - VCL_SESS_ATTR_MAX -} vppcom_session_attr_t; - -#define VCL_SESS_ATTR_SET(ATTR, VAL) \ -do { \ - (ATTR) |= 1 << (VAL); \ - } while (0) - -#define VCL_SESS_ATTR_CLR(ATTR, VAL) \ -do { \ - (ATTR) &= ~(1 << (VAL)); \ - } while (0) - -#define VCL_SESS_ATTR_TEST(ATTR, VAL) \ - ((ATTR) & (1 << (VAL)) ? 1 : 0) - -typedef struct -{ - volatile session_state_t state; - - svm_fifo_t *rx_fifo; - svm_fifo_t *tx_fifo; - u32 sndbuf_size; // VPP-TBD: Hack until support setsockopt(SO_SNDBUF) - u32 rcvbuf_size; // VPP-TBD: Hack until support setsockopt(SO_RCVBUF) - u32 user_mss; // VPP-TBD: Hack until support setsockopt(TCP_MAXSEG) - u8 *segment_name; - u32 sm_seg_index; - u32 client_context; - u64 vpp_handle; - svm_queue_t *vpp_event_queue; - - /* Socket configuration state */ - u8 is_vep; - u8 is_vep_session; - u32 attr; - u32 wait_cont_idx; - vppcom_epoll_t vep; - int libc_epfd; - 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]; - elog_track_t elog_track; - vce_event_handler_reg_t *poll_reg; -} session_t; - -typedef struct vppcom_cfg_t_ -{ - u64 heapsize; - u32 vpp_api_q_length; - 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 app_proxy_transport_tcp; - u8 app_proxy_transport_udp; - u8 app_scope_local; - u8 app_scope_global; - u8 *namespace_id; - u64 namespace_secret; - f64 app_timeout; - f64 session_timeout; - f64 accept_timeout; - u32 event_ring_size; - char *event_log_path; - u8 *vpp_api_filename; -} vppcom_cfg_t; - -typedef struct vppcom_main_t_ +static inline int +vcl_mq_dequeue_batch (vcl_worker_t * wrk, svm_msg_q_t * mq, u32 n_max_msg) { - u8 init; - u32 debug; - int main_cpu; - - /* FIFO for accepted connections - used in epoll/select */ - clib_spinlock_t session_fifo_lockp; - u32 *client_session_index_fifo; - - /* vpp input queue */ - svm_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 */ - svm_queue_t *app_event_queue; - - /* unique segment name counter */ - u32 unique_segment_index; - - /* 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; - - /* Event thread */ - vce_event_thread_t event_thread; - - /* IO thread */ - vppcom_session_io_thread_t session_io_thread; + u32 n_msgs = 0, sz, len; -#ifdef VCL_ELOG - /* VPP Event-logger */ - elog_main_t elog_main; - elog_track_t elog_track; -#endif - - /* VNET_API_ERROR_FOO -> "Foo" hash table */ - uword *error_string_by_error_number; -} vppcom_main_t; + while ((sz = svm_msg_q_size (mq))) + { + len = vec_len (wrk->mq_msg_vector); + vec_validate (wrk->mq_msg_vector, len + sz - 1); + svm_msg_q_sub_raw_batch (mq, wrk->mq_msg_vector + len, sz); + n_msgs += sz; + } + return n_msgs; +} -/* NOTE: _vppcom_main is only used until the heap is allocated. - * Do not access it directly -- use vcm which will point to - * the heap allocated copy after init. - */ -static vppcom_main_t _vppcom_main = { - .debug = VPPCOM_DEBUG_INIT, - .my_client_index = ~0 -}; - -static vppcom_main_t *vcm = &_vppcom_main; - -#define VCL_SESSION_LOCK_AND_GET(I, S) \ -do { \ - clib_spinlock_lock (&vcm->sessions_lockp); \ - rv = vppcom_session_at_index (I, S); \ - if (PREDICT_FALSE (rv)) \ - { \ - clib_spinlock_unlock (&vcm->sessions_lockp); \ - clib_warning ("VCL<%d>: ERROR: Invalid ##I (%u)!", \ - getpid (), I); \ - goto done; \ - } \ -} while (0) - -#define VCL_SESSION_LOCK() clib_spinlock_lock (&(vcm->sessions_lockp)) -#define VCL_SESSION_UNLOCK() clib_spinlock_unlock (&(vcm->sessions_lockp)) - -#define VCL_IO_SESSIONS_LOCK() \ - clib_spinlock_lock (&(vcm->session_io_thread.io_sessions_lockp)) -#define VCL_IO_SESSIONS_UNLOCK() \ - clib_spinlock_unlock (&(vcm->session_io_thread.io_sessions_lockp)) - -#define VCL_ACCEPT_FIFO_LOCK() clib_spinlock_lock (&(vcm->session_fifo_lockp)) -#define VCL_ACCEPT_FIFO_UNLOCK() \ - clib_spinlock_unlock (&(vcm->session_fifo_lockp)) - -#define VCL_EVENTS_LOCK() \ - clib_spinlock_lock (&(vcm->event_thread.events_lockp)) -#define VCL_EVENTS_UNLOCK() \ - clib_spinlock_unlock (&(vcm->event_thread.events_lockp)) - -static const char * -vppcom_app_state_str (app_state_t state) +const char * +vppcom_session_state_str (vcl_session_state_t state) { char *st; switch (state) { - case STATE_APP_START: - st = "STATE_APP_START"; + case VCL_STATE_CLOSED: + st = "STATE_CLOSED"; break; - - case STATE_APP_CONN_VPP: - st = "STATE_APP_CONN_VPP"; + case VCL_STATE_LISTEN: + st = "STATE_LISTEN"; break; - - case STATE_APP_ENABLED: - st = "STATE_APP_ENABLED"; + case VCL_STATE_READY: + st = "STATE_READY"; break; - - case STATE_APP_ATTACHED: - st = "STATE_APP_ATTACHED"; + case VCL_STATE_VPP_CLOSING: + st = "STATE_VPP_CLOSING"; + break; + case VCL_STATE_DISCONNECT: + st = "STATE_DISCONNECT"; + break; + case VCL_STATE_DETACHED: + st = "STATE_DETACHED"; + break; + case VCL_STATE_UPDATED: + st = "STATE_UPDATED"; + break; + case VCL_STATE_LISTEN_NO_MQ: + st = "STATE_LISTEN_NO_MQ"; break; - default: - st = "UNKNOWN_APP_STATE"; + st = "UNKNOWN_STATE"; break; } return st; } -static const char * -vppcom_session_state_str (session_state_t state) +u8 * +format_ip4_address (u8 * s, va_list * args) { - char *st; + u8 *a = va_arg (*args, u8 *); + return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]); +} - switch (state) - { - case STATE_START: - st = "STATE_START"; - break; +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; - case STATE_CONNECT: - st = "STATE_CONNECT"; - break; + 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++) + { + 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; + } + } - case STATE_LISTEN: - st = "STATE_LISTEN"; - break; + 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; + } + } - case STATE_ACCEPT: - st = "STATE_ACCEPT"; - break; + return s; +} - case STATE_CLOSE_ON_EMPTY: - st = "STATE_CLOSE_ON_EMPTY"; - break; +/* Format an IP46 address. */ +u8 * +format_ip46_address (u8 * s, va_list * args) +{ + ip46_address_t *ip46 = va_arg (*args, ip46_address_t *); + ip46_type_t type = va_arg (*args, ip46_type_t); + int is_ip4 = 1; - case STATE_DISCONNECT: - st = "STATE_DISCONNECT"; + switch (type) + { + case IP46_TYPE_ANY: + is_ip4 = ip46_address_is_ip4 (ip46); break; - - case STATE_FAILED: - st = "STATE_FAILED"; + case IP46_TYPE_IP4: + is_ip4 = 1; break; - - default: - st = "UNKNOWN_STATE"; + case IP46_TYPE_IP6: + is_ip4 = 0; break; } - return st; + return is_ip4 ? + format (s, "%U", format_ip4_address, &ip46->ip4) : + format (s, "%U", format_ip6_address, &ip46->ip6); } - /* * VPPCOM Utility Functions */ -static inline int -vppcom_session_at_index (u32 session_index, session_t * volatile *sess) +static void +vcl_msg_add_ext_config (vcl_session_t *s, uword *offset) { - /* Assumes that caller has acquired spinlock: vcm->sessions_lockp */ - if (PREDICT_FALSE ((session_index == ~0) || - pool_is_free_index (vcm->sessions, session_index))) - { - clib_warning ("VCL<%d>: invalid session, sid (%u) has been closed!", - getpid (), session_index); - return VPPCOM_EBADFD; - } - *sess = pool_elt_at_index (vcm->sessions, session_index); - return VPPCOM_OK; -} + svm_fifo_chunk_t *c; -static inline void -vppcom_session_table_add_listener (u64 listener_handle, u32 value) -{ - /* Session and listener handles have different formats. The latter has - * the thread index in the upper 32 bits while the former has the session - * type. Knowing that, for listeners we just flip the MSB to 1 */ - listener_handle |= 1ULL << 63; - hash_set (vcm->session_index_by_vpp_handles, listener_handle, value); + c = vcl_segment_alloc_chunk (vcl_vpp_worker_segment_handle (0), + 0 /* one slice only */, s->ext_config->len, + offset); + if (c) + clib_memcpy_fast (c->data, s->ext_config, s->ext_config->len); } -static inline session_t * -vppcom_session_table_lookup_listener (u64 listener_handle) +static void +vcl_send_session_listen (vcl_worker_t * wrk, vcl_session_t * s) { - uword *p; - u64 handle = listener_handle | (1ULL << 63); - session_t *session; - - p = hash_get (vcm->session_index_by_vpp_handles, handle); - if (!p) + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_listen_msg_t *mp; + svm_msg_q_t *mq; + + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_LISTEN); + mp = (session_listen_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->api_client_handle; + mp->context = s->session_index; + mp->wrk_index = wrk->vpp_wrk_index; + mp->is_ip4 = s->transport.is_ip4; + clib_memcpy_fast (&mp->ip, &s->transport.lcl_ip, sizeof (mp->ip)); + mp->port = s->transport.lcl_port; + mp->proto = s->session_type; + mp->vrf = s->vrf; + if (s->flags & VCL_SESSION_F_CONNECTED) + mp->flags = TRANSPORT_CFG_F_CONNECTED; + if (s->ext_config) + vcl_msg_add_ext_config (s, &mp->ext_config); + app_send_ctrl_evt_to_vpp (mq, app_evt); + if (s->ext_config) { - clib_warning ("VCL<%d>: couldn't find listen session: unknown vpp " - "listener handle %llx", getpid (), listener_handle); - return 0; + clib_mem_free (s->ext_config); + s->ext_config = 0; } - if (pool_is_free_index (vcm->sessions, p[0])) +} + +static void +vcl_send_session_connect (vcl_worker_t * wrk, vcl_session_t * s) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_connect_msg_t *mp; + svm_msg_q_t *mq; + + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_CONNECT); + mp = (session_connect_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->api_client_handle; + mp->context = s->session_index; + mp->wrk_index = wrk->vpp_wrk_index; + mp->is_ip4 = s->transport.is_ip4; + mp->parent_handle = s->parent_handle; + clib_memcpy_fast (&mp->ip, &s->transport.rmt_ip, sizeof (mp->ip)); + clib_memcpy_fast (&mp->lcl_ip, &s->transport.lcl_ip, sizeof (mp->lcl_ip)); + mp->port = s->transport.rmt_port; + mp->lcl_port = s->transport.lcl_port; + mp->proto = s->session_type; + mp->vrf = s->vrf; + if (s->flags & VCL_SESSION_F_CONNECTED) + mp->flags |= TRANSPORT_CFG_F_CONNECTED; + if (s->ext_config) + vcl_msg_add_ext_config (s, &mp->ext_config); + app_send_ctrl_evt_to_vpp (mq, app_evt); + + if (s->ext_config) { - VDBG (1, "VCL<%d>: invalid listen session, sid (%u)", getpid (), p[0]); - return 0; + clib_mem_free (s->ext_config); + s->ext_config = 0; } +} - session = pool_elt_at_index (vcm->sessions, p[0]); - ASSERT (session->state & STATE_LISTEN); - return session; +void +vcl_send_session_unlisten (vcl_worker_t * wrk, vcl_session_t * s) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_unlisten_msg_t *mp; + svm_msg_q_t *mq; + + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_UNLISTEN); + mp = (session_unlisten_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->api_client_handle; + mp->wrk_index = wrk->vpp_wrk_index; + mp->handle = s->vpp_handle; + mp->context = wrk->wrk_index; + app_send_ctrl_evt_to_vpp (mq, app_evt); } -static inline void -vppcom_session_table_del_listener (u64 listener_handle) +static void +vcl_send_session_shutdown (vcl_worker_t *wrk, vcl_session_t *s) { - listener_handle |= 1ULL << 63; - hash_unset (vcm->session_index_by_vpp_handles, listener_handle); + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_shutdown_msg_t *mp; + svm_msg_q_t *mq; + + /* Send to thread that owns the session */ + mq = s->vpp_evt_q; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_SHUTDOWN); + mp = (session_shutdown_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->api_client_handle; + mp->handle = s->vpp_handle; + app_send_ctrl_evt_to_vpp (mq, app_evt); } -static inline void -vppcom_send_accept_session_reply (u64 handle, u32 context, int retval) +static void +vcl_send_session_disconnect (vcl_worker_t * wrk, vcl_session_t * s) { - vl_api_accept_session_reply_t *rmp; + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_disconnect_msg_t *mp; + svm_msg_q_t *mq; + + /* Send to thread that owns the session */ + mq = s->vpp_evt_q; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_DISCONNECT); + mp = (session_disconnect_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->api_client_handle; + mp->handle = s->vpp_handle; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} - 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 (retval); - rmp->context = context; - rmp->handle = handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp); +static void +vcl_send_app_detach (vcl_worker_t * wrk) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_app_detach_msg_t *mp; + svm_msg_q_t *mq; + + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_APP_DETACH); + mp = (session_app_detach_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->api_client_handle; + app_send_ctrl_evt_to_vpp (mq, app_evt); } -static int -vppcom_connect_to_vpp (char *app_name) +static void +vcl_send_session_accepted_reply (svm_msg_q_t * mq, u32 context, + session_handle_t handle, int retval) { - api_main_t *am = &api_main; - vppcom_cfg_t *vcl_cfg = &vcm->cfg; - int rv = VPPCOM_OK; + 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); +} - if (!vcl_cfg->vpp_api_filename) - vcl_cfg->vpp_api_filename = format (0, "/vpe-api%c", 0); +static void +vcl_send_session_disconnected_reply (vcl_worker_t * wrk, vcl_session_t * s, + int retval) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_disconnected_reply_msg_t *rmp; + app_alloc_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt, + SESSION_CTRL_EVT_DISCONNECTED_REPLY); + rmp = (session_disconnected_reply_msg_t *) app_evt->evt->data; + rmp->handle = s->vpp_handle; + rmp->context = wrk->api_client_handle; + rmp->retval = retval; + app_send_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt); +} - VDBG (0, "VCL<%d>: app (%s) connecting to VPP api (%s)...", - getpid (), app_name, vcl_cfg->vpp_api_filename); +static void +vcl_send_session_reset_reply (vcl_worker_t * wrk, vcl_session_t * s, + int retval) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_reset_reply_msg_t *rmp; + app_alloc_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt, + SESSION_CTRL_EVT_RESET_REPLY); + rmp = (session_reset_reply_msg_t *) app_evt->evt->data; + rmp->handle = s->vpp_handle; + rmp->context = wrk->api_client_handle; + rmp->retval = retval; + app_send_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt); +} - if (vl_client_connect_to_vlib ((char *) vcl_cfg->vpp_api_filename, app_name, - vcm->cfg.vpp_api_q_length) < 0) - { - clib_warning ("VCL<%d>: app (%s) connect failed!", getpid (), app_name); - rv = VPPCOM_ECONNREFUSED; - } - else - { - vcm->vl_input_queue = am->shmem_hdr->vl_input_queue; - vcm->my_client_index = (u32) am->my_client_index; - vcm->app_state = STATE_APP_CONN_VPP; +void +vcl_send_session_worker_update (vcl_worker_t * wrk, vcl_session_t * s, + u32 wrk_index) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_worker_update_msg_t *mp; + + app_alloc_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt, + SESSION_CTRL_EVT_WORKER_UPDATE); + mp = (session_worker_update_msg_t *) app_evt->evt->data; + mp->client_index = wrk->api_client_handle; + mp->handle = s->vpp_handle; + mp->req_wrk_index = wrk->vpp_wrk_index; + mp->wrk_index = wrk_index; + app_send_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt); +} - VDBG (0, "VCL<%d>: app (%s) is connected to VPP!", getpid (), app_name); - } +int +vcl_send_worker_rpc (u32 dst_wrk_index, void *data, u32 data_len) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_app_wrk_rpc_msg_t *mp; + vcl_worker_t *dst_wrk, *wrk; + svm_msg_q_t *mq; + int ret = -1; + + if (data_len > sizeof (mp->data)) + goto done; + + clib_spinlock_lock (&vcm->workers_lock); + + dst_wrk = vcl_worker_get_if_valid (dst_wrk_index); + if (!dst_wrk) + goto done; + + wrk = vcl_worker_get_current (); + mq = vcl_worker_ctrl_mq (wrk); + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_APP_WRK_RPC); + mp = (session_app_wrk_rpc_msg_t *) app_evt->evt->data; + mp->client_index = wrk->api_client_handle; + mp->wrk_index = dst_wrk->vpp_wrk_index; + clib_memcpy (mp->data, data, data_len); + app_send_ctrl_evt_to_vpp (mq, app_evt); + ret = 0; - vcl_evt (VCL_EVT_INIT, vcm); - return rv; +done: + clib_spinlock_unlock (&vcm->workers_lock); + return ret; } -static u8 * -format_api_error (u8 * s, va_list * args) +int +vcl_session_transport_attr (vcl_worker_t *wrk, vcl_session_t *s, u8 is_get, + transport_endpt_attr_t *attr) { - i32 error = va_arg (*args, u32); - uword *p; + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_transport_attr_msg_t *mp; + svm_msg_q_t *mq; + f64 timeout; - p = hash_get (vcm->error_string_by_error_number, -error); + ASSERT (!wrk->session_attr_op); + wrk->session_attr_op = 1; + wrk->session_attr_op_rv = -1; - if (p) - s = format (s, "%s (%d)", p[0], error); - else - s = format (s, "%d", error); - return s; -} + mq = s->vpp_evt_q; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_TRANSPORT_ATTR); + mp = (session_transport_attr_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->api_client_handle; + mp->handle = s->vpp_handle; + mp->is_get = is_get; + mp->attr = *attr; + app_send_ctrl_evt_to_vpp (mq, app_evt); -static void -vppcom_init_error_string_table (void) -{ - vcm->error_string_by_error_number = hash_create (0, sizeof (uword)); + timeout = clib_time_now (&wrk->clib_time) + 1; + + while (wrk->session_attr_op && clib_time_now (&wrk->clib_time) < timeout) + vcl_flush_mq_events (); + + if (!wrk->session_attr_op_rv && is_get) + *attr = wrk->session_attr_rv; -#define _(n, v, s) hash_set (vcm->error_string_by_error_number, -v, s); - foreach_vnet_api_error; -#undef _ + wrk->session_attr_op = 0; - hash_set (vcm->error_string_by_error_number, 99, "Misc"); + return wrk->session_attr_op_rv; } -static inline int -vppcom_wait_for_app_state_change (app_state_t app_state) +static u32 +vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp, + u32 ls_index) { - f64 timeout = clib_time_now (&vcm->clib_time) + vcm->cfg.app_timeout; + vcl_session_t *session, *listen_session; + svm_msg_q_t *evt_q; + + session = vcl_session_alloc (wrk); - while (clib_time_now (&vcm->clib_time) < timeout) + listen_session = vcl_session_get (wrk, ls_index); + if (listen_session->vpp_handle != mp->listener_handle) { - if (vcm->app_state == app_state) - return VPPCOM_OK; + VDBG (0, "ERROR: listener handle %lu does not match session %u", + mp->listener_handle, ls_index); + goto error; } - VDBG (0, "VCL<%d>: timeout waiting for state %s (%d)", getpid (), - vppcom_app_state_str (app_state), app_state); - vcl_evt (VCL_EVT_SESSION_TIMEOUT, vcm, app_state); - return VPPCOM_ETIMEDOUT; + if (vcl_segment_attach_session (mp->segment_handle, mp->server_rx_fifo, + mp->server_tx_fifo, + mp->vpp_event_queue_address, 0, session)) + { + VDBG (0, "failed to attach fifos for %u", session->session_index); + goto error; + } + + session->vpp_handle = mp->handle; + session->session_state = VCL_STATE_READY; + session->transport.rmt_port = mp->rmt.port; + session->transport.is_ip4 = mp->rmt.is_ip4; + clib_memcpy_fast (&session->transport.rmt_ip, &mp->rmt.ip, + sizeof (ip46_address_t)); + + vcl_session_table_add_vpp_handle (wrk, mp->handle, session->session_index); + session->transport.lcl_port = mp->lcl.port; + session->transport.lcl_ip = mp->lcl.ip; + session->session_type = listen_session->session_type; + session->is_dgram = vcl_proto_is_dgram (session->session_type); + session->listener_index = listen_session->session_index; + listen_session->n_accepted_sessions++; + + VDBG (1, "session %u [0x%llx]: client accept request from %s address %U" + " port %d queue %p!", session->session_index, mp->handle, + mp->rmt.is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &mp->rmt.ip, + mp->rmt.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (mp->rmt.port), session->vpp_evt_q); + vcl_evt (VCL_EVT_ACCEPT, session, listen_session, session_index); + + vcl_send_session_accepted_reply (session->vpp_evt_q, mp->context, + session->vpp_handle, 0); + + return session->session_index; + +error: + vcl_segment_attach_mq (vcl_vpp_worker_segment_handle (0), + mp->vpp_event_queue_address, mp->mq_index, &evt_q); + vcl_send_session_accepted_reply (evt_q, mp->context, mp->handle, + VNET_API_ERROR_INVALID_ARGUMENT); + vcl_session_free (wrk, session); + return VCL_INVALID_SESSION_INDEX; } -static inline int -vppcom_wait_for_session_state_change (u32 session_index, - session_state_t state, - f64 wait_for_time) +static u32 +vcl_session_connected_handler (vcl_worker_t * wrk, + session_connected_msg_t * mp) { - f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time; - session_t *volatile session; - int rv; + vcl_session_t *session = 0; + u32 session_index; - do + session_index = mp->context; + session = vcl_session_get (wrk, session_index); + if (!session) { - VCL_SESSION_LOCK (); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - VCL_SESSION_UNLOCK (); - return rv; - } - if (session->state & state) - { - VCL_SESSION_UNLOCK (); - return VPPCOM_OK; - } - if (session->state & STATE_FAILED) + VDBG (0, "ERROR: vpp handle 0x%llx has no session index (%u)!", + mp->handle, session_index); + return VCL_INVALID_SESSION_INDEX; + } + if (mp->retval) + { + VDBG (0, "ERROR: session index %u: connect failed! %U", + session_index, format_session_error, mp->retval); + session->session_state = VCL_STATE_DETACHED; + session->vpp_handle = mp->handle; + return session_index; + } + + session->vpp_handle = mp->handle; + + if (vcl_segment_attach_session (mp->segment_handle, mp->server_rx_fifo, + mp->server_tx_fifo, + mp->vpp_event_queue_address, 0, session)) + { + VDBG (0, "failed to attach fifos for %u", session->session_index); + session->session_state = VCL_STATE_DETACHED; + vcl_send_session_disconnect (wrk, session); + return session_index; + } + + if (mp->ct_rx_fifo) + { + if (vcl_segment_attach_session (mp->ct_segment_handle, mp->ct_rx_fifo, + mp->ct_tx_fifo, (uword) ~0, 1, session)) { - VCL_SESSION_UNLOCK (); - return VPPCOM_ECONNREFUSED; + VDBG (0, "failed to attach ct fifos for %u", session->session_index); + session->session_state = VCL_STATE_DETACHED; + vcl_send_session_disconnect (wrk, session); + return session_index; } - - VCL_SESSION_UNLOCK (); } - while (clib_time_now (&vcm->clib_time) < timeout); - 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, state); + session->transport.is_ip4 = mp->lcl.is_ip4; + clib_memcpy_fast (&session->transport.lcl_ip, &mp->lcl.ip, + sizeof (session->transport.lcl_ip)); + session->transport.lcl_port = mp->lcl.port; - return VPPCOM_ETIMEDOUT; -} + /* Application closed session before connect reply */ + if (vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK) + && session->session_state == VCL_STATE_CLOSED) + vcl_send_session_disconnect (wrk, session); + else + session->session_state = VCL_STATE_READY; -/* - * VPP-API message functions - */ -static void -vppcom_send_session_enable_disable (u8 is_enable) -{ - 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); + /* Add it to lookup table */ + vcl_session_table_add_vpp_handle (wrk, mp->handle, session_index); + + VDBG (1, "session %u [0x%llx] connected! rx_fifo %p, refcnt %d, tx_fifo %p," + " refcnt %d", session_index, mp->handle, session->rx_fifo, + session->rx_fifo->refcnt, session->tx_fifo, session->tx_fifo->refcnt); + + return session_index; } static int -vppcom_app_session_enable (void) +vcl_flag_accepted_session (vcl_session_t * session, u64 handle, u32 flags) { - int rv; + vcl_session_msg_t *accepted_msg; + int i; - if (vcm->app_state != STATE_APP_ENABLED) + for (i = 0; i < vec_len (session->accept_evts_fifo); i++) { - vppcom_send_session_enable_disable (1 /* is_enabled == TRUE */ ); - rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); - if (PREDICT_FALSE (rv)) + accepted_msg = &session->accept_evts_fifo[i]; + if (accepted_msg->accepted_msg.handle == handle) { - VDBG (0, "VCL<%d>: application session enable timed out! " - "returning %d (%s)", getpid (), rv, vppcom_retval_str (rv)); - return rv; + accepted_msg->flags |= flags; + return 1; } } - return VPPCOM_OK; + return 0; } -static void - vl_api_session_enable_disable_reply_t_handler - (vl_api_session_enable_disable_reply_t * mp) +static u32 +vcl_session_reset_handler (vcl_worker_t * wrk, + session_reset_msg_t * reset_msg) { - if (mp->retval) + vcl_session_t *session; + u32 sid; + + sid = vcl_session_index_from_vpp_handle (wrk, reset_msg->handle); + session = vcl_session_get (wrk, sid); + if (!session) { - clib_warning ("VCL<%d>: session_enable_disable failed: %U", getpid (), - format_api_error, ntohl (mp->retval)); + VDBG (0, "request to reset unknown handle 0x%llx", reset_msg->handle); + return VCL_INVALID_SESSION_INDEX; } - else - vcm->app_state = STATE_APP_ENABLED; -} -static void -vppcom_app_send_attach (void) -{ - vl_api_application_attach_t *bmp; - u8 nsid_len = vec_len (vcm->cfg.namespace_id); - u8 app_is_proxy = (vcm->cfg.app_proxy_transport_tcp || - vcm->cfg.app_proxy_transport_udp); - - bmp = vl_msg_api_alloc (sizeof (*bmp)); - memset (bmp, 0, sizeof (*bmp)); - - 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.app_scope_local ? APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE : 0) | - (vcm->cfg.app_scope_global ? APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE : 0) | - (app_is_proxy ? APP_OPTIONS_FLAGS_IS_PROXY : 0); - bmp->options[APP_OPTIONS_PROXY_TRANSPORT] = - (u64) ((vcm->cfg.app_proxy_transport_tcp ? 1 << TRANSPORT_PROTO_TCP : 0) | - (vcm->cfg.app_proxy_transport_udp ? 1 << TRANSPORT_PROTO_UDP : 0)); - bmp->options[APP_OPTIONS_SEGMENT_SIZE] = vcm->cfg.segment_size; - bmp->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = vcm->cfg.add_segment_size; - bmp->options[APP_OPTIONS_RX_FIFO_SIZE] = vcm->cfg.rx_fifo_size; - bmp->options[APP_OPTIONS_TX_FIFO_SIZE] = vcm->cfg.tx_fifo_size; - bmp->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = - vcm->cfg.preallocated_fifo_pairs; - bmp->options[APP_OPTIONS_EVT_QUEUE_SIZE] = vcm->cfg.event_queue_size; - if (nsid_len) + /* Caught a reset before actually accepting the session */ + if (session->session_state == VCL_STATE_LISTEN) { - 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; + + if (!vcl_flag_accepted_session (session, reset_msg->handle, + VCL_ACCEPTED_F_RESET)) + VDBG (0, "session was not accepted!"); + return VCL_INVALID_SESSION_INDEX; } - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); + + if (session->session_state != VCL_STATE_CLOSED) + session->session_state = VCL_STATE_DISCONNECT; + VDBG (0, "reset session %u [0x%llx]", sid, reset_msg->handle); + return sid; } -static int -vppcom_app_attach (void) +static u32 +vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) { - int rv; + vcl_session_t *session; + u32 sid = mp->context; - vppcom_app_send_attach (); - rv = vppcom_wait_for_app_state_change (STATE_APP_ATTACHED); - if (PREDICT_FALSE (rv)) + session = vcl_session_get (wrk, sid); + if (mp->retval) { - VDBG (0, "VCL<%d>: application attach timed out! returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); - return rv; + VERR ("session %u [0x%llx]: bind failed: %U", sid, mp->handle, + format_session_error, mp->retval); + if (session) + { + session->session_state = VCL_STATE_DETACHED; + session->vpp_handle = mp->handle; + return sid; + } + else + { + VDBG (0, "ERROR: session %u [0x%llx]: Invalid session index!", + sid, mp->handle); + return VCL_INVALID_SESSION_INDEX; + } } - return VPPCOM_OK; -} + 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 = VCL_STATE_LISTEN; + + if (vcl_session_is_cl (session)) + { + if (vcl_segment_attach_session (mp->segment_handle, mp->rx_fifo, + mp->tx_fifo, mp->vpp_evt_q, 0, session)) + { + VDBG (0, "failed to attach fifos for %u", session->session_index); + session->session_state = VCL_STATE_DETACHED; + return VCL_INVALID_SESSION_INDEX; + } + } -static void -vppcom_app_detach (void) -{ - vl_api_application_detach_t *bmp; - bmp = vl_msg_api_alloc (sizeof (*bmp)); - memset (bmp, 0, sizeof (*bmp)); - - 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); + VDBG (0, "session %u [0x%llx]: listen succeeded!", sid, mp->handle); + return sid; } static void -vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t * - mp) +vcl_session_unlisten_reply_handler (vcl_worker_t * wrk, void *data) { - static svm_fifo_segment_create_args_t _a; - svm_fifo_segment_create_args_t *a = &_a; - int rv; + session_unlisten_reply_msg_t *mp = (session_unlisten_reply_msg_t *) data; + vcl_session_t *s; - memset (a, 0, sizeof (*a)); - if (mp->retval) + s = vcl_session_get_w_vpp_handle (wrk, mp->handle); + if (!s) { - clib_warning ("VCL<%d>: attach failed: %U", getpid (), - format_api_error, ntohl (mp->retval)); + VDBG (0, "Unlisten reply with wrong handle %llx", mp->handle); return; } - - if (mp->segment_name_length == 0) + if (s->session_state != VCL_STATE_DISCONNECT) { - clib_warning ("VCL<%d>: segment_name_length zero", getpid ()); - return; - } - - a->segment_name = (char *) mp->segment_name; - a->segment_size = mp->segment_size; + /* Connected udp listener */ + if (s->session_type == VPPCOM_PROTO_UDP + && s->session_state == VCL_STATE_CLOSED) + return; - ASSERT (mp->app_event_queue_address); - - /* Attach to the segment vpp created */ - rv = svm_fifo_segment_attach (a); - vec_reset_length (a->new_segment_indices); - if (PREDICT_FALSE (rv)) - { - clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed", - getpid (), mp->segment_name); + VDBG (0, "Unlisten session in wrong state %llx", mp->handle); return; } - vcm->app_event_queue = - uword_to_pointer (mp->app_event_queue_address, svm_queue_t *); - - vcm->app_state = STATE_APP_ATTACHED; -} - -static void -vl_api_application_detach_reply_t_handler (vl_api_application_detach_reply_t * - mp) -{ if (mp->retval) - clib_warning ("VCL<%d>: detach failed: %U", getpid (), format_api_error, - ntohl (mp->retval)); + VDBG (0, "ERROR: session %u [0xllx]: unlisten failed: %U", + s->session_index, mp->handle, format_session_error, mp->retval); - vcm->app_state = STATE_APP_ENABLED; -} + if (mp->context != wrk->wrk_index) + VDBG (0, "wrong context"); -static void -vl_api_disconnect_session_reply_t_handler (vl_api_disconnect_session_reply_t * - mp) -{ - if (mp->retval) - clib_warning ("VCL<%d>: vpp handle 0x%llx: disconnect session failed: %U", - getpid (), mp->handle, format_api_error, - ntohl (mp->retval)); + vcl_session_table_del_vpp_handle (wrk, mp->handle); + vcl_session_free (wrk, s); } static void -vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) +vcl_session_migrated_handler (vcl_worker_t * wrk, void *data) { - static svm_fifo_segment_create_args_t _a; - svm_fifo_segment_create_args_t *a = &_a; - int rv; + session_migrated_msg_t *mp = (session_migrated_msg_t *) data; + vcl_session_t *s; + u32 fs_index; - 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)) + s = vcl_session_get_w_vpp_handle (wrk, mp->handle); + if (!s) { - clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed", - getpid (), mp->segment_name); + VDBG (0, "Migrated notification with wrong handle %llx", mp->handle); return; } - VDBG (1, "VCL<%d>: mapped new segment '%s' size %d", getpid (), - mp->segment_name, mp->segment_size); -} + /* Only validate if a value is provided */ + if (mp->segment_handle != SESSION_INVALID_HANDLE) + { + fs_index = vcl_segment_table_lookup (mp->segment_handle); + if (fs_index == VCL_INVALID_SEGMENT_INDEX) + { + VDBG (0, "segment %lx for session %u is not mounted!", + mp->segment_handle, s->session_index); + s->session_state = VCL_STATE_DETACHED; + return; + } + } -static void -vl_api_unmap_segment_t_handler (vl_api_unmap_segment_t * mp) -{ + s->vpp_handle = mp->new_handle; -/* - * XXX Need segment_name to session_id hash, - * XXX - have sessionID by handle hash currently - */ + vcl_segment_attach_mq (vcl_vpp_worker_segment_handle (0), mp->vpp_evt_q, + mp->vpp_thread_index, &s->vpp_evt_q); + + vcl_session_table_del_vpp_handle (wrk, mp->handle); + vcl_session_table_add_vpp_handle (wrk, mp->new_handle, s->session_index); - VDBG (1, "Unmapped segment '%s'", mp->segment_name); + /* Generate new tx event if we have outstanding data */ + if (svm_fifo_has_event (s->tx_fifo)) + app_send_io_evt_to_vpp (s->vpp_evt_q, + s->tx_fifo->shr->master_session_index, + SESSION_IO_EVT_TX, SVM_Q_WAIT); + + VDBG (0, "Migrated 0x%lx to thread %u 0x%lx", mp->handle, + mp->vpp_thread_index, mp->new_handle); } -static void -vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp) +static vcl_session_t * +vcl_session_accepted (vcl_worker_t * wrk, session_accepted_msg_t * msg) { - uword *p; + vcl_session_msg_t *vcl_msg; + vcl_session_t *session; - p = hash_get (vcm->session_index_by_vpp_handles, mp->handle); - if (p) - { - int rv; - session_t *session = 0; - u32 session_index = p[0]; + session = vcl_session_get_w_vpp_handle (wrk, msg->handle); + if (PREDICT_FALSE (session != 0)) + VWRN ("session overlap handle %lu state %u!", msg->handle, + session->session_state); - VCL_SESSION_LOCK_AND_GET (session_index, &session); - session->state = STATE_CLOSE_ON_EMPTY; + session = vcl_session_table_lookup_listener (wrk, msg->listener_handle); + if (!session) + { + VERR ("couldn't find listen session: listener handle %llx", + msg->listener_handle); + return 0; + } - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: setting state to 0x%x " - "(%s)", getpid (), mp->handle, session_index, session->state, - vppcom_session_state_str (session->state)); - VCL_SESSION_UNLOCK (); - return; + clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); + vcl_msg->flags = 0; + vcl_msg->accepted_msg = *msg; + /* Session handle points to listener until fully accepted by app */ + vcl_session_table_add_vpp_handle (wrk, msg->handle, session->session_index); - done: - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session lookup failed!", - getpid (), mp->handle, session_index); - } - else - clib_warning ("VCL<%d>: vpp handle 0x%llx: session lookup by " - "handle failed!", getpid (), mp->handle); + return session; } -static void -vl_api_reset_session_t_handler (vl_api_reset_session_t * mp) +static vcl_session_t * +vcl_session_disconnected_handler (vcl_worker_t * wrk, + session_disconnected_msg_t * msg) { - session_t *session = 0; - vl_api_reset_session_reply_t *rmp; - uword *p; - int rv = 0; + vcl_session_t *session; - p = hash_get (vcm->session_index_by_vpp_handles, mp->handle); - if (p) + session = vcl_session_get_w_vpp_handle (wrk, msg->handle); + if (!session) { - int rval; - VCL_SESSION_LOCK (); - rval = vppcom_session_at_index (p[0], &session); - if (PREDICT_FALSE (rval)) - { - rv = VNET_API_ERROR_INVALID_VALUE_2; - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "session lookup failed! returning %d %U", - getpid (), mp->handle, p[0], - rv, format_api_error, rv); - } - else - { - /* TBD: should this disconnect immediately and - * flush the fifos? - */ - session->state = STATE_CLOSE_ON_EMPTY; - - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: state set to %d " - "(%s)!", getpid (), mp->handle, p[0], session->state, - vppcom_session_state_str (session->state)); - } - VCL_SESSION_UNLOCK (); + VDBG (0, "request to disconnect unknown handle 0x%llx", msg->handle); + return 0; } - else + + /* Late disconnect notification on a session that has been closed */ + if (session->session_state == VCL_STATE_CLOSED) + return 0; + + /* Caught a disconnect before actually accepting the session */ + if (session->session_state == VCL_STATE_LISTEN) { - rv = VNET_API_ERROR_INVALID_VALUE; - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx: session lookup " - "failed! returning %d %U", - getpid (), mp->handle, rv, format_api_error, rv); + if (!vcl_flag_accepted_session (session, msg->handle, + VCL_ACCEPTED_F_CLOSED)) + VDBG (0, "session was not accepted!"); + return 0; } - 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); + /* If not already reset change state */ + if (session->session_state != VCL_STATE_DISCONNECT) + session->session_state = VCL_STATE_VPP_CLOSING; + + return session; } -static void -vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp) +int +vppcom_session_shutdown (uint32_t session_handle, int how) { - session_t *session = 0; - u32 session_index; - svm_fifo_t *rx_fifo, *tx_fifo; - int rv = VPPCOM_OK; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; + vcl_session_state_t state; + u64 vpp_handle; - session_index = mp->context; - VCL_SESSION_LOCK_AND_GET (session_index, &session); -done: - if (mp->retval) - { - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "connect failed! %U", - getpid (), mp->handle, session_index, - format_api_error, ntohl (mp->retval)); - if (session) - { - session->state = STATE_FAILED; - session->vpp_handle = mp->handle; - } - else - { - clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: " - "Invalid session index (%u)!", - getpid (), mp->handle, session_index); - } - goto done_unlock; - } + session = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!session)) + return VPPCOM_EBADFD; - if (rv) - goto done_unlock; + vpp_handle = session->vpp_handle; + state = session->session_state; - /* - * Setup session - */ - if (vcm->session_io_thread.io_sessions_lockp) + VDBG (1, "session %u [0x%llx] state 0x%x (%s)", session->session_index, + vpp_handle, state, vppcom_session_state_str (state)); + + if (PREDICT_FALSE (state == VCL_STATE_LISTEN)) { - // Add this connection to the active io sessions list - VCL_IO_SESSIONS_LOCK (); - u32 *active_session_index; - pool_get (vcm->session_io_thread.active_session_indexes, - active_session_index); - *active_session_index = session_index; - VCL_IO_SESSIONS_UNLOCK (); + VDBG (0, "ERROR: Cannot shutdown a listen socket!"); + return VPPCOM_EBADFD; } - session->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address, - svm_queue_t *); - 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 (how == SHUT_RD || how == SHUT_RDWR) + { + session->flags |= VCL_SESSION_F_RD_SHUTDOWN; + if (how == SHUT_RD) + return VPPCOM_OK; + } + session->flags |= VCL_SESSION_F_WR_SHUTDOWN; - session->rx_fifo = rx_fifo; - session->tx_fifo = tx_fifo; - session->vpp_handle = mp->handle; - session->lcl_addr.is_ip4 = mp->is_ip4; - clib_memcpy (&session->lcl_addr.ip46, mp->lcl_ip, - sizeof (session->peer_addr.ip46)); - session->lcl_port = mp->lcl_port; - session->state = STATE_CONNECT; + if (PREDICT_TRUE (state == VCL_STATE_READY)) + { + VDBG (1, "session %u [0x%llx]: sending shutdown...", + session->session_index, vpp_handle); - /* Add it to lookup table */ - hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index); + vcl_send_session_shutdown (wrk, session); + } - 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); -done_unlock: - VCL_SESSION_UNLOCK (); + return VPPCOM_OK; } -static void -vppcom_send_connect_sock (session_t * session, u32 session_index) +static int +vppcom_session_disconnect (u32 session_handle) { - vl_api_connect_sock_t *cmp; - - /* Assumes caller as acquired the spinlock: vcm->sessions_lockp */ - 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; - - 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); -} + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session, *listen_session; + vcl_session_state_t state; + u64 vpp_handle; -static inline void -vppcom_send_disconnect_session_reply (u64 vpp_handle, u32 session_index, - int rv) -{ - vl_api_disconnect_session_reply_t *rmp; + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect msg", - getpid (), vpp_handle, session_index); + vpp_handle = session->vpp_handle; + state = session->session_state; - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); + VDBG (1, "session %u [0x%llx] state 0x%x (%s)", session->session_index, + vpp_handle, state, vppcom_session_state_str (state)); - rmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION_REPLY); - rmp->retval = htonl (rv); - rmp->handle = vpp_handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp); -} + if (PREDICT_FALSE (state == VCL_STATE_LISTEN)) + { + VDBG (0, "ERROR: Cannot disconnect a listen socket!"); + return VPPCOM_EBADFD; + } -static inline void -vppcom_send_disconnect_session (u64 vpp_handle, u32 session_index) -{ - vl_api_disconnect_session_t *dmp; + if (state == VCL_STATE_VPP_CLOSING) + { + vcl_send_session_disconnected_reply (wrk, session, 0); + VDBG (1, "session %u [0x%llx]: sending disconnect REPLY...", + session->session_index, vpp_handle); + } + else + { + /* Session doesn't have an event queue yet. Probably a non-blocking + * connect. Wait for the reply */ + if (PREDICT_FALSE (!session->vpp_evt_q)) + return VPPCOM_OK; - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect msg", - getpid (), vpp_handle, session_index); + VDBG (1, "session %u [0x%llx]: sending disconnect...", + session->session_index, vpp_handle); + vcl_send_session_disconnect (wrk, session); + } + + if (session->listener_index != VCL_INVALID_SESSION_INDEX) + { + listen_session = vcl_session_get (wrk, session->listener_index); + listen_session->n_accepted_sessions--; + } - 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 = vpp_handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & dmp); + return VPPCOM_OK; } static void -vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_reply_t * mp) +vcl_session_cleanup_handler (vcl_worker_t * wrk, void *data) { - session_t *session = 0; - u32 session_index = mp->context; - int rv; + session_cleanup_msg_t *msg; + vcl_session_t *session; - VCL_SESSION_LOCK_AND_GET (session_index, &session); -done: - if (mp->retval) + msg = (session_cleanup_msg_t *) data; + session = vcl_session_get_w_vpp_handle (wrk, msg->handle); + if (!session) + { + VDBG (0, "disconnect confirmed for unknown handle 0x%llx", msg->handle); + return; + } + + if (msg->type == SESSION_CLEANUP_TRANSPORT) { - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, " - "sid %u: bind failed: %U", - getpid (), mp->handle, session_index, - format_api_error, ntohl (mp->retval)); - rv = vppcom_session_at_index (session_index, &session); - if (rv == VPPCOM_OK) + /* Transport was cleaned up before we confirmed close. Probably the + * app is still waiting for some data that cannot be delivered. + * Confirm close to make sure everything is cleaned up. + * Move to undetermined state to ensure that the session is not + * removed before both vpp and the app cleanup. + * - If the app closes first, the session is moved to CLOSED state + * and the session cleanup notification from vpp removes the + * session. + * - If vpp cleans up the session first, the session is moved to + * DETACHED state lower and subsequently the close from the app + * frees the session + */ + if (session->session_state == VCL_STATE_VPP_CLOSING) { - session->state = STATE_FAILED; - session->vpp_handle = mp->handle; + vppcom_session_disconnect (vcl_session_handle (session)); + session->session_state = VCL_STATE_UPDATED; } - else + else if (session->session_state == VCL_STATE_DISCONNECT) { - clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: " - "Invalid session index (%u)!", - getpid (), mp->handle, session_index); + vcl_send_session_reset_reply (wrk, session, 0); + session->session_state = VCL_STATE_UPDATED; } - goto done_unlock; + return; } - session->vpp_handle = mp->handle; - session->lcl_addr.is_ip4 = mp->lcl_is_ip4; - session->lcl_addr.ip46 = to_ip46 (mp->lcl_is_ip4 ? IP46_TYPE_IP4 : - IP46_TYPE_IP6, mp->lcl_ip); - session->lcl_port = mp->lcl_port; - vppcom_session_table_add_listener (mp->handle, session_index); - session->state = STATE_LISTEN; - - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!", - getpid (), mp->handle, mp->context); -done_unlock: - VCL_SESSION_UNLOCK (); + vcl_session_table_del_vpp_handle (wrk, msg->handle); + /* Should not happen. App did not close the connection so don't free it. */ + if (session->session_state != VCL_STATE_CLOSED) + { + VDBG (0, "app did not close session %d", session->session_index); + session->session_state = VCL_STATE_DETACHED; + session->vpp_handle = VCL_INVALID_SESSION_HANDLE; + return; + } + vcl_session_free (wrk, session); } static void -vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp) +vcl_session_req_worker_update_handler (vcl_worker_t * wrk, void *data) { - if (mp->retval) - clib_warning ("VCL<%d>: ERROR: sid %u: unbind failed: %U", - getpid (), mp->context, format_api_error, - ntohl (mp->retval)); + session_req_worker_update_msg_t *msg; + vcl_session_t *s; - else - VDBG (1, "VCL<%d>: sid %u: unbind succeeded!", getpid (), mp->context); -} + msg = (session_req_worker_update_msg_t *) data; + s = vcl_session_get_w_vpp_handle (wrk, msg->session_handle); + if (!s) + return; -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]); + vec_add1 (wrk->pending_session_wrk_updates, s->session_index); } -u8 * -format_ip6_address (u8 * s, va_list * args) +static void +vcl_session_worker_update_reply_handler (vcl_worker_t * wrk, void *data) { - 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; + session_worker_update_reply_msg_t *msg; + vcl_session_t *s; - 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++) + msg = (session_worker_update_reply_msg_t *) data; + s = vcl_session_get_w_vpp_handle (wrk, msg->handle); + if (!s) { - 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; - } + VDBG (0, "unknown handle 0x%llx", msg->handle); + return; } - last_double_colon = 0; - for (i = 0; i < ARRAY_LEN (a->as_u16); i++) + if (s->rx_fifo) { - if (i == i_max_n_zero && max_n_zeros > 1) - { - s = format (s, "::"); - i += max_n_zeros - 1; - last_double_colon = 1; - } - else + if (vcl_segment_attach_session (msg->segment_handle, msg->rx_fifo, + msg->tx_fifo, (uword) ~0, 0, s)) { - s = format (s, "%s%x", - (last_double_colon || i == 0) ? "" : ":", - clib_net_to_host_u16 (a->as_u16[i])); - last_double_colon = 0; + VDBG (0, "failed to attach fifos for %u", s->session_index); + return; } } + s->session_state = VCL_STATE_UPDATED; - return s; + VDBG (0, "session %u[0x%llx] moved to worker %u", s->session_index, + s->vpp_handle, wrk->wrk_index); } -/* Format an IP46 address. */ -u8 * -format_ip46_address (u8 * s, va_list * args) +static int +vcl_api_recv_fd (vcl_worker_t * wrk, int *fds, int n_fds) { - 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 (vcm->cfg.vpp_app_socket_api) + return vcl_sapi_recv_fds (wrk, fds, n_fds); - return is_ip4 ? - format (s, "%U", format_ip4_address, &ip46->ip4) : - format (s, "%U", format_ip6_address, &ip46->ip6); + return vcl_bapi_recv_fds (wrk, fds, n_fds); } static void -vl_api_accept_session_t_handler (vl_api_accept_session_t * mp) +vcl_session_app_add_segment_handler (vcl_worker_t * wrk, void *data) { - svm_fifo_t *rx_fifo, *tx_fifo; - session_t *session, *listen_session; - u32 session_index; - vce_event_connect_request_t *ecr; - vce_event_t *ev; - int rv; - u32 ev_idx; - uword elts = 0; + ssvm_segment_type_t seg_type = SSVM_SEGMENT_SHM; + session_app_add_segment_msg_t *msg; + u64 segment_handle; + int fd = -1; - VCL_SESSION_LOCK (); + msg = (session_app_add_segment_msg_t *) data; - VCL_ACCEPT_FIFO_LOCK (); - elts = clib_fifo_free_elts (vcm->client_session_index_fifo); - VCL_ACCEPT_FIFO_UNLOCK (); + if (msg->fd_flags) + { + vcl_api_recv_fd (wrk, &fd, 1); + seg_type = SSVM_SEGMENT_MEMFD; + } - if (!elts) + segment_handle = msg->segment_handle; + if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) { - clib_warning ("VCL<%d>: client session queue is full!", getpid ()); - vppcom_send_accept_session_reply (mp->handle, mp->context, - VNET_API_ERROR_QUEUE_FULL); - VCL_SESSION_UNLOCK (); + clib_warning ("invalid segment handle"); return; } - listen_session = vppcom_session_table_lookup_listener (mp->listener_handle); - if (!listen_session) + if (vcl_segment_attach (segment_handle, (char *) msg->segment_name, + seg_type, fd)) { - clib_warning ("VCL<%d>: ERROR: couldn't find listen session: " - "unknown vpp listener handle %llx", - getpid (), mp->listener_handle); - vppcom_send_accept_session_reply (mp->handle, mp->context, - VNET_API_ERROR_INVALID_ARGUMENT); - VCL_SESSION_UNLOCK (); + VDBG (0, "vcl_segment_attach ('%s') failed", msg->segment_name); return; } - /* TODO check listener depth and update */ - /* TODO on "child" fd close, update listener depth */ - - /* Allocate local session and set it up */ - pool_get (vcm->sessions, session); - memset (session, 0, sizeof (*session)); - session_index = (u32) (session - vcm->sessions); - - 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; - - session->vpp_handle = mp->handle; - session->client_context = mp->context; - session->rx_fifo = rx_fifo; - session->tx_fifo = tx_fifo; - session->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address, - svm_queue_t *); - session->state = STATE_ACCEPT; - session->peer_port = mp->port; - session->peer_addr.is_ip4 = mp->is_ip4; - session->peer_addr.ip46 = to_ip46 (mp->is_ip4 ? IP46_TYPE_IP4 : - IP46_TYPE_IP6, mp->ip); - - /* Add it to lookup table */ - hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index); - session->lcl_port = listen_session->lcl_port; - session->lcl_addr = listen_session->lcl_addr; - - /* Create an event for handlers */ - - VCL_EVENTS_LOCK (); - - pool_get (vcm->event_thread.vce_events, ev); - ev_idx = (u32) (ev - vcm->event_thread.vce_events); - ecr = vce_get_event_data (ev, sizeof (*ecr)); - ev->evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED; - listen_session = vppcom_session_table_lookup_listener (mp->listener_handle); - ev->evk.session_index = (u32) (listen_session - vcm->sessions); - ecr->accepted_session_index = session_index; - - VCL_EVENTS_UNLOCK (); - - rv = vce_generate_event (&vcm->event_thread, ev_idx); - ASSERT (rv == 0); - - 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_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_event_queue); - - vcl_evt (VCL_EVT_ACCEPT, session, listen_session, session_index); - VCL_SESSION_UNLOCK (); + VDBG (1, "mapped new segment '%s' size %d", msg->segment_name, + msg->segment_size); } -/* VPP combines bind and listen as one operation. VCL manages the separation - * of bind and listen locally via vppcom_session_bind() and - * vppcom_session_listen() */ static void -vppcom_send_bind_sock (session_t * session, u32 session_index) +vcl_session_app_del_segment_handler (vcl_worker_t * wrk, void *data) { - vl_api_bind_sock_t *bmp; - - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - 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 = session_index; - 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); + session_app_del_segment_msg_t *msg = (session_app_del_segment_msg_t *) data; + vcl_segment_detach (msg->segment_handle); + VDBG (1, "Unmapped segment: %d", msg->segment_handle); } static void -vppcom_send_unbind_sock (u64 vpp_handle) +vcl_worker_rpc_handler (vcl_worker_t * wrk, void *data) { - vl_api_unbind_sock_t *ump; - - ump = vl_msg_api_alloc (sizeof (*ump)); - memset (ump, 0, sizeof (*ump)); + if (!vcm->wrk_rpc_fn) + return; - ump->_vl_msg_id = ntohs (VL_API_UNBIND_SOCK); - ump->client_index = vcm->my_client_index; - ump->handle = vpp_handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & ump); + (vcm->wrk_rpc_fn) (((session_app_wrk_rpc_msg_t *) data)->data); } -static int -vppcom_session_unbind (u32 session_index) +static void +vcl_session_transport_attr_reply_handler (vcl_worker_t *wrk, void *data) { - session_t *session = 0; - int rv; - u64 vpp_handle; - - VCL_SESSION_LOCK_AND_GET (session_index, &session); + session_transport_attr_reply_msg_t *mp; - vpp_handle = session->vpp_handle; - vppcom_session_table_del_listener (vpp_handle); - session->vpp_handle = ~0; - session->state = STATE_DISCONNECT; - - VCL_SESSION_UNLOCK (); + if (!wrk->session_attr_op) + return; - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending unbind msg! new state" - " 0x%x (%s)", getpid (), vpp_handle, session_index, STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT)); - vcl_evt (VCL_EVT_UNBIND, session); - vppcom_send_unbind_sock (vpp_handle); + mp = (session_transport_attr_reply_msg_t *) data; -done: - return rv; + wrk->session_attr_op_rv = mp->retval; + wrk->session_attr_op = 0; + wrk->session_attr_rv = mp->attr; } -static inline int -vppcom_session_disconnect (u32 session_index) +static int +vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) { - int rv; - session_t *session; - u64 vpp_handle; - session_state_t state; - - VCL_SESSION_LOCK_AND_GET (session_index, &session); - - vpp_handle = session->vpp_handle; - state = session->state; - VCL_SESSION_UNLOCK (); - - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u state 0x%x (%s)", getpid (), - vpp_handle, session_index, state, vppcom_session_state_str (state)); - - if (PREDICT_FALSE (state & STATE_LISTEN)) + session_disconnected_msg_t *disconnected_msg; + session_connected_msg_t *connected_msg; + session_reset_msg_t *reset_msg; + session_event_t *ecpy; + vcl_session_t *s; + u32 sid; + + switch (e->event_type) { - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "Cannot disconnect a listen socket!", - getpid (), vpp_handle, session_index); - rv = VPPCOM_EBADFD; - goto done; + case SESSION_IO_EVT_RX: + case SESSION_IO_EVT_TX: + s = vcl_session_get (wrk, e->session_index); + if (!s || !vcl_session_is_open (s)) + break; + vec_add1 (wrk->unhandled_evts_vector, *e); + break; + case SESSION_CTRL_EVT_BOUND: + /* We can only wait for only one listen so not postponed */ + vcl_session_bound_handler (wrk, (session_bound_msg_t *) e->data); + break; + case SESSION_CTRL_EVT_ACCEPTED: + s = vcl_session_accepted (wrk, (session_accepted_msg_t *) e->data); + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + { + vec_add2 (wrk->unhandled_evts_vector, ecpy, 1); + *ecpy = *e; + ecpy->postponed = 1; + ecpy->session_index = s->session_index; + } + break; + case SESSION_CTRL_EVT_CONNECTED: + connected_msg = (session_connected_msg_t *) e->data; + sid = vcl_session_connected_handler (wrk, connected_msg); + if (!(s = vcl_session_get (wrk, sid))) + break; + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + { + vec_add2 (wrk->unhandled_evts_vector, ecpy, 1); + *ecpy = *e; + ecpy->postponed = 1; + ecpy->session_index = s->session_index; + } + break; + case SESSION_CTRL_EVT_DISCONNECTED: + disconnected_msg = (session_disconnected_msg_t *) e->data; + if (!(s = vcl_session_get_w_vpp_handle (wrk, disconnected_msg->handle))) + break; + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + { + vec_add1 (wrk->unhandled_evts_vector, *e); + break; + } + if (!(s = vcl_session_disconnected_handler (wrk, disconnected_msg))) + break; + VDBG (0, "disconnected session %u [0x%llx]", s->session_index, + s->vpp_handle); + break; + case SESSION_CTRL_EVT_RESET: + reset_msg = (session_reset_msg_t *) e->data; + if (!(s = vcl_session_get_w_vpp_handle (wrk, reset_msg->handle))) + break; + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + { + vec_add1 (wrk->unhandled_evts_vector, *e); + break; + } + vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + break; + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + vcl_session_unlisten_reply_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_MIGRATED: + vcl_session_migrated_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_CLEANUP: + vcl_session_cleanup_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_REQ_WORKER_UPDATE: + vcl_session_req_worker_update_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_WORKER_UPDATE_REPLY: + vcl_session_worker_update_reply_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_ADD_SEGMENT: + vcl_session_app_add_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_DEL_SEGMENT: + vcl_session_app_del_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_WRK_RPC: + vcl_worker_rpc_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_TRANSPORT_ATTR_REPLY: + vcl_session_transport_attr_reply_handler (wrk, e->data); + break; + default: + clib_warning ("unhandled %u", e->event_type); } + return VPPCOM_OK; +} - /* The peer has already initiated the close, - * so send the disconnect session reply. - */ - if (state & STATE_CLOSE_ON_EMPTY) - { - //XXX alagalah - Check and drain here? - vppcom_send_disconnect_session_reply (vpp_handle, - session_index, 0 /* rv */ ); - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect " - "REPLY...", getpid (), vpp_handle, session_index); - } +static int +vppcom_wait_for_session_state_change (u32 session_index, + vcl_session_state_t state, + f64 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; - /* Otherwise, send a disconnect session msg... - */ - else + do { - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect...", - getpid (), vpp_handle, session_index); + 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 == VCL_STATE_DETACHED) + { + return VPPCOM_ECONNREFUSED; + } - vppcom_send_disconnect_session (vpp_handle, session_index); + if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_NOWAIT, 0)) + { + usleep (100); + 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 (&wrk->clib_time) < timeout); -done: - return rv; -} - -#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_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) \ -_(UNMAP_SEGMENT, unmap_segment) + VDBG (0, "timeout waiting for state 0x%x (%s)", state, + vppcom_session_state_str (state)); + vcl_evt (VCL_EVT_SESSION_TIMEOUT, session, session_state); -static void -vppcom_api_hookup (void) -{ -#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 _ + return VPPCOM_ETIMEDOUT; } static void -vppcom_cfg_init (vppcom_cfg_t * vcl_cfg) +vcl_handle_pending_wrk_updates (vcl_worker_t * wrk) { - ASSERT (vcl_cfg); - - vcl_cfg->heapsize = (256ULL << 20); - vcl_cfg->vpp_api_q_length = 1024; - 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; - vcl_cfg->event_ring_size = (128 << 10); - vcl_cfg->event_log_path = "/dev/shm"; + vcl_session_state_t state; + vcl_session_t *s; + u32 *sip; + + if (PREDICT_TRUE (vec_len (wrk->pending_session_wrk_updates) == 0)) + return; + + vec_foreach (sip, wrk->pending_session_wrk_updates) + { + s = vcl_session_get (wrk, *sip); + vcl_send_session_worker_update (wrk, s, wrk->wrk_index); + state = s->session_state; + vppcom_wait_for_session_state_change (s->session_index, VCL_STATE_UPDATED, + 5); + s->session_state = state; + } + vec_reset_length (wrk->pending_session_wrk_updates); } -static void -vppcom_cfg_heapsize (char *conf_fname) +void +vcl_worker_flush_mq_events (vcl_worker_t *wrk) { - vppcom_cfg_t *vcl_cfg = &vcm->cfg; - FILE *fp; - char inbuf[4096]; - int argc = 1; - char **argv = NULL; - char *arg = NULL; - char *p; + svm_msg_q_msg_t *msg; + session_event_t *e; + svm_msg_q_t *mq; int i; - u8 *sizep; - u32 size; - void *vcl_mem; - void *heap; - fp = fopen (conf_fname, "r"); - if (fp == NULL) - { - VDBG (0, "VCL<%d>: using default heapsize %lld (0x%llx)", getpid (), - vcl_cfg->heapsize, vcl_cfg->heapsize); - goto defaulted; - } + mq = wrk->app_event_queue; + vcl_mq_dequeue_batch (wrk, mq, ~0); - argv = calloc (1, sizeof (char *)); - if (argv == NULL) + for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { - VDBG (0, "VCL<%d>: calloc failed, using default heapsize %lld (0x%llx)", - getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); - goto defaulted; - } - - while (1) - { - if (fgets (inbuf, 4096, fp) == 0) - break; - p = strtok (inbuf, " \t\n"); - while (p != NULL) - { - if (*p == '#') - break; - argc++; - char **tmp = realloc (argv, argc * sizeof (char *)); - if (tmp == NULL) - { - VDBG (0, "VCL<%d>: realloc failed, using default heapsize %lld " - "(0x%llx)", getpid (), vcl_cfg->heapsize, - vcl_cfg->heapsize); - goto defaulted; - } - argv = tmp; - arg = strndup (p, 1024); - if (arg == NULL) - { - VDBG (0, "VCL<%d>: strndup failed, using default heapsize %lld " - "(0x%llx)", getpid (), vcl_cfg->heapsize, - vcl_cfg->heapsize); - goto defaulted; - } - argv[argc - 1] = arg; - p = strtok (NULL, " \t\n"); - } + msg = vec_elt_at_index (wrk->mq_msg_vector, i); + e = svm_msg_q_msg_data (mq, msg); + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (mq, msg); } + vec_reset_length (wrk->mq_msg_vector); + vcl_handle_pending_wrk_updates (wrk); +} - fclose (fp); - fp = NULL; +void +vcl_flush_mq_events (void) +{ + vcl_worker_flush_mq_events (vcl_worker_get_current ()); +} - char **tmp = realloc (argv, (argc + 1) * sizeof (char *)); - if (tmp == NULL) - { - VDBG (0, "VCL<%d>: realloc failed, using default heapsize %lld " - "(0x%llx)", getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); - goto defaulted; - } - argv = tmp; - argv[argc] = NULL; +static int +vppcom_session_unbind (u32 session_handle) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + session_accepted_msg_t *accepted_msg; + vcl_session_t *session = 0; + vcl_session_msg_t *evt; - /* - * Look for and parse the "heapsize" config parameter. - * Manual since none of the clib infra has been bootstrapped yet. - * - * Format: heapsize [mM][gG] - */ + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; - for (i = 1; i < (argc - 1); i++) + /* Flush pending accept events, if any */ + while (clib_fifo_elts (session->accept_evts_fifo)) { - 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) - { - VDBG (0, "VCL<%d>: parse error '%s %s', using default " - "heapsize %lld (0x%llx)", getpid (), argv[i], argv[i + 1], - vcl_cfg->heapsize, vcl_cfg->heapsize); - goto defaulted; - } - - if (*sizep == 'g' || *sizep == 'G') - vcl_cfg->heapsize = size << 30; - else if (*sizep == 'm' || *sizep == 'M') - vcl_cfg->heapsize = size << 20; - else - { - VDBG (0, "VCL<%d>: parse error '%s %s', using default " - "heapsize %lld (0x%llx)", getpid (), argv[i], argv[i + 1], - vcl_cfg->heapsize, vcl_cfg->heapsize); - goto defaulted; - } - } + clib_fifo_sub2 (session->accept_evts_fifo, evt); + accepted_msg = &evt->accepted_msg; + vcl_session_table_del_vpp_handle (wrk, accepted_msg->handle); + vcl_send_session_accepted_reply (session->vpp_evt_q, + accepted_msg->context, + accepted_msg->handle, -1); } + clib_fifo_free (session->accept_evts_fifo); -defaulted: - if (fp != NULL) - fclose (fp); - if (argv != NULL) - free (argv); + vcl_send_session_unlisten (wrk, session); - vcl_mem = mmap (0, vcl_cfg->heapsize, PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_ANONYMOUS, -1, 0); - if (vcl_mem == MAP_FAILED) - { - clib_unix_error ("VCL<%d>: ERROR: mmap(0, %lld == 0x%llx, " - "PROT_READ | PROT_WRITE,MAP_SHARED | MAP_ANONYMOUS, " - "-1, 0) failed!", - getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); - ASSERT (vcl_mem != MAP_FAILED); - return; - } - heap = clib_mem_init (vcl_mem, vcl_cfg->heapsize); - if (!heap) - { - clib_warning ("VCL<%d>: ERROR: clib_mem_init() failed!", getpid ()); - ASSERT (heap); - return; - } - vcl_mem = clib_mem_alloc (sizeof (_vppcom_main)); - if (!vcl_mem) - { - clib_warning ("VCL<%d>: ERROR: clib_mem_alloc() failed!", getpid ()); - ASSERT (vcl_mem); - return; - } + VDBG (1, "session %u [0x%llx]: sending unbind!", session->session_index, + session->vpp_handle); + vcl_evt (VCL_EVT_UNBIND, session); - clib_memcpy (vcl_mem, &_vppcom_main, sizeof (_vppcom_main)); - vcm = vcl_mem; + session->vpp_handle = ~0; + session->session_state = VCL_STATE_DISCONNECT; - VDBG (0, "VCL<%d>: allocated VCL heap = %p, size %lld (0x%llx)", getpid (), - heap, vcl_cfg->heapsize, vcl_cfg->heapsize); + return VPPCOM_OK; } -static void -vppcom_cfg_read (char *conf_fname) +/** + * Handle app exit + * + * Notify vpp of the disconnect and mark the worker as free. If we're the + * last worker, do a full cleanup otherwise, since we're probably a forked + * child, avoid syscalls as much as possible. We might've lost privileges. + */ +void +vppcom_app_exit (void) { - 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, q_len; - - fd = open (conf_fname, O_RDONLY); - if (fd < 0) - { - VDBG (0, "VCL<%d>: using default configuration.", getpid (), - conf_fname); - goto file_done; - } - - if (fstat (fd, &s) < 0) - { - VDBG (0, "VCL<%d>: failed to stat `%s', using default configuration", - getpid (), conf_fname); - goto file_done; - } - - if (!(S_ISREG (s.st_mode) || S_ISLNK (s.st_mode))) - { - VDBG (0, "VCL<%d>: not a regular file `%s', using default " - "configuration", getpid (), conf_fname); - goto file_done; - } - - unformat_init_clib_file (input, fd); - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - (void) unformat_user (input, unformat_line_input, line_input); - unformat_skip_white_space (line_input); - - if (unformat (line_input, "vcl {")) - { - vc_cfg_input = 1; - continue; - } + if (!pool_elts (vcm->workers)) + return; + vcl_worker_cleanup (vcl_worker_get_current (), 1 /* notify vpp */ ); + vcl_set_worker_index (~0); + vcl_elog_stop (vcm); +} - if (vc_cfg_input) - { - if (unformat (line_input, "heapsize %s", &chroot_path)) - { - vec_terminate_c_string (chroot_path); - VDBG (0, "VCL<%d>: configured heapsize %s, actual heapsize %lld" - " (0x%llx)", getpid (), 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); - if (vcl_cfg->vpp_api_filename) - vec_free (vcl_cfg->vpp_api_filename); - vcl_cfg->vpp_api_filename = format (0, "/%s-vpe-api%c", - chroot_path, 0); - vl_set_memory_root_path ((char *) chroot_path); - - VDBG (0, "VCL<%d>: configured api-prefix (%s) and api filename" - " (%s)", getpid (), chroot_path, - vcl_cfg->vpp_api_filename); - chroot_path = 0; /* Don't vec_free() it! */ - } - else if (unformat (line_input, "vpp-api-q-length %d", &q_len)) - { - if (q_len < vcl_cfg->vpp_api_q_length) - { - clib_warning ("VCL<%d>: ERROR: configured vpp-api-q-length " - "(%u) is too small! Using default: %u ", - getpid (), q_len, vcl_cfg->vpp_api_q_length); - } - else - { - vcl_cfg->vpp_api_q_length = q_len; +static int +vcl_api_attach (void) +{ + if (vcm->cfg.vpp_app_socket_api) + return vcl_sapi_attach (); - VDBG (0, "VCL<%d>: configured vpp-api-q-length %u", - getpid (), vcl_cfg->vpp_api_q_length); - } - } - else if (unformat (line_input, "uid %d", &uid)) - { - vl_set_memory_uid (uid); - VDBG (0, "VCL<%d>: configured uid %d", getpid (), uid); - } - else if (unformat (line_input, "gid %d", &gid)) - { - vl_set_memory_gid (gid); - VDBG (0, "VCL<%d>: configured gid %d", getpid (), gid); - } - else if (unformat (line_input, "segment-baseva 0x%lx", - &vcl_cfg->segment_baseva)) - { - VDBG (0, "VCL<%d>: configured segment_baseva 0x%lx", getpid (), - vcl_cfg->segment_baseva); - } - else if (unformat (line_input, "segment-size 0x%lx", - &vcl_cfg->segment_size)) - { - VDBG (0, "VCL<%d>: configured segment_size 0x%lx (%ld)", - getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size); - } - else if (unformat (line_input, "segment-size %ld", - &vcl_cfg->segment_size)) - { - VDBG (0, "VCL<%d>: configured segment_size %ld (0x%lx)", - getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size); - } - else if (unformat (line_input, "add-segment-size 0x%lx", - &vcl_cfg->add_segment_size)) - { - VDBG (0, "VCL<%d>: configured add_segment_size 0x%lx (%ld)", - getpid (), vcl_cfg->add_segment_size, - vcl_cfg->add_segment_size); - } - else if (unformat (line_input, "add-segment-size %ld", - &vcl_cfg->add_segment_size)) - { - VDBG (0, "VCL<%d>: configured add_segment_size %ld (0x%lx)", - getpid (), vcl_cfg->add_segment_size, - vcl_cfg->add_segment_size); - } - else if (unformat (line_input, "preallocated-fifo-pairs %d", - &vcl_cfg->preallocated_fifo_pairs)) - { - VDBG (0, "VCL<%d>: configured preallocated_fifo_pairs %d " - "(0x%x)", getpid (), 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)) - { - VDBG (0, "VCL<%d>: configured rx_fifo_size 0x%lx (%ld)", - getpid (), vcl_cfg->rx_fifo_size, vcl_cfg->rx_fifo_size); - } - else if (unformat (line_input, "rx-fifo-size %ld", - &vcl_cfg->rx_fifo_size)) - { - VDBG (0, "VCL<%d>: configured rx_fifo_size %ld (0x%lx)", - getpid (), 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)) - { - VDBG (0, "VCL<%d>: configured tx_fifo_size 0x%lx (%ld)", - getpid (), vcl_cfg->tx_fifo_size, vcl_cfg->tx_fifo_size); - } - else if (unformat (line_input, "tx-fifo-size %ld", - &vcl_cfg->tx_fifo_size)) - { - VDBG (0, "VCL<%d>: configured tx_fifo_size %ld (0x%lx)", - getpid (), 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)) - { - VDBG (0, "VCL<%d>: configured event_queue_size 0x%lx (%ld)", - getpid (), vcl_cfg->event_queue_size, - vcl_cfg->event_queue_size); - } - else if (unformat (line_input, "event-queue-size %ld", - &vcl_cfg->event_queue_size)) - { - VDBG (0, "VCL<%d>: configured event_queue_size %ld (0x%lx)", - getpid (), 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)) - { - VDBG (0, "VCL<%d>: configured listen_queue_size 0x%lx (%ld)", - getpid (), vcl_cfg->listen_queue_size, - vcl_cfg->listen_queue_size); - } - else if (unformat (line_input, "listen-queue-size %ld", - &vcl_cfg->listen_queue_size)) - { - VDBG (0, "VCL<%d>: configured listen_queue_size %ld (0x%lx)", - getpid (), vcl_cfg->listen_queue_size, - vcl_cfg->listen_queue_size); - } - else if (unformat (line_input, "app-timeout %f", - &vcl_cfg->app_timeout)) - { - VDBG (0, "VCL<%d>: configured app_timeout %f", - getpid (), vcl_cfg->app_timeout); - } - else if (unformat (line_input, "session-timeout %f", - &vcl_cfg->session_timeout)) - { - VDBG (0, "VCL<%d>: configured session_timeout %f", - getpid (), vcl_cfg->session_timeout); - } - else if (unformat (line_input, "accept-timeout %f", - &vcl_cfg->accept_timeout)) - { - VDBG (0, "VCL<%d>: configured accept_timeout %f", - getpid (), vcl_cfg->accept_timeout); - } - else if (unformat (line_input, "app-proxy-transport-tcp")) - { - vcl_cfg->app_proxy_transport_tcp = 1; - VDBG (0, "VCL<%d>: configured app_proxy_transport_tcp (%d)", - getpid (), vcl_cfg->app_proxy_transport_tcp); - } - else if (unformat (line_input, "app-proxy-transport-udp")) - { - vcl_cfg->app_proxy_transport_udp = 1; - VDBG (0, "VCL<%d>: configured app_proxy_transport_udp (%d)", - getpid (), vcl_cfg->app_proxy_transport_udp); - } - else if (unformat (line_input, "app-scope-local")) - { - vcl_cfg->app_scope_local = 1; - VDBG (0, "VCL<%d>: configured app_scope_local (%d)", - getpid (), vcl_cfg->app_scope_local); - } - else if (unformat (line_input, "app-scope-global")) - { - vcl_cfg->app_scope_global = 1; - VDBG (0, "VCL<%d>: configured app_scope_global (%d)", - getpid (), vcl_cfg->app_scope_global); - } - else if (unformat (line_input, "namespace-secret %lu", - &vcl_cfg->namespace_secret)) - { - VDBG (0, "VCL<%d>: configured namespace_secret %lu (0x%lx)", - getpid (), 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; - VDBG (0, "VCL<%d>: configured namespace_id is too long," - " truncated to %d characters!", - getpid (), max_nsid_vec_len); - } + return vcl_bapi_attach (); +} - VDBG (0, "VCL<%d>: configured namespace_id %v", - getpid (), vcl_cfg->namespace_id); - } - else if (unformat (line_input, "}")) - { - vc_cfg_input = 0; - VDBG (0, "VCL<%d>: completed parsing vppcom config!", - getpid ()); - goto input_done; - } - else - { - if (line_input->buffer[line_input->index] != '#') - { - clib_warning ("VCL<%d>: Unknown vppcom config option: '%s'", - getpid (), (char *) - &line_input->buffer[line_input->index]); - } - } - } - } +static void +vcl_api_detach (vcl_worker_t * wrk) +{ + vcl_send_app_detach (wrk); -input_done: - unformat_free (input); + if (vcm->cfg.vpp_app_socket_api) + return vcl_sapi_detach (wrk); -file_done: - if (fd >= 0) - close (fd); + return vcl_bapi_disconnect_from_vpp (); } /* * VPPCOM Public API functions */ int -vppcom_app_create (char *app_name) +vppcom_app_create (const char *app_name) { vppcom_cfg_t *vcl_cfg = &vcm->cfg; - u8 *heap; - mheap_t *h; int rv; - if (!vcm->init) + if (vcm->is_init) { - char *conf_fname; - char *env_var_str; - - vcm->init = 1; - vppcom_cfg_init (vcl_cfg); - env_var_str = getenv (VPPCOM_ENV_DEBUG); - if (env_var_str) - { - u32 tmp; - if (sscanf (env_var_str, "%u", &tmp) != 1) - clib_warning ("VCL<%d>: WARNING: Invalid debug level specified " - "in the environment variable " VPPCOM_ENV_DEBUG - " (%s)!\n", getpid (), env_var_str); - else - { - vcm->debug = tmp; - VDBG (0, "VCL<%d>: configured VCL debug level (%u) from " - VPPCOM_ENV_DEBUG "!", getpid (), vcm->debug); - } - } - conf_fname = getenv (VPPCOM_ENV_CONF); - if (!conf_fname) - conf_fname = VPPCOM_CONF_DEFAULT; - vppcom_cfg_heapsize (conf_fname); - vcl_cfg = &vcm->cfg; - clib_spinlock_init (&vcm->session_fifo_lockp); - clib_fifo_validate (vcm->client_session_index_fifo, - vcm->cfg.listen_queue_size); - vppcom_cfg_read (conf_fname); - - - env_var_str = getenv (VPPCOM_ENV_API_PREFIX); - if (env_var_str) - { - if (vcl_cfg->vpp_api_filename) - vec_free (vcl_cfg->vpp_api_filename); - vcl_cfg->vpp_api_filename = format (0, "/%s-vpe-api%c", - env_var_str, 0); - vl_set_memory_root_path ((char *) env_var_str); - - VDBG (0, "VCL<%d>: configured api prefix (%s) and filename (%s) " - "from " VPPCOM_ENV_API_PREFIX "!", - getpid (), env_var_str, vcl_cfg->vpp_api_filename); - } - 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); - - VDBG (0, "VCL<%d>: configured namespace_id (%v) from " - VPPCOM_ENV_APP_NAMESPACE_ID "!", getpid (), - 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 ("VCL<%d>: WARNING: Invalid namespace secret " - "specified in the environment variable " - VPPCOM_ENV_APP_NAMESPACE_SECRET - " (%s)!\n", getpid (), env_var_str); - else - { - vcm->cfg.namespace_secret = tmp; - VDBG (0, "VCL<%d>: configured namespace secret (%lu) from " - VPPCOM_ENV_APP_NAMESPACE_SECRET "!", getpid (), - vcm->cfg.namespace_secret); - } - } - if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP)) - { - vcm->cfg.app_proxy_transport_tcp = 1; - VDBG (0, "VCL<%d>: configured app_proxy_transport_tcp (%u) from " - VPPCOM_ENV_APP_PROXY_TRANSPORT_TCP "!", getpid (), - vcm->cfg.app_proxy_transport_tcp); - } - if (getenv (VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP)) - { - vcm->cfg.app_proxy_transport_udp = 1; - VDBG (0, "VCL<%d>: configured app_proxy_transport_udp (%u) from " - VPPCOM_ENV_APP_PROXY_TRANSPORT_UDP "!", getpid (), - vcm->cfg.app_proxy_transport_udp); - } - if (getenv (VPPCOM_ENV_APP_SCOPE_LOCAL)) - { - vcm->cfg.app_scope_local = 1; - VDBG (0, "VCL<%d>: configured app_scope_local (%u) from " - VPPCOM_ENV_APP_SCOPE_LOCAL "!", getpid (), - vcm->cfg.app_scope_local); - } - if (getenv (VPPCOM_ENV_APP_SCOPE_GLOBAL)) - { - vcm->cfg.app_scope_global = 1; - VDBG (0, "VCL<%d>: configured app_scope_global (%u) from " - VPPCOM_ENV_APP_SCOPE_GLOBAL "!", getpid (), - vcm->cfg.app_scope_global); - } - - 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_main_init (vcl_cfg->segment_baseva, - 20 /* timeout in secs */ ); - clib_spinlock_init (&vcm->sessions_lockp); + VDBG (1, "already initialized"); + return VPPCOM_EEXIST; } - if (vcm->my_client_index == ~0) - { - - /* 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) - { - clib_warning ("VCL<%d>: ERROR: couldn't connect to VPP!", - getpid ()); - return rv; - } - - /* State event handling thread */ - - rv = vce_start_event_thread (&(vcm->event_thread), 20); - - VDBG (0, "VCL<%d>: sending session enable", getpid ()); + vcm->is_init = 1; + vppcom_cfg (&vcm->cfg); + vcl_cfg = &vcm->cfg; - rv = vppcom_app_session_enable (); - if (rv) - { - clib_warning ("VCL<%d>: ERROR: vppcom_app_session_enable() " - "failed!", getpid ()); - return rv; - } + vcm->main_cpu = pthread_self (); + vcm->main_pid = getpid (); + vcm->app_name = format (0, "%s", app_name); + fifo_segment_main_init (&vcm->segment_main, vcl_cfg->segment_baseva, + 20 /* timeout in secs */ ); + pool_alloc (vcm->workers, vcl_cfg->max_workers); + clib_spinlock_init (&vcm->workers_lock); + clib_rwlock_init (&vcm->segment_table_lock); + atexit (vppcom_app_exit); + vcl_elog_init (vcm); - VDBG (0, "VCL<%d>: sending app attach", getpid ()); + /* Allocate default worker */ + vcl_worker_alloc_and_init (); - rv = vppcom_app_attach (); - if (rv) - { - clib_warning ("VCL<%d>: ERROR: vppcom_app_attach() failed!", - getpid ()); - return rv; - } + if ((rv = vcl_api_attach ())) + return rv; - VDBG (0, "VCL<%d>: app_name '%s', my_client_index %d (0x%x)", - getpid (), app_name, vcm->my_client_index, vcm->my_client_index); - } + VDBG (0, "app_name '%s', my_client_index %d (0x%x)", app_name, + vcm->workers[0].api_client_handle, vcm->workers[0].api_client_handle); return VPPCOM_OK; } @@ -1999,1258 +1389,1401 @@ vppcom_app_create (char *app_name) void vppcom_app_destroy (void) { - int rv; - f64 orig_app_timeout; + vcl_worker_t *wrk, *current_wrk; + void *heap; - if (vcm->my_client_index == ~0) + if (!pool_elts (vcm->workers)) return; - VDBG (0, "VCL<%d>: detaching from VPP, my_client_index %d (0x%x)", - getpid (), vcm->my_client_index, vcm->my_client_index); vcl_evt (VCL_EVT_DETACH, vcm); - vppcom_app_detach (); - orig_app_timeout = vcm->cfg.app_timeout; - vcm->cfg.app_timeout = 2.0; - rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); - vcm->cfg.app_timeout = orig_app_timeout; - if (PREDICT_FALSE (rv)) - VDBG (0, "VCL<%d>: application detach timed out! returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); + current_wrk = vcl_worker_get_current (); + + /* *INDENT-OFF* */ + pool_foreach (wrk, vcm->workers) { + if (current_wrk != wrk) + vcl_worker_cleanup (wrk, 0 /* notify vpp */ ); + } + /* *INDENT-ON* */ + + vcl_api_detach (current_wrk); + vcl_worker_cleanup (current_wrk, 0 /* notify vpp */ ); vcl_elog_stop (vcm); - vl_client_disconnect_from_vlib (); - vcm->my_client_index = ~0; - vcm->app_state = STATE_APP_START; + + /* + * Free the heap and fix vcm + */ + heap = clib_mem_get_heap (); + munmap (clib_mem_get_heap_base (heap), clib_mem_get_heap_size (heap)); + + vcm = &_vppcom_main; + vcm->is_init = 0; } int vppcom_session_create (u8 proto, u8 is_nonblocking) { - session_t *session; - u32 session_index; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; - VCL_SESSION_LOCK (); - pool_get (vcm->sessions, session); - memset (session, 0, sizeof (*session)); - session_index = session - vcm->sessions; + session = vcl_session_alloc (wrk); - session->proto = proto; - session->state = STATE_START; + session->session_type = proto; + session->session_state = VCL_STATE_CLOSED; session->vpp_handle = ~0; + session->is_dgram = vcl_proto_is_dgram (proto); if (is_nonblocking) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK); - else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK); + vcl_session_set_attr (session, VCL_SESS_ATTR_NONBLOCK); + + vcl_evt (VCL_EVT_CREATE, session, session_type, session->session_state, + is_nonblocking, session_index); - vcl_evt (VCL_EVT_CREATE, session, proto, session->state, is_nonblocking, - session_index); + VDBG (0, "created session %u", session->session_index); - VCL_SESSION_UNLOCK (); + return vcl_session_handle (session); +} + +static void +vcl_epoll_lt_add (vcl_worker_t *wrk, vcl_session_t *s) +{ + vcl_session_t *cur, *prev; + + if (wrk->ep_lt_current == VCL_INVALID_SESSION_INDEX) + { + wrk->ep_lt_current = s->session_index; + s->vep.lt_next = s->session_index; + s->vep.lt_prev = s->session_index; + return; + } - VDBG (0, "VCL<%d>: sid %u", getpid (), session_index); + cur = vcl_session_get (wrk, wrk->ep_lt_current); + prev = vcl_session_get (wrk, cur->vep.lt_prev); - return (int) session_index; + prev->vep.lt_next = s->session_index; + s->vep.lt_prev = prev->session_index; + + s->vep.lt_next = cur->session_index; + cur->vep.lt_prev = s->session_index; } -int -vppcom_session_close (uint32_t session_index) +static void +vcl_epoll_lt_del (vcl_worker_t *wrk, vcl_session_t *s) { - session_t *session = 0; - int rv; - u8 is_vep; - u8 is_vep_session; - u32 next_sid; - u32 vep_idx; - u64 vpp_handle; - uword *p; - session_state_t state; - - VCL_SESSION_LOCK_AND_GET (session_index, &session); - is_vep = session->is_vep; - is_vep_session = session->is_vep_session; - next_sid = session->vep.next_sid; - vep_idx = session->vep.vep_idx; - state = session->state; - vpp_handle = session->vpp_handle; - VCL_SESSION_UNLOCK (); + vcl_session_t *prev, *next; - if (VPPCOM_DEBUG > 0) + if (s->vep.lt_next == s->session_index) { - if (is_vep) - clib_warning ("VCL<%d>: vep_idx %u / sid %u: " - "closing epoll session...", - getpid (), session_index, session_index); - else - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %d: " - "closing session...", - getpid (), vpp_handle, session_index); + wrk->ep_lt_current = VCL_INVALID_SESSION_INDEX; + s->vep.lt_next = VCL_INVALID_SESSION_INDEX; + return; } - if (is_vep) + prev = vcl_session_get (wrk, s->vep.lt_prev); + next = vcl_session_get (wrk, s->vep.lt_next); + + prev->vep.lt_next = next->session_index; + next->vep.lt_prev = prev->session_index; + + if (s->session_index == wrk->ep_lt_current) + wrk->ep_lt_current = s->vep.lt_next; + + s->vep.lt_next = VCL_INVALID_SESSION_INDEX; +} + +int +vcl_session_cleanup (vcl_worker_t * wrk, vcl_session_t * s, + vcl_session_handle_t sh, u8 do_disconnect) +{ + int rv = VPPCOM_OK; + + VDBG (1, "session %u [0x%llx] closing", s->session_index, s->vpp_handle); + + if (s->flags & VCL_SESSION_F_IS_VEP) { - while (next_sid != ~0) + u32 next_sh = s->vep.next_sh; + while (next_sh != ~0) { - rv = vppcom_epoll_ctl (session_index, EPOLL_CTL_DEL, next_sid, 0); + rv = vppcom_epoll_ctl (sh, 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_sid, vep_idx, - rv, vppcom_retval_str (rv)); - - VCL_SESSION_LOCK_AND_GET (session_index, &session); - next_sid = session->vep.next_sid; - VCL_SESSION_UNLOCK (); + VDBG (0, "vpp handle 0x%llx, sh %u: EPOLL_CTL_DEL vep_idx %u" + " failed! rv %d (%s)", s->vpp_handle, next_sh, + s->vep.vep_sh, rv, vppcom_retval_str (rv)); + next_sh = s->vep.next_sh; } + goto free_session; } - else - { - if (is_vep_session) - { - rv = vppcom_epoll_ctl (vep_idx, EPOLL_CTL_DEL, session_index, 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_index, - vep_idx, rv, vppcom_retval_str (rv)); - } - if (state & STATE_LISTEN) - { - rv = vppcom_session_unbind (session_index); - 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_index, - rv, vppcom_retval_str (rv)); - } + if (s->flags & VCL_SESSION_F_IS_VEP_SESSION) + { + rv = vppcom_epoll_ctl (s->vep.vep_sh, EPOLL_CTL_DEL, sh, 0); + if (rv < 0) + VDBG (0, "session %u [0x%llx]: EPOLL_CTL_DEL vep_idx %u " + "failed! rv %d (%s)", s->session_index, s->vpp_handle, + s->vep.vep_sh, rv, vppcom_retval_str (rv)); + } - else if (state & (CLIENT_STATE_OPEN | SERVER_STATE_OPEN)) - { - rv = vppcom_session_disconnect (session_index); - 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_index, - rv, vppcom_retval_str (rv)); - } + if (!do_disconnect) + { + VDBG (1, "session %u [0x%llx] disconnect skipped", + s->session_index, s->vpp_handle); + goto cleanup; } - VCL_SESSION_LOCK_AND_GET (session_index, &session); - vpp_handle = session->vpp_handle; - if (vpp_handle != ~0) + if (s->session_state == VCL_STATE_LISTEN) + { + rv = vppcom_session_unbind (sh); + if (PREDICT_FALSE (rv < 0)) + VDBG (0, "session %u [0x%llx]: listener unbind failed! " + "rv %d (%s)", s->session_index, s->vpp_handle, rv, + vppcom_retval_str (rv)); + return rv; + } + else if (vcl_session_is_ready (s) + || (vcl_session_is_connectable_listener (wrk, s))) + { + rv = vppcom_session_disconnect (sh); + if (PREDICT_FALSE (rv < 0)) + VDBG (0, "ERROR: session %u [0x%llx]: disconnect failed!" + " rv %d (%s)", s->session_index, s->vpp_handle, + rv, vppcom_retval_str (rv)); + } + else if (s->session_state == VCL_STATE_DISCONNECT) + { + vcl_send_session_reset_reply (wrk, s, 0); + } + else if (s->session_state == VCL_STATE_DETACHED) { - p = hash_get (vcm->session_index_by_vpp_handles, vpp_handle); - if (p) - hash_unset (vcm->session_index_by_vpp_handles, vpp_handle); + /* Should not happen. VPP cleaned up before app confirmed close */ + VDBG (0, "vpp freed session %d before close", s->session_index); + goto free_session; } - pool_put_index (vcm->sessions, session_index); - VCL_SESSION_UNLOCK (); + s->session_state = VCL_STATE_CLOSED; - if (VPPCOM_DEBUG > 0) - { - if (is_vep) - clib_warning ("VCL<%d>: vep_idx %u / sid %u: epoll session removed.", - getpid (), session_index, session_index); - else - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: session removed.", - getpid (), vpp_handle, session_index); - } -done: + /* Session is removed only after vpp confirms the disconnect */ + return rv; - vcl_evt (VCL_EVT_CLOSE, session, rv); +cleanup: + vcl_session_table_del_vpp_handle (wrk, s->vpp_handle); +free_session: + vcl_session_free (wrk, s); + vcl_evt (VCL_EVT_CLOSE, s, rv); return rv; } int -vppcom_session_bind (uint32_t session_index, vppcom_endpt_t * ep) +vppcom_session_close (uint32_t session_handle) { - session_t *session = 0; - int rv; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; + + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + return vcl_session_cleanup (wrk, session, session_handle, + 1 /* do_disconnect */ ); +} + +int +vppcom_session_bind (uint32_t session_handle, vppcom_endpt_t * ep) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; if (!ep || !ep->ip) return VPPCOM_EINVAL; - VCL_SESSION_LOCK_AND_GET (session_index, &session); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; - if (session->is_vep) + if (session->flags & VCL_SESSION_F_IS_VEP) { - VCL_SESSION_UNLOCK (); - clib_warning ("VCL<%d>: ERROR: sid %u: cannot " - "bind to an epoll session!", getpid (), session_index); - rv = VPPCOM_EBADFD; - goto done; + VDBG (0, "ERROR: cannot bind to epoll session %u!", + session->session_index); + return VPPCOM_EBADFD; } - session->lcl_addr.is_ip4 = ep->is_ip4; - session->lcl_addr.ip46 = to_ip46 (ep->is_ip4 ? IP46_TYPE_IP4 : - IP46_TYPE_IP6, ep->ip); - session->lcl_port = ep->port; - - VDBG (0, "VCL<%d>: sid %u: binding to local %s address %U port %u, " - "proto %s", getpid (), session_index, - session->lcl_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, &session->lcl_addr.ip46, - session->lcl_addr.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, - clib_net_to_host_u16 (session->lcl_port), - session->proto ? "UDP" : "TCP"); + 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_memcpy_fast (&session->transport.lcl_ip.ip6, ep->ip, + sizeof (ip6_address_t)); + session->transport.lcl_port = ep->port; + + VDBG (0, "session %u handle %u: binding to local %s address %U port %u, " + "proto %s", session->session_index, session_handle, + session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &session->transport.lcl_ip, + session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (session->transport.lcl_port), + vppcom_proto_str (session->session_type)); vcl_evt (VCL_EVT_BIND, session); - VCL_SESSION_UNLOCK (); -done: - return rv; + + if (session->session_type == VPPCOM_PROTO_UDP) + vppcom_session_listen (session_handle, 10); + + return VPPCOM_OK; } int -vppcom_session_listen (uint32_t listen_session_index, uint32_t q_len) +vppcom_session_listen (uint32_t listen_sh, uint32_t q_len) { - session_t *listen_session = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *listen_session = 0; u64 listen_vpp_handle; - int rv, retval; + int rv; + + listen_session = vcl_session_get_w_handle (wrk, listen_sh); + if (!listen_session || (listen_session->flags & VCL_SESSION_F_IS_VEP)) + return VPPCOM_EBADFD; if (q_len == 0 || q_len == ~0) q_len = vcm->cfg.listen_queue_size; - VCL_SESSION_LOCK_AND_GET (listen_session_index, &listen_session); - - if (listen_session->is_vep) - { - VCL_SESSION_UNLOCK (); - clib_warning ("VCL<%d>: ERROR: sid %u: cannot listen on an " - "epoll session!", getpid (), listen_session_index); - rv = VPPCOM_EBADFD; - goto done; - } - listen_vpp_handle = listen_session->vpp_handle; - if (listen_session->state & STATE_LISTEN) + if (listen_session->session_state == VCL_STATE_LISTEN) { - VCL_SESSION_UNLOCK (); - VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: already in listen state!", - getpid (), listen_vpp_handle, listen_session_index); - rv = VPPCOM_OK; - goto done; + VDBG (0, "session %u [0x%llx]: already in listen state!", + listen_sh, listen_vpp_handle); + return VPPCOM_OK; } - VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: sending VPP bind+listen " - "request...", getpid (), listen_vpp_handle, listen_session_index); + VDBG (0, "session %u: sending vpp listen request...", listen_sh); - vppcom_send_bind_sock (listen_session, listen_session_index); - VCL_SESSION_UNLOCK (); - retval = - vppcom_wait_for_session_state_change (listen_session_index, STATE_LISTEN, - vcm->cfg.session_timeout); + /* + * Send listen request to vpp and wait for reply + */ + vcl_send_session_listen (wrk, listen_session); + rv = vppcom_wait_for_session_state_change (listen_session->session_index, + VCL_STATE_LISTEN, + vcm->cfg.session_timeout); - VCL_SESSION_LOCK_AND_GET (listen_session_index, &listen_session); - if (PREDICT_FALSE (retval)) + if (PREDICT_FALSE (rv)) { - VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: bind+listen failed! " - "returning %d (%s)", getpid (), listen_session->vpp_handle, - listen_session_index, retval, vppcom_retval_str (retval)); - VCL_SESSION_UNLOCK (); - rv = retval; - goto done; + listen_session = vcl_session_get_w_handle (wrk, listen_sh); + VDBG (0, "session %u [0x%llx]: listen failed! returning %d (%s)", + listen_sh, listen_session->vpp_handle, rv, + vppcom_retval_str (rv)); + return rv; } - VCL_ACCEPT_FIFO_LOCK (); - clib_fifo_validate (vcm->client_session_index_fifo, q_len); - VCL_ACCEPT_FIFO_UNLOCK (); - - VCL_SESSION_UNLOCK (); - -done: - return rv; + return VPPCOM_OK; } -int -validate_args_session_accept_ (session_t * listen_session) +static int +validate_args_session_accept_ (vcl_worker_t * wrk, vcl_session_t * ls) { - u32 listen_session_index = listen_session - vcm->sessions; - - /* Input validation - expects spinlock on sessions_lockp */ - if (listen_session->is_vep) + if (ls->flags & VCL_SESSION_F_IS_VEP) { - clib_warning ("VCL<%d>: ERROR: sid %u: cannot accept on an " - "epoll session!", getpid (), listen_session_index); + VDBG (0, "ERROR: cannot accept on epoll session %u!", + ls->session_index); return VPPCOM_EBADFD; } - if (listen_session->state != STATE_LISTEN) + if ((ls->session_state != VCL_STATE_LISTEN) + && (!vcl_session_is_connectable_listener (wrk, ls))) { - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "not in listen state! state 0x%x (%s)", getpid (), - listen_session->vpp_handle, listen_session_index, - listen_session->state, - vppcom_session_state_str (listen_session->state)); + VDBG (0, "ERROR: session [0x%llx]: not in listen state! state 0x%x" + " (%s)", ls->vpp_handle, ls->session_state, + vppcom_session_state_str (ls->session_state)); return VPPCOM_EBADFD; } return VPPCOM_OK; } int -vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, +vppcom_unformat_proto (uint8_t * proto, char *proto_str) +{ + if (!strcmp (proto_str, "TCP")) + *proto = VPPCOM_PROTO_TCP; + else if (!strcmp (proto_str, "tcp")) + *proto = VPPCOM_PROTO_TCP; + else if (!strcmp (proto_str, "UDP")) + *proto = VPPCOM_PROTO_UDP; + else if (!strcmp (proto_str, "udp")) + *proto = VPPCOM_PROTO_UDP; + else if (!strcmp (proto_str, "TLS")) + *proto = VPPCOM_PROTO_TLS; + else if (!strcmp (proto_str, "tls")) + *proto = VPPCOM_PROTO_TLS; + else if (!strcmp (proto_str, "QUIC")) + *proto = VPPCOM_PROTO_QUIC; + else if (!strcmp (proto_str, "quic")) + *proto = VPPCOM_PROTO_QUIC; + else if (!strcmp (proto_str, "DTLS")) + *proto = VPPCOM_PROTO_DTLS; + else if (!strcmp (proto_str, "dtls")) + *proto = VPPCOM_PROTO_DTLS; + else if (!strcmp (proto_str, "SRTP")) + *proto = VPPCOM_PROTO_SRTP; + else if (!strcmp (proto_str, "srtp")) + *proto = VPPCOM_PROTO_SRTP; + else + return 1; + return 0; +} + +int +vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, uint32_t flags) { - session_t *listen_session = 0; - session_t *client_session = 0; - u32 client_session_index = ~0; + u32 client_session_index = ~0, listen_session_index, accept_flags = 0; + 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; + vcl_session_msg_t *evt; + u8 is_nonblocking; int rv; - u64 listen_vpp_handle; - vce_event_handler_reg_t *reg; - vce_event_t *ev; - vce_event_connect_request_t *result; - struct timespec ts; - struct timeval tv; - int millisecond_timeout = 1; - int hours_timeout = 20 * 60 * 60; - - VCL_SESSION_LOCK_AND_GET (listen_session_index, &listen_session); - listen_vpp_handle = listen_session->vpp_handle; // For debugging - - rv = validate_args_session_accept_ (listen_session); - if (rv) - { - VCL_SESSION_UNLOCK (); - goto done; - } - /* Using an aggressive timer of 1ms and a generous timer of - * 20 hours, we can implement a blocking and non-blocking listener - * as both event and time driven */ - gettimeofday (&tv, NULL); - ts.tv_nsec = (tv.tv_usec * 1000) + (1000 * millisecond_timeout); - ts.tv_sec = tv.tv_sec; - - /* Predict that the Listener is blocking more often than not */ - if (PREDICT_TRUE (!VCL_SESS_ATTR_TEST (listen_session->attr, - VCL_SESS_ATTR_NONBLOCK))) - ts.tv_sec += hours_timeout; - - VCL_SESSION_UNLOCK (); - - /* Register handler for connect_request event on listen_session_index */ - vce_event_key_t evk; - evk.session_index = listen_session_index; - evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED; - reg = vce_register_handler (&vcm->event_thread, &evk, - vce_connect_request_handler_fn, 0); - VCL_EVENTS_LOCK (); - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); - pthread_mutex_lock (®->handler_lock); - while (!ev) +again: + + listen_session = vcl_session_get_w_handle (wrk, listen_session_handle); + if (!listen_session) + return VPPCOM_EBADFD; + + listen_session_index = listen_session->session_index; + if ((rv = validate_args_session_accept_ (wrk, listen_session))) + return rv; + + if (clib_fifo_elts (listen_session->accept_evts_fifo)) { - VCL_EVENTS_UNLOCK (); - rv = pthread_cond_timedwait (®->handler_cond, - ®->handler_lock, &ts); - if (rv == ETIMEDOUT) - { - rv = VPPCOM_EAGAIN; - goto cleanup; - } - VCL_EVENTS_LOCK (); - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); + clib_fifo_sub2 (listen_session->accept_evts_fifo, evt); + accept_flags = evt->flags; + accepted_msg = evt->accepted_msg; + goto handle; } - result = vce_get_event_data (ev, sizeof (*result)); - client_session_index = result->accepted_session_index; - VCL_EVENTS_UNLOCK (); - /* Remove from the FIFO used to service epoll */ - VCL_ACCEPT_FIFO_LOCK (); - if (clib_fifo_elts (vcm->client_session_index_fifo)) + is_nonblocking = vcl_session_has_attr (listen_session, + VCL_SESS_ATTR_NONBLOCK); + while (1) { - u32 tmp_client_session_index; - clib_fifo_sub1 (vcm->client_session_index_fifo, - tmp_client_session_index); - /* It wasn't ours... put it back ... */ - if (tmp_client_session_index != client_session_index) - clib_fifo_add1 (vcm->client_session_index_fifo, - tmp_client_session_index); + if (svm_msg_q_is_empty (wrk->app_event_queue) && is_nonblocking) + return VPPCOM_EAGAIN; + + svm_msg_q_wait (wrk->app_event_queue, SVM_MQ_WAIT_EMPTY); + vcl_worker_flush_mq_events (wrk); + goto again; } - VCL_ACCEPT_FIFO_UNLOCK (); - VCL_SESSION_LOCK (); +handle: - rv = vppcom_session_at_index (client_session_index, &client_session); - if (PREDICT_FALSE (rv)) - { - rv = VPPCOM_ECONNABORTED; - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: client sid %u " - "lookup failed! returning %d (%s)", getpid (), - listen_vpp_handle, listen_session_index, - client_session_index, rv, vppcom_retval_str (rv)); - goto cleanup; - } + client_session_index = vcl_session_accepted_handler (wrk, &accepted_msg, + listen_session_index); + if (client_session_index == VCL_INVALID_SESSION_INDEX) + return VPPCOM_ECONNABORTED; + + listen_session = vcl_session_get (wrk, listen_session_index); + client_session = vcl_session_get (wrk, client_session_index); if (flags & O_NONBLOCK) - VCL_SESS_ATTR_SET (client_session->attr, VCL_SESS_ATTR_NONBLOCK); - else - VCL_SESS_ATTR_CLR (client_session->attr, VCL_SESS_ATTR_NONBLOCK); + vcl_session_set_attr (client_session, VCL_SESS_ATTR_NONBLOCK); - 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_index, - client_session->vpp_handle, client_session_index, - flags, VCL_SESS_ATTR_TEST (client_session->attr, - VCL_SESS_ATTR_NONBLOCK)); + VDBG (1, "listener %u [0x%llx]: Got a connect request! session %u [0x%llx]," + " flags %d, is_nonblocking %u", listen_session->session_index, + listen_session->vpp_handle, client_session_index, + client_session->vpp_handle, flags, + vcl_session_has_attr (client_session, VCL_SESS_ATTR_NONBLOCK)); if (ep) { - 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)); + 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 (ep->ip, &client_session->peer_addr.ip46.ip6, - sizeof (ip6_address_t)); + clib_memcpy_fast (ep->ip, &client_session->transport.rmt_ip.ip6, + sizeof (ip6_address_t)); } - vppcom_send_accept_session_reply (client_session->vpp_handle, - client_session->client_context, - 0 /* retval OK */ ); - - 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_index, client_session->vpp_handle, - client_session_index, - client_session->peer_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, &client_session->peer_addr.ip46, - client_session->peer_addr.is_ip4 ? - IP46_TYPE_IP4 : IP46_TYPE_IP6, - clib_net_to_host_u16 (client_session->peer_port), - client_session->lcl_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, &client_session->lcl_addr.ip46, - client_session->lcl_addr.is_ip4 ? - IP46_TYPE_IP4 : IP46_TYPE_IP6, - clib_net_to_host_u16 (client_session->lcl_port)); + VDBG (0, "listener %u [0x%llx] accepted %u [0x%llx] peer: %U:%u " + "local: %U:%u", listen_session_handle, listen_session->vpp_handle, + client_session_index, client_session->vpp_handle, + format_ip46_address, &client_session->transport.rmt_ip, + client_session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (client_session->transport.rmt_port), + 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); - VCL_SESSION_UNLOCK (); - rv = (int) client_session_index; - vce_clear_event (&vcm->event_thread, reg->ev_idx); - if (vcm->session_io_thread.io_sessions_lockp) + /* + * Session might have been closed already + */ + if (accept_flags) { - /* Throw this new accepted session index into the rx poll thread pool */ - VCL_IO_SESSIONS_LOCK (); - u32 *active_session_index; - pool_get (vcm->session_io_thread.active_session_indexes, - active_session_index); - *active_session_index = client_session_index; - VCL_IO_SESSIONS_UNLOCK (); + if (accept_flags & VCL_ACCEPTED_F_CLOSED) + client_session->session_state = VCL_STATE_VPP_CLOSING; + else if (accept_flags & VCL_ACCEPTED_F_RESET) + client_session->session_state = VCL_STATE_DISCONNECT; } -cleanup: - vce_unregister_handler (&vcm->event_thread, reg); - pthread_mutex_unlock (®->handler_lock); - -done: - return rv; + return vcl_session_handle (client_session); } int -vppcom_session_connect (uint32_t session_index, vppcom_endpt_t * server_ep) +vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) { - session_t *session = 0; - u64 vpp_handle = 0; - int rv, retval = VPPCOM_OK; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; + u32 session_index; + int rv; - VCL_SESSION_LOCK_AND_GET (session_index, &session); + 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 (PREDICT_FALSE (session->flags & VCL_SESSION_F_IS_VEP)) { - VCL_SESSION_UNLOCK (); - clib_warning ("VCL<%d>: ERROR: sid %u: cannot " - "connect on an epoll session!", getpid (), session_index); - rv = VPPCOM_EBADFD; - goto done; + VDBG (0, "ERROR: cannot connect epoll session %u!", + session->session_index); + return VPPCOM_EBADFD; } - if (PREDICT_FALSE (session->state & CLIENT_STATE_OPEN)) + if (PREDICT_FALSE (vcl_session_is_ready (session))) { - VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: session already " + VDBG (0, "session handle %u [0x%llx]: session already " "connected to %s %U port %d proto %s, state 0x%x (%s)", - getpid (), session->vpp_handle, session_index, - session->peer_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, - &session->peer_addr.ip46, session->peer_addr.is_ip4 ? + session_handle, session->vpp_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->peer_port), - session->proto ? "UDP" : "TCP", session->state, - vppcom_session_state_str (session->state)); + clib_net_to_host_u16 (session->transport.rmt_port), + vppcom_proto_str (session->session_type), session->session_state, + vppcom_session_state_str (session->session_state)); + return VPPCOM_OK; + } - VCL_SESSION_UNLOCK (); - goto done; + /* Attempt to connect a connectionless listener */ + if (PREDICT_FALSE (session->session_state == VCL_STATE_LISTEN)) + { + if (session->session_type != VPPCOM_PROTO_UDP) + return VPPCOM_EINVAL; + vcl_send_session_unlisten (wrk, session); + session->session_state = VCL_STATE_CLOSED; } - session->peer_addr.is_ip4 = server_ep->is_ip4; - if (session->peer_addr.is_ip4) - clib_memcpy (&session->peer_addr.ip46.ip4, server_ep->ip, - sizeof (ip4_address_t)); - else - clib_memcpy (&session->peer_addr.ip46.ip6, server_ep->ip, - sizeof (ip6_address_t)); - session->peer_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_index, - session->peer_addr.is_ip4 ? "IPv4" : "IPv6", + session->transport.is_ip4 = server_ep->is_ip4; + vcl_ip_copy_from_ep (&session->transport.rmt_ip, server_ep); + session->transport.rmt_port = server_ep->port; + session->parent_handle = VCL_INVALID_SESSION_HANDLE; + session->flags |= VCL_SESSION_F_CONNECTED; + + VDBG (0, "session handle %u (%s): connecting to peer %s %U " + "port %d proto %s", session_handle, + vppcom_session_state_str (session->session_state), + session->transport.is_ip4 ? "IPv4" : "IPv6", format_ip46_address, - &session->peer_addr.ip46, session->peer_addr.is_ip4 ? + &session->transport.rmt_ip, session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, - clib_net_to_host_u16 (session->peer_port), - session->proto ? "UDP" : "TCP"); + clib_net_to_host_u16 (session->transport.rmt_port), + vppcom_proto_str (session->session_type)); - vppcom_send_connect_sock (session, session_index); - VCL_SESSION_UNLOCK (); + vcl_send_session_connect (wrk, session); - retval = - vppcom_wait_for_session_state_change (session_index, STATE_CONNECT, - vcm->cfg.session_timeout); + if (vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK)) + { + /* State set to STATE_UPDATED to ensure the session is not assumed + * to be ready and to also allow the app to close it prior to vpp's + * connected reply. */ + session->session_state = VCL_STATE_UPDATED; + return VPPCOM_EINPROGRESS; + } - VCL_SESSION_LOCK_AND_GET (session_index, &session); - vpp_handle = session->vpp_handle; - VCL_SESSION_UNLOCK (); + /* + * Wait for reply from vpp if blocking + */ + rv = vppcom_wait_for_session_state_change (session_index, VCL_STATE_READY, + vcm->cfg.session_timeout); -done: - if (PREDICT_FALSE (retval)) + session = vcl_session_get (wrk, session_index); + VDBG (0, "session %u [0x%llx]: connect %s!", session->session_index, + session->vpp_handle, rv ? "failed" : "succeeded"); + + return rv; +} + +int +vppcom_session_stream_connect (uint32_t session_handle, + uint32_t parent_session_handle) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session, *parent_session; + u32 session_index, parent_session_index; + int rv; + + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + parent_session = vcl_session_get_w_handle (wrk, parent_session_handle); + if (!parent_session) + return VPPCOM_EBADFD; + + session_index = session->session_index; + parent_session_index = parent_session->session_index; + if (PREDICT_FALSE (session->flags & VCL_SESSION_F_IS_VEP)) { - rv = retval; - if (VPPCOM_DEBUG > 0) - { - if (session) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connect " - "failed! returning %d (%s)", getpid (), vpp_handle, - session_index, rv, vppcom_retval_str (rv)); - else - clib_warning ("VCL<%d>: no session for sid %u: connect failed! " - "returning %d (%s)", getpid (), - session_index, rv, vppcom_retval_str (rv)); - } + VDBG (0, "ERROR: cannot connect epoll session %u!", + session->session_index); + return VPPCOM_EBADFD; } - else - VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: connected!", - getpid (), vpp_handle, session_index); + + if (PREDICT_FALSE (vcl_session_is_ready (session))) + { + VDBG (0, "session handle %u [0x%llx]: session already " + "connected to session %u [0x%llx] proto %s, state 0x%x (%s)", + session_handle, session->vpp_handle, + parent_session_handle, parent_session->vpp_handle, + vppcom_proto_str (session->session_type), session->session_state, + vppcom_session_state_str (session->session_state)); + return VPPCOM_OK; + } + + /* Connect to quic session specifics */ + session->transport.is_ip4 = parent_session->transport.is_ip4; + session->transport.rmt_ip.ip4.as_u32 = (uint32_t) 1; + session->transport.rmt_port = 0; + session->parent_handle = parent_session->vpp_handle; + + VDBG (0, "session handle %u: connecting to session %u [0x%llx]", + session_handle, parent_session_handle, parent_session->vpp_handle); + + /* + * Send connect request and wait for reply from vpp + */ + vcl_send_session_connect (wrk, session); + rv = vppcom_wait_for_session_state_change (session_index, VCL_STATE_READY, + vcm->cfg.session_timeout); + + session->listener_index = parent_session_index; + parent_session = vcl_session_get_w_handle (wrk, parent_session_handle); + if (parent_session) + parent_session->n_accepted_sessions++; + + session = vcl_session_get (wrk, session_index); + VDBG (0, "session %u [0x%llx]: connect %s!", session->session_index, + session->vpp_handle, rv ? "failed" : "succeeded"); return rv; } static inline int -vppcom_session_read_internal (uint32_t session_index, void *buf, int n, +vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, u8 peek) { - session_t *session = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + int rv, n_read = 0, is_nonblocking; + vcl_session_t *s = 0; svm_fifo_t *rx_fifo; - int n_read = 0; - int rv; - int is_nonblocking; - - u64 vpp_handle; - u32 poll_et; - session_state_t state; - - ASSERT (buf); + session_event_t *e; + svm_msg_q_t *mq; + u8 is_ct; - VCL_SESSION_LOCK_AND_GET (session_index, &session); + if (PREDICT_FALSE (!buf)) + return VPPCOM_EFAULT; - is_nonblocking = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK); - rx_fifo = session->rx_fifo; - state = session->state; - vpp_handle = session->vpp_handle; + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || (s->flags & VCL_SESSION_F_IS_VEP))) + return VPPCOM_EBADFD; - if (PREDICT_FALSE (session->is_vep)) + if (PREDICT_FALSE (!vcl_session_is_open (s))) { - VCL_SESSION_UNLOCK (); - clib_warning ("VCL<%d>: ERROR: sid %u: cannot " - "read from an epoll session!", getpid (), session_index); - rv = VPPCOM_EBADFD; - goto done; + VDBG (0, "session %u[0x%llx] is not open! state 0x%x (%s)", + s->session_index, s->vpp_handle, s->session_state, + vppcom_session_state_str (s->session_state)); + return vcl_session_closed_error (s); } - if (PREDICT_FALSE (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN)))) + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_RD_SHUTDOWN)) { - VCL_SESSION_UNLOCK (); - 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 (), vpp_handle, session_index, state, - vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); - goto done; + /* Vpp would ack the incoming data and enqueue it for reading. + * So even if SHUT_RD is set, we can still read() the data if + * the session is ready. + */ + if (!vcl_session_read_ready (s)) + { + return 0; + } } - VCL_SESSION_UNLOCK (); + is_nonblocking = vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK); + is_ct = vcl_session_is_ct (s); + mq = wrk->app_event_queue; + rx_fifo = is_ct ? s->ct_rx_fifo : s->rx_fifo; + s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; - do + if (svm_fifo_is_empty_cons (rx_fifo)) { - if (peek) - n_read = svm_fifo_peek (rx_fifo, 0, n, buf); - else - n_read = svm_fifo_dequeue_nowait (rx_fifo, n, buf); + if (is_nonblocking) + { + if (vcl_session_is_closing (s)) + return vcl_session_closing_error (s); + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); + return VPPCOM_EWOULDBLOCK; + } + while (svm_fifo_is_empty_cons (rx_fifo)) + { + if (vcl_session_is_closing (s)) + return vcl_session_closing_error (s); + + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); + + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); + vcl_worker_flush_mq_events (wrk); + } } - while (!is_nonblocking && (n_read <= 0)); - if (n_read <= 0) - { - VCL_SESSION_LOCK_AND_GET (session_index, &session); +read_again: + + if (s->is_dgram) + rv = app_recv_dgram_raw (rx_fifo, buf, n, &s->transport, 0, peek); + else + rv = app_recv_stream_raw (rx_fifo, buf, n, 0, peek); - poll_et = (((EPOLLET | EPOLLIN) & session->vep.ev.events) == - (EPOLLET | EPOLLIN)); - if (poll_et) - session->vep.et_mask |= EPOLLIN; + ASSERT (rv >= 0); - if (state & STATE_CLOSE_ON_EMPTY) + if (peek) + return rv; + + n_read += rv; + + if (svm_fifo_is_empty_cons (rx_fifo)) + { + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); + if (!svm_fifo_is_empty_cons (rx_fifo) + && svm_fifo_set_event (rx_fifo) && is_nonblocking) { - rv = VPPCOM_ECONNRESET; - - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo with " - "session state 0x%x (%s)! Setting state to 0x%x (%s), " - "returning %d (%s)", - getpid (), session->vpp_handle, session_index, - state, vppcom_session_state_str (state), - STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT), rv, - vppcom_retval_str (rv)); - - session->state = STATE_DISCONNECT; + vec_add2 (wrk->unhandled_evts_vector, e, 1); + e->event_type = SESSION_IO_EVT_RX; + e->session_index = s->session_index; } - else - rv = VPPCOM_EAGAIN; - - VCL_SESSION_UNLOCK (); } - else - rv = n_read; + else if (PREDICT_FALSE (rv < n && !s->is_dgram)) + { + /* More data enqueued while reading. Try to drain it + * or fill the buffer. Avoid doing that for dgrams */ + buf += rv; + n -= rv; + goto read_again; + } - if (VPPCOM_DEBUG > 2) + if (PREDICT_FALSE (svm_fifo_needs_deq_ntf (rx_fifo, n_read))) { - if (rv > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: read %d bytes " - "from (%p)", getpid (), vpp_handle, - session_index, n_read, rx_fifo); - else - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: nothing read! " - "returning %d (%s)", getpid (), vpp_handle, - session_index, rv, vppcom_retval_str (rv)); + svm_fifo_clear_deq_ntf (rx_fifo); + app_send_io_evt_to_vpp (s->vpp_evt_q, + s->rx_fifo->shr->master_session_index, + SESSION_IO_EVT_RX, SVM_Q_WAIT); } -done: - return rv; + + VDBG (2, "session %u[0x%llx]: read %d bytes from (%p)", s->session_index, + s->vpp_handle, n_read, rx_fifo); + + return n_read; } int -vppcom_session_read (uint32_t session_index, void *buf, size_t n) +vppcom_session_read (uint32_t session_handle, void *buf, size_t n) { - return (vppcom_session_read_internal (session_index, buf, n, 0)); + return (vppcom_session_read_internal (session_handle, buf, n, 0)); } static int -vppcom_session_peek (uint32_t session_index, void *buf, int n) +vppcom_session_peek (uint32_t session_handle, void *buf, int n) { - return (vppcom_session_read_internal (session_index, buf, n, 1)); + return (vppcom_session_read_internal (session_handle, buf, n, 1)); } -static inline int -vppcom_session_read_ready (session_t * session, u32 session_index) +int +vppcom_session_read_segments (uint32_t session_handle, + vppcom_data_segment_t * ds, uint32_t n_segments, + uint32_t max_bytes) { - int ready = 0; - u32 poll_et; - int rv; - session_state_t state = session->state; - u64 vpp_handle = session->vpp_handle; + vcl_worker_t *wrk = vcl_worker_get_current (); + int n_read = 0, is_nonblocking; + vcl_session_t *s = 0; + svm_fifo_t *rx_fifo; + svm_msg_q_t *mq; + u8 is_ct; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || (s->flags & VCL_SESSION_F_IS_VEP))) + return VPPCOM_EBADFD; + + if (PREDICT_FALSE (!vcl_session_is_open (s))) + return vcl_session_closed_error (s); + + is_nonblocking = vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK); + is_ct = vcl_session_is_ct (s); + mq = wrk->app_event_queue; + rx_fifo = is_ct ? s->ct_rx_fifo : s->rx_fifo; + s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - if (PREDICT_FALSE (session->is_vep)) + if (svm_fifo_is_empty_cons (rx_fifo)) { - clib_warning ("VCL<%d>: ERROR: sid %u: cannot read from an " - "epoll session!", getpid (), session_index); - rv = VPPCOM_EBADFD; - goto done; + if (is_nonblocking) + { + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); + return VPPCOM_EWOULDBLOCK; + } + while (svm_fifo_is_empty_cons (rx_fifo)) + { + if (vcl_session_is_closing (s)) + return vcl_session_closing_error (s); + + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); + + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); + vcl_worker_flush_mq_events (wrk); + } } - if (session->state & STATE_LISTEN) + n_read = svm_fifo_segments (rx_fifo, s->rx_bytes_pending, + (svm_fifo_seg_t *) ds, n_segments, max_bytes); + if (n_read < 0) + return VPPCOM_EAGAIN; + + if (svm_fifo_max_dequeue_cons (rx_fifo) == n_read) { - VCL_ACCEPT_FIFO_LOCK (); - ready = clib_fifo_elts (vcm->client_session_index_fifo); - VCL_ACCEPT_FIFO_UNLOCK (); + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); + if (svm_fifo_max_dequeue_cons (rx_fifo) != n_read + && svm_fifo_set_event (rx_fifo) + && vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + { + session_event_t *e; + vec_add2 (wrk->unhandled_evts_vector, e, 1); + e->event_type = SESSION_IO_EVT_RX; + e->session_index = s->session_index; + } } + + s->rx_bytes_pending += n_read; + return n_read; +} + +void +vppcom_session_free_segments (uint32_t session_handle, uint32_t n_bytes) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s; + u8 is_ct; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || (s->flags & VCL_SESSION_F_IS_VEP))) + return; + + is_ct = vcl_session_is_ct (s); + svm_fifo_dequeue_drop (is_ct ? s->ct_rx_fifo : s->rx_fifo, n_bytes); + + ASSERT (s->rx_bytes_pending < n_bytes); + s->rx_bytes_pending -= n_bytes; +} + +always_inline u8 +vcl_fifo_is_writeable (svm_fifo_t * f, u32 len, u8 is_dgram) +{ + u32 max_enq = svm_fifo_max_enqueue_prod (f); + if (is_dgram) + return max_enq >= (sizeof (session_dgram_hdr_t) + len); else + return max_enq > 0; +} + +always_inline int +vppcom_session_write_inline (vcl_worker_t * wrk, vcl_session_t * s, void *buf, + size_t n, u8 is_flush, u8 is_dgram) +{ + int n_write, is_nonblocking; + session_evt_type_t et; + svm_fifo_t *tx_fifo; + svm_msg_q_t *mq; + u8 is_ct; + + /* Accept zero length writes but just return */ + if (PREDICT_FALSE (!n)) + return VPPCOM_OK; + + if (PREDICT_FALSE (!buf)) + return VPPCOM_EFAULT; + + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_IS_VEP)) { - if (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN | STATE_LISTEN))) - { - 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 (), vpp_handle, session_index, - state, vppcom_session_state_str (state), - rv, vppcom_retval_str (rv)); - goto done; - } + VDBG (0, "ERROR: session %u [0x%llx]: cannot write to an epoll" + " session!", s->session_index, s->vpp_handle); + return VPPCOM_EBADFD; + } - ready = svm_fifo_max_dequeue (session->rx_fifo); + if (PREDICT_FALSE (!vcl_session_is_open (s))) + { + VDBG (1, "session %u [0x%llx]: is not open! state 0x%x (%s)", + s->session_index, s->vpp_handle, s->session_state, + vppcom_session_state_str (s->session_state)); + return vcl_session_closed_error (s);; } - if (ready == 0) + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_WR_SHUTDOWN)) { - poll_et = - ((EPOLLET | EPOLLIN) & session->vep.ev.events) == (EPOLLET | EPOLLIN); - if (poll_et) - session->vep.et_mask |= EPOLLIN; + VDBG (1, "session %u [0x%llx]: is shutdown! state 0x%x (%s)", + s->session_index, s->vpp_handle, s->session_state, + vppcom_session_state_str (s->session_state)); + return VPPCOM_EPIPE; + } + + is_ct = vcl_session_is_ct (s); + tx_fifo = is_ct ? s->ct_tx_fifo : s->tx_fifo; + is_nonblocking = vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK); - if (state & STATE_CLOSE_ON_EMPTY) + mq = wrk->app_event_queue; + if (!vcl_fifo_is_writeable (tx_fifo, n, is_dgram)) + { + if (is_nonblocking) { - rv = VPPCOM_ECONNRESET; - - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo with " - "session state 0x%x (%s)! Setting state to 0x%x (%s), " - "returning %d (%s)", - getpid (), session_index, vpp_handle, - state, vppcom_session_state_str (state), - STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT), rv, - vppcom_retval_str (rv)); - session->state = STATE_DISCONNECT; - goto done; + return VPPCOM_EWOULDBLOCK; + } + while (!vcl_fifo_is_writeable (tx_fifo, n, is_dgram)) + { + svm_fifo_add_want_deq_ntf (tx_fifo, SVM_FIFO_WANT_DEQ_NOTIF); + if (vcl_session_is_closing (s)) + return vcl_session_closing_error (s); + + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); + vcl_worker_flush_mq_events (wrk); } } - rv = ready; - if (vcm->app_event_queue->cursize && - !pthread_mutex_trylock (&vcm->app_event_queue->mutex)) - { - u32 i, n_to_dequeue = vcm->app_event_queue->cursize; - session_fifo_event_t e; + et = SESSION_IO_EVT_TX; + if (is_flush && !is_ct) + et = SESSION_IO_EVT_TX_FLUSH; - for (i = 0; i < n_to_dequeue; i++) - svm_queue_sub_raw (vcm->app_event_queue, (u8 *) & e); + if (is_dgram) + n_write = app_send_dgram_raw (tx_fifo, &s->transport, + s->vpp_evt_q, buf, n, et, + 0 /* do_evt */ , SVM_Q_WAIT); + else + n_write = app_send_stream_raw (tx_fifo, s->vpp_evt_q, buf, n, et, + 0 /* do_evt */ , SVM_Q_WAIT); - pthread_mutex_unlock (&vcm->app_event_queue->mutex); - } -done: - return rv; + if (svm_fifo_set_event (s->tx_fifo)) + app_send_io_evt_to_vpp ( + s->vpp_evt_q, s->tx_fifo->shr->master_session_index, et, SVM_Q_WAIT); + + /* The underlying fifo segment can run out of memory */ + if (PREDICT_FALSE (n_write < 0)) + return VPPCOM_EAGAIN; + + VDBG (2, "session %u [0x%llx]: wrote %d bytes", s->session_index, + s->vpp_handle, n_write); + + return n_write; } int -vppcom_session_write (uint32_t session_index, void *buf, size_t n) +vppcom_session_write (uint32_t session_handle, void *buf, size_t n) { - session_t *session = 0; - svm_fifo_t *tx_fifo = 0; - svm_queue_t *q; - session_fifo_event_t evt; - session_state_t state; - int rv, n_write, is_nonblocking; - u32 poll_et; - u64 vpp_handle; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s)) + return VPPCOM_EBADFD; + + return vppcom_session_write_inline (wrk, s, buf, n, + 0 /* is_flush */ , s->is_dgram ? 1 : 0); +} + +int +vppcom_session_write_msg (uint32_t session_handle, void *buf, size_t n) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s)) + return VPPCOM_EBADFD; + + return vppcom_session_write_inline (wrk, s, buf, n, + 1 /* is_flush */ , s->is_dgram ? 1 : 0); +} + +#define vcl_fifo_rx_evt_valid_or_break(_s) \ +if (PREDICT_FALSE (!_s->rx_fifo)) \ + break; \ +if (PREDICT_FALSE (svm_fifo_is_empty (_s->rx_fifo))) \ + { \ + if (!vcl_session_is_ct (_s)) \ + { \ + svm_fifo_unset_event (_s->rx_fifo); \ + if (svm_fifo_is_empty (_s->rx_fifo)) \ + break; \ + } \ + else if (svm_fifo_is_empty (_s->ct_rx_fifo)) \ + { \ + svm_fifo_unset_event (_s->rx_fifo); /* rx evts on actual fifo*/ \ + if (svm_fifo_is_empty (_s->ct_rx_fifo)) \ + break; \ + } \ + } \ - ASSERT (buf); +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; + vcl_session_t *s; + u32 sid; - VCL_SESSION_LOCK_AND_GET (session_index, &session); + switch (e->event_type) + { + case SESSION_IO_EVT_RX: + sid = e->session_index; + s = vcl_session_get (wrk, sid); + if (!s || !vcl_session_is_open (s)) + break; + vcl_fifo_rx_evt_valid_or_break (s); + if (sid < n_bits && read_map) + { + clib_bitmap_set_no_check ((uword *) read_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_IO_EVT_TX: + sid = e->session_index; + s = vcl_session_get (wrk, sid); + if (!s || !vcl_session_is_open (s)) + break; + if (sid < n_bits && write_map) + { + clib_bitmap_set_no_check ((uword *) write_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_CTRL_EVT_ACCEPTED: + if (!e->postponed) + s = vcl_session_accepted (wrk, (session_accepted_msg_t *) e->data); + else + s = vcl_session_get (wrk, e->session_index); + if (!s) + break; + sid = s->session_index; + if (sid < n_bits && read_map) + { + clib_bitmap_set_no_check ((uword *) read_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_CTRL_EVT_CONNECTED: + if (!e->postponed) + { + connected_msg = (session_connected_msg_t *) e->data; + sid = vcl_session_connected_handler (wrk, connected_msg); + } + else + sid = e->session_index; + if (sid == VCL_INVALID_SESSION_INDEX) + break; + if (sid < n_bits && write_map) + { + clib_bitmap_set_no_check ((uword *) write_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_CTRL_EVT_DISCONNECTED: + disconnected_msg = (session_disconnected_msg_t *) e->data; + s = vcl_session_disconnected_handler (wrk, disconnected_msg); + if (!s) + break; + sid = s->session_index; + if (sid < n_bits && except_map) + { + clib_bitmap_set_no_check ((uword *) 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 ((uword *) except_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + vcl_session_unlisten_reply_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_MIGRATED: + vcl_session_migrated_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_CLEANUP: + vcl_session_cleanup_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_WORKER_UPDATE_REPLY: + vcl_session_worker_update_reply_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_REQ_WORKER_UPDATE: + vcl_session_req_worker_update_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_ADD_SEGMENT: + vcl_session_app_add_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_DEL_SEGMENT: + vcl_session_app_del_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_WRK_RPC: + vcl_worker_rpc_handler (wrk, e->data); + break; + default: + clib_warning ("unhandled: %u", e->event_type); + break; + } +} - tx_fifo = session->tx_fifo; - is_nonblocking = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK); - vpp_handle = session->vpp_handle; - state = session->state; +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; - if (PREDICT_FALSE (session->is_vep)) + if (svm_msg_q_is_empty (mq)) { - VCL_SESSION_UNLOCK (); - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "cannot write to an epoll session!", - getpid (), vpp_handle, session_index); + if (*bits_set) + return 0; - rv = VPPCOM_EBADFD; - goto done; + if (!time_to_wait) + return 0; + else if (time_to_wait < 0) + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); + else + { + if (svm_msg_q_timedwait (mq, time_to_wait)) + return 0; + } } + vcl_mq_dequeue_batch (wrk, mq, ~0); - if (!(session->state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))) + for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { - rv = - ((session->state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : - VPPCOM_ENOTCONN); - - VCL_SESSION_UNLOCK (); - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session is not open! " - "state 0x%x (%s)", - getpid (), vpp_handle, session_index, - state, vppcom_session_state_str (state)); - goto done; + 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); + vcl_handle_pending_wrk_updates (wrk); + return *bits_set; +} - VCL_SESSION_UNLOCK (); +static int +vppcom_select_condvar (vcl_worker_t * wrk, int n_bits, + vcl_si_set * read_map, vcl_si_set * write_map, + vcl_si_set * except_map, double time_to_wait, + u32 * bits_set) +{ + double wait = 0, start = 0; - do + if (!*bits_set) { - n_write = svm_fifo_enqueue_nowait (tx_fifo, n, (void *) buf); + wait = time_to_wait; + start = clib_time_now (&wrk->clib_time); } - while (!is_nonblocking && (n_write <= 0)); - /* If event wasn't set, add one - * - * To reduce context switching, can check if an - * event is already there for this event_key, but for now - * this will suffice. */ - - if ((n_write > 0) && svm_fifo_set_event (tx_fifo)) + do { - /* Fabricate TX event, send to vpp */ - evt.fifo = tx_fifo; - evt.event_type = FIFO_EVENT_APP_TX; - - VCL_SESSION_LOCK_AND_GET (session_index, &session); - q = session->vpp_event_queue; - ASSERT (q); - svm_queue_add (q, (u8 *) & evt, 0 /* do wait for mutex */ ); - VCL_SESSION_UNLOCK (); - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: added FIFO_EVENT_APP_TX " - "to vpp_event_q %p, n_write %d", getpid (), - vpp_handle, session_index, q, n_write); + vcl_select_handle_mq (wrk, wrk->app_event_queue, n_bits, read_map, + write_map, except_map, wait, bits_set); + if (*bits_set) + return *bits_set; + if (wait == -1) + continue; + + wait = wait - (clib_time_now (&wrk->clib_time) - start); } + while (wait > 0); - if (n_write <= 0) - { - VCL_SESSION_LOCK_AND_GET (session_index, &session); - - poll_et = (((EPOLLET | EPOLLOUT) & session->vep.ev.events) == - (EPOLLET | EPOLLOUT)); - if (poll_et) - session->vep.et_mask |= EPOLLOUT; - - if (session->state & STATE_CLOSE_ON_EMPTY) - { - rv = VPPCOM_ECONNRESET; - - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo with " - "session state 0x%x (%s)! Setting state to 0x%x (%s), " - "returning %d (%s)", - getpid (), session->vpp_handle, session_index, - session->state, - vppcom_session_state_str (session->state), - STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT), rv, - vppcom_retval_str (rv)); - - session->state = STATE_DISCONNECT; - } - else - rv = VPPCOM_EAGAIN; - - VCL_SESSION_UNLOCK (); - } - else - rv = n_write; + return 0; +} - if (VPPCOM_DEBUG > 2) +static int +vppcom_select_eventfd (vcl_worker_t * wrk, int n_bits, + vcl_si_set * read_map, vcl_si_set * write_map, + vcl_si_set * except_map, double time_to_wait, + u32 * bits_set) +{ + 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)); + 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 (n_write <= 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "FIFO-FULL (%p)", getpid (), vpp_handle, - session_index, tx_fifo); - else - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "wrote %d bytes tx-fifo: (%p)", getpid (), - vpp_handle, session_index, n_write, tx_fifo); + 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); } -done: - return rv; + + return (n_mq_evts > 0 ? (int) *bits_set : 0); } -static inline int -vppcom_session_write_ready (session_t * session, u32 session_index) +int +vppcom_select (int n_bits, vcl_si_set * read_map, vcl_si_set * write_map, + vcl_si_set * except_map, double time_to_wait) { - int ready; - u32 poll_et; - int rv; - - ASSERT (session); + u32 sid, minbits = clib_max (n_bits, BITS (uword)), bits_set = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s = 0; + int i; - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - if (PREDICT_FALSE (session->is_vep)) + if (n_bits && read_map) { - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "cannot write to an epoll session!", - getpid (), session->vpp_handle, session_index); - rv = VPPCOM_EBADFD; - goto done; + clib_bitmap_validate (wrk->rd_bitmap, minbits); + clib_memcpy_fast (wrk->rd_bitmap, read_map, + vec_len (wrk->rd_bitmap) * sizeof (vcl_si_set)); + memset (read_map, 0, vec_len (wrk->rd_bitmap) * sizeof (vcl_si_set)); } - - if (PREDICT_FALSE (session->state & STATE_LISTEN)) + if (n_bits && write_map) { - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "cannot write to a listen session!", - getpid (), session->vpp_handle, session_index); - rv = VPPCOM_EBADFD; - goto done; + clib_bitmap_validate (wrk->wr_bitmap, minbits); + clib_memcpy_fast (wrk->wr_bitmap, write_map, + vec_len (wrk->wr_bitmap) * sizeof (vcl_si_set)); + memset (write_map, 0, vec_len (wrk->wr_bitmap) * sizeof (vcl_si_set)); } - - if (!(session->state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))) + if (n_bits && except_map) { - session_state_t state = session->state; - - 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_index, - state, vppcom_session_state_str (state), - rv, vppcom_retval_str (rv)); - goto done; + clib_bitmap_validate (wrk->ex_bitmap, minbits); + clib_memcpy_fast (wrk->ex_bitmap, except_map, + vec_len (wrk->ex_bitmap) * sizeof (vcl_si_set)); + memset (except_map, 0, vec_len (wrk->ex_bitmap) * sizeof (vcl_si_set)); } - ready = svm_fifo_max_enqueue (session->tx_fifo); + if (!n_bits) + return 0; - VDBG (3, "VCL<%d>: vpp handle 0x%llx, sid %u: peek %s (%p), ready = %d", - getpid (), session->vpp_handle, session_index, session->tx_fifo, - ready); + if (!write_map) + goto check_rd; - if (ready == 0) + clib_bitmap_foreach (sid, wrk->wr_bitmap) { - poll_et = (((EPOLLET | EPOLLOUT) & session->vep.ev.events) == - (EPOLLET | EPOLLOUT)); - if (poll_et) - session->vep.et_mask |= EPOLLOUT; + if (!(s = vcl_session_get (wrk, sid))) + { + clib_bitmap_set_no_check ((uword *) write_map, sid, 1); + bits_set++; + continue; + } - if (session->state & STATE_CLOSE_ON_EMPTY) + if (vcl_session_write_ready (s)) { - rv = VPPCOM_ECONNRESET; - - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: Empty fifo with " - "session state 0x%x (%s)! Setting state to 0x%x (%s), " - "returning %d (%s)", getpid (), - session->vpp_handle, session_index, - session->state, - vppcom_session_state_str (session->state), - STATE_DISCONNECT, - vppcom_session_state_str (STATE_DISCONNECT), rv, - vppcom_retval_str (rv)); - session->state = STATE_DISCONNECT; - goto done; + clib_bitmap_set_no_check ((uword *) write_map, sid, 1); + bits_set++; + } + else + { + svm_fifo_t *txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF); } } - rv = ready; -done: - return rv; -} - -int -vppcom_select (unsigned long n_bits, unsigned long *read_map, - unsigned long *write_map, unsigned long *except_map, - double time_to_wait) -{ - 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)); - ASSERT (sizeof (clib_bitmap_t) == sizeof (long int)); +check_rd: + if (!read_map) + goto check_mq; - if (n_bits && read_map) - { - clib_bitmap_validate (vcm->rd_bitmap, minbits); - clib_memcpy (vcm->rd_bitmap, read_map, - vec_len (vcm->rd_bitmap) * sizeof (clib_bitmap_t)); - memset (read_map, 0, vec_len (vcm->rd_bitmap) * sizeof (clib_bitmap_t)); - } - if (n_bits && write_map) - { - clib_bitmap_validate (vcm->wr_bitmap, minbits); - clib_memcpy (vcm->wr_bitmap, write_map, - vec_len (vcm->wr_bitmap) * sizeof (clib_bitmap_t)); - memset (write_map, 0, - vec_len (vcm->wr_bitmap) * sizeof (clib_bitmap_t)); - } - if (n_bits && except_map) + clib_bitmap_foreach (sid, wrk->rd_bitmap) { - clib_bitmap_validate (vcm->ex_bitmap, minbits); - clib_memcpy (vcm->ex_bitmap, except_map, - vec_len (vcm->ex_bitmap) * sizeof (clib_bitmap_t)); - memset (except_map, 0, - vec_len (vcm->ex_bitmap) * sizeof (clib_bitmap_t)); + if (!(s = vcl_session_get (wrk, sid))) + { + clib_bitmap_set_no_check ((uword *) read_map, sid, 1); + bits_set++; + continue; + } + + if (vcl_session_read_ready (s)) + { + clib_bitmap_set_no_check ((uword *) read_map, sid, 1); + bits_set++; + } } - do +check_mq: + + for (i = 0; i < vec_len (wrk->unhandled_evts_vector); i++) { - /* *INDENT-OFF* */ - if (n_bits) - { - if (read_map) - { - clib_bitmap_foreach (session_index, vcm->rd_bitmap, - ({ - VCL_SESSION_LOCK(); - rv = vppcom_session_at_index (session_index, &session); - if (rv < 0) - { - VCL_SESSION_UNLOCK(); - VDBG (1, "VCL<%d>: session %d specified in read_map is" - " closed.", getpid (), - session_index); - bits_set = VPPCOM_EBADFD; - goto select_done; - } - if (session->state & STATE_LISTEN) - { - vce_event_handler_reg_t *reg = 0; - vce_event_key_t evk; - - /* Check if handler already registered for this - * event. - * If not, register handler for connect_request event - * on listen_session_index - */ - evk.session_index = session_index; - evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED; - reg = vce_get_event_handler (&vcm->event_thread, &evk); - if (!reg) - reg = vce_register_handler (&vcm->event_thread, &evk, - vce_poll_wait_connect_request_handler_fn, - 0 /* No callback args */); - rv = vppcom_session_read_ready (session, session_index); - if (rv > 0) - { - vce_unregister_handler (&vcm->event_thread, reg); - } - } - else - rv = vppcom_session_read_ready (session, session_index); - VCL_SESSION_UNLOCK(); - if (except_map && vcm->ex_bitmap && - clib_bitmap_get (vcm->ex_bitmap, session_index) && - (rv < 0)) - { - clib_bitmap_set_no_check (except_map, session_index, 1); - bits_set++; - } - else if (rv > 0) - { - clib_bitmap_set_no_check (read_map, session_index, 1); - bits_set++; - } - })); - } - - if (write_map) - { - clib_bitmap_foreach (session_index, vcm->wr_bitmap, - ({ - VCL_SESSION_LOCK(); - rv = vppcom_session_at_index (session_index, &session); - if (rv < 0) - { - VCL_SESSION_UNLOCK(); - VDBG (0, "VCL<%d>: session %d specified in " - "write_map is closed.", getpid (), - session_index); - bits_set = VPPCOM_EBADFD; - goto select_done; - } - - rv = vppcom_session_write_ready (session, session_index); - VCL_SESSION_UNLOCK(); - if (write_map && (rv > 0)) - { - clib_bitmap_set_no_check (write_map, session_index, 1); - bits_set++; - } - })); - } - - if (except_map) - { - clib_bitmap_foreach (session_index, vcm->ex_bitmap, - ({ - VCL_SESSION_LOCK(); - rv = vppcom_session_at_index (session_index, &session); - if (rv < 0) - { - VCL_SESSION_UNLOCK(); - VDBG (1, "VCL<%d>: session %d specified in except_map " - "is closed.", getpid (), - session_index); - bits_set = VPPCOM_EBADFD; - goto select_done; - } - - rv = vppcom_session_read_ready (session, session_index); - VCL_SESSION_UNLOCK(); - if (rv < 0) - { - clib_bitmap_set_no_check (except_map, session_index, 1); - bits_set++; - } - })); - } - } - /* *INDENT-ON* */ + vcl_select_handle_mq_event (wrk, &wrk->unhandled_evts_vector[i], n_bits, + read_map, write_map, except_map, &bits_set); } - while ((time_to_wait == -1) || (clib_time_now (&vcm->clib_time) < timeout)); + 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); -select_done: return (bits_set); } static inline void -vep_verify_epoll_chain (u32 vep_idx) +vep_verify_epoll_chain (vcl_worker_t * wrk, u32 vep_handle) { - session_t *session; vppcom_epoll_t *vep; - int rv; - u32 sid = vep_idx; + u32 sh = vep_handle; + vcl_session_t *s; - if (VPPCOM_DEBUG <= 1) + if (VPPCOM_DEBUG <= 2) return; - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - rv = vppcom_session_at_index (vep_idx, &session); - if (PREDICT_FALSE (rv)) + s = vcl_session_get_w_handle (wrk, vep_handle); + if (PREDICT_FALSE (!s)) { - clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", - getpid (), vep_idx); + VDBG (0, "ERROR: Invalid vep_sh (%u)!", vep_handle); goto done; } - if (PREDICT_FALSE (!session->is_vep)) + if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP))) { - clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", - getpid (), vep_idx); + VDBG (0, "ERROR: vep_sh (%u) is not a vep!", vep_handle); goto done; } - vep = &session->vep; - clib_warning ("VCL<%d>: vep_idx (%u): Dumping epoll chain\n" - "{\n" - " is_vep = %u\n" - " is_vep_session = %u\n" - " next_sid = 0x%x (%u)\n" - " wait_cont_idx = 0x%x (%u)\n" - "}\n", getpid (), vep_idx, - session->is_vep, session->is_vep_session, - vep->next_sid, vep->next_sid, - session->wait_cont_idx, session->wait_cont_idx); - - for (sid = vep->next_sid; sid != ~0; sid = vep->next_sid) + vep = &s->vep; + VDBG (0, "vep_sh (%u): Dumping epoll chain\n" + "{\n" + " is_vep = %u\n" + " is_vep_session = %u\n" + " next_sh = 0x%x (%u)\n" + "}\n", vep_handle, s->flags & VCL_SESSION_F_IS_VEP, + s->flags & VCL_SESSION_F_IS_VEP_SESSION, vep->next_sh, vep->next_sh); + + for (sh = vep->next_sh; sh != ~0; sh = vep->next_sh) { - rv = vppcom_session_at_index (sid, &session); - if (PREDICT_FALSE (rv)) + s = vcl_session_get_w_handle (wrk, sh); + if (PREDICT_FALSE (!s)) { - clib_warning ("VCL<%d>: ERROR: Invalid sid (%u)!", getpid (), sid); + VDBG (0, "ERROR: Invalid sh (%u)!", sh); goto done; } - if (PREDICT_FALSE (session->is_vep)) - clib_warning ("VCL<%d>: ERROR: sid (%u) is a vep!", - getpid (), vep_idx); - else if (PREDICT_FALSE (!session->is_vep_session)) + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_IS_VEP)) + { + VDBG (0, "ERROR: sh (%u) is a vep!", vep_handle); + } + else if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION))) { - clib_warning ("VCL<%d>: ERROR: session (%u) " - "is not a vep session!", getpid (), sid); + VDBG (0, "ERROR: sh (%u) is not a vep session handle!", sh); goto done; } - vep = &session->vep; - if (PREDICT_FALSE (vep->vep_idx != vep_idx)) - clib_warning ("VCL<%d>: ERROR: session (%u) vep_idx (%u) != " - "vep_idx (%u)!", getpid (), - sid, session->vep.vep_idx, vep_idx); - if (session->is_vep_session) + vep = &s->vep; + if (PREDICT_FALSE (vep->vep_sh != vep_handle)) + VDBG (0, "ERROR: session (%u) vep_sh (%u) != vep_sh (%u)!", + sh, s->vep.vep_sh, vep_handle); + if (s->flags & VCL_SESSION_F_IS_VEP_SESSION) { - clib_warning ("vep_idx[%u]: sid 0x%x (%u)\n" - "{\n" - " next_sid = 0x%x (%u)\n" - " prev_sid = 0x%x (%u)\n" - " vep_idx = 0x%x (%u)\n" - " ev.events = 0x%x\n" - " ev.data.u64 = 0x%llx\n" - " et_mask = 0x%x\n" - "}\n", - vep_idx, sid, sid, - vep->next_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); + VDBG (0, "vep_sh[%u]: sh 0x%x (%u)\n" + "{\n" + " next_sh = 0x%x (%u)\n" + " prev_sh = 0x%x (%u)\n" + " vep_sh = 0x%x (%u)\n" + " ev.events = 0x%x\n" + " ev.data.u64 = 0x%llx\n" + " et_mask = 0x%x\n" + "}\n", + vep_handle, sh, sh, vep->next_sh, vep->next_sh, vep->prev_sh, + vep->prev_sh, vep->vep_sh, vep->vep_sh, vep->ev.events, + vep->ev.data.u64, vep->et_mask); } } done: - clib_warning ("VCL<%d>: vep_idx (%u): Dump complete!\n", - getpid (), vep_idx); + VDBG (0, "vep_sh (%u): Dump complete!\n", vep_handle); } int vppcom_epoll_create (void) { - session_t *vep_session; - u32 vep_idx; - - VCL_SESSION_LOCK (); - pool_get (vcm->sessions, vep_session); - memset (vep_session, 0, sizeof (*vep_session)); - vep_idx = vep_session - vcm->sessions; - - 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; - vep_session->vpp_handle = ~0; - vep_session->poll_reg = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *vep_session; + + vep_session = vcl_session_alloc (wrk); - vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_idx); - VCL_SESSION_UNLOCK (); + vep_session->flags |= VCL_SESSION_F_IS_VEP; + vep_session->vep.vep_sh = ~0; + vep_session->vep.next_sh = ~0; + vep_session->vep.prev_sh = ~0; + vep_session->vpp_handle = ~0; - VDBG (0, "VCL<%d>: Created vep_idx %u / sid %u!", - getpid (), vep_idx, vep_idx); + vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_session->session_index); + VDBG (0, "Created vep_idx %u", vep_session->session_index); - return (vep_idx); + return vcl_session_handle (vep_session); } int -vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, +vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, struct epoll_event *event) { - session_t *vep_session; - session_t *session; - int rv; + vcl_worker_t *wrk = vcl_worker_get_current (); + int rv = VPPCOM_OK, add_evt = 0; + vcl_session_t *vep_session; + vcl_session_t *s; + svm_fifo_t *txf; - if (vep_idx == session_index) + if (vep_handle == session_handle) { - clib_warning ("VCL<%d>: ERROR: vep_idx == session_index (%u)!", - getpid (), vep_idx); + VDBG (0, "vep_sh == session handle (%u)!", vep_handle); return VPPCOM_EINVAL; } - VCL_SESSION_LOCK (); - rv = vppcom_session_at_index (vep_idx, &vep_session); - if (PREDICT_FALSE (rv)) + vep_session = vcl_session_get_w_handle (wrk, vep_handle); + if (PREDICT_FALSE (!vep_session)) { - clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", vep_idx); - goto done; + VDBG (0, "Invalid vep_sh (%u)!", vep_handle); + return VPPCOM_EBADFD; } - if (PREDICT_FALSE (!vep_session->is_vep)) + if (PREDICT_FALSE (!(vep_session->flags & VCL_SESSION_F_IS_VEP))) { - clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", - getpid (), vep_idx); - rv = VPPCOM_EINVAL; - goto done; + VDBG (0, "vep_sh (%u) is not a vep!", vep_handle); + return VPPCOM_EINVAL; } - ASSERT (vep_session->vep.vep_idx == ~0); - ASSERT (vep_session->vep.prev_sid == ~0); + ASSERT (vep_session->vep.vep_sh == ~0); + ASSERT (vep_session->vep.prev_sh == ~0); - 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)) { - VDBG (0, "VCL<%d>: ERROR: Invalid session_index (%u)!", - getpid (), session_index); - goto done; + VDBG (0, "Invalid session_handle (%u)!", session_handle); + return VPPCOM_EBADFD; } - if (PREDICT_FALSE (session->is_vep)) + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_IS_VEP)) { - clib_warning ("ERROR: session_index (%u) is a vep!", vep_idx); - rv = VPPCOM_EINVAL; - goto done; + VDBG (0, "session_handle (%u) is a vep!", vep_handle); + return VPPCOM_EINVAL; } switch (op) @@ -3258,393 +2791,634 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, case EPOLL_CTL_ADD: if (PREDICT_FALSE (!event)) { - clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_ADD: NULL pointer to " - "epoll_event structure!", getpid ()); - rv = VPPCOM_EINVAL; + VDBG (0, "EPOLL_CTL_ADD: NULL pointer to epoll_event structure!"); + return VPPCOM_EINVAL; + } + if (s->flags & VCL_SESSION_F_IS_VEP_SESSION) + { + VDBG (0, "EPOLL_CTL_ADD: %u already epolled!", s->session_index); + rv = VPPCOM_EEXIST; goto done; } - if (vep_session->vep.next_sid != ~0) + if (vep_session->vep.next_sh != ~0) { - session_t *next_session; - rv = vppcom_session_at_index (vep_session->vep.next_sid, - &next_session); - if (PREDICT_FALSE (rv)) + 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_sid, vep_idx); - goto done; + VDBG (0, "EPOLL_CTL_ADD: Invalid vep.next_sh (%u) on " + "vep_idx (%u)!", vep_session->vep.next_sh, vep_handle); + return VPPCOM_EBADFD; } - ASSERT (next_session->vep.prev_sid == vep_idx); - next_session->vep.prev_sid = session_index; + ASSERT (next_session->vep.prev_sh == vep_handle); + next_session->vep.prev_sh = session_handle; + } + s->vep.next_sh = vep_session->vep.next_sh; + s->vep.prev_sh = vep_handle; + s->vep.vep_sh = vep_handle; + s->vep.et_mask = VEP_DEFAULT_ET_MASK; + s->vep.lt_next = VCL_INVALID_SESSION_INDEX; + s->vep.ev = *event; + s->flags &= ~VCL_SESSION_F_IS_VEP; + s->flags |= VCL_SESSION_F_IS_VEP_SESSION; + vep_session->vep.next_sh = session_handle; + + txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + if (txf && (event->events & EPOLLOUT)) + svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + + /* Generate EPOLLOUT if tx fifo not full */ + if ((event->events & EPOLLOUT) && (vcl_session_write_ready (s) > 0)) + { + session_event_t e = { 0 }; + e.event_type = SESSION_IO_EVT_TX; + e.session_index = s->session_index; + vec_add1 (wrk->unhandled_evts_vector, e); + add_evt = 1; + } + /* Generate EPOLLIN if rx fifo has data */ + if ((event->events & EPOLLIN) && (vcl_session_read_ready (s) > 0)) + { + session_event_t e = { 0 }; + e.event_type = SESSION_IO_EVT_RX; + e.session_index = s->session_index; + vec_add1 (wrk->unhandled_evts_vector, e); + s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; + add_evt = 1; } - 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 = 0; - session->is_vep_session = 1; - vep_session->vep.next_sid = session_index; - - /* VCL Event Register handler */ - if (session->state & STATE_LISTEN) + if (!add_evt && vcl_session_is_closing (s)) { - /* Register handler for connect_request event on listen_session_index */ - vce_event_key_t evk; - evk.session_index = session_index; - evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED; - vep_session->poll_reg = - vce_register_handler (&vcm->event_thread, &evk, - vce_poll_wait_connect_request_handler_fn, - 0 /* No callback args */ ); + session_event_t e = { 0 }; + if (s->session_state == VCL_STATE_VPP_CLOSING) + e.event_type = SESSION_CTRL_EVT_DISCONNECTED; + else + e.event_type = SESSION_CTRL_EVT_RESET; + e.session_index = s->session_index; + e.postponed = 1; + vec_add1 (wrk->unhandled_evts_vector, e); } - VDBG (1, "VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, " - "sid %u, events 0x%x, data 0x%llx!", - getpid (), vep_idx, session_index, - event->events, event->data.u64); - vcl_evt (VCL_EVT_EPOLL_CTLADD, session, event->events, event->data.u64); + VDBG (1, "EPOLL_CTL_ADD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!", + vep_handle, session_handle, event->events, event->data.u64); + vcl_evt (VCL_EVT_EPOLL_CTLADD, s, event->events, event->data.u64); break; case EPOLL_CTL_MOD: if (PREDICT_FALSE (!event)) { - clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_MOD: NULL pointer to " - "epoll_event structure!", getpid ()); + VDBG (0, "EPOLL_CTL_MOD: NULL pointer to epoll_event structure!"); rv = VPPCOM_EINVAL; goto done; } - else if (PREDICT_FALSE (!session->is_vep_session)) + else if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION))) { - clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: " - "not a vep session!", getpid (), session_index); - rv = VPPCOM_EINVAL; + VDBG (0, "sh %u EPOLL_CTL_MOD: not a vep session!", session_handle); + rv = VPPCOM_ENOENT; goto done; } - else if (PREDICT_FALSE (session->vep.vep_idx != vep_idx)) + else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle)) { - clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: " - "vep_idx (%u) != vep_idx (%u)!", - getpid (), session_index, - session->vep.vep_idx, vep_idx); + VDBG (0, "EPOLL_CTL_MOD: sh %u vep_sh (%u) != vep_sh (%u)!", + session_handle, s->vep.vep_sh, vep_handle); rv = VPPCOM_EINVAL; goto done; } - session->vep.et_mask = VEP_DEFAULT_ET_MASK; - session->vep.ev = *event; - VDBG (1, "VCL<%d>: EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x," - " data 0x%llx!", getpid (), vep_idx, session_index, event->events, - event->data.u64); + + /* Generate EPOLLOUT if session write ready nd event was not on */ + if ((event->events & EPOLLOUT) && !(s->vep.ev.events & EPOLLOUT) && + (vcl_session_write_ready (s) > 0)) + { + session_event_t e = { 0 }; + e.event_type = SESSION_IO_EVT_TX; + e.session_index = s->session_index; + vec_add1 (wrk->unhandled_evts_vector, e); + } + /* Generate EPOLLIN if session read ready and event was not on */ + if ((event->events & EPOLLIN) && !(s->vep.ev.events & EPOLLIN) && + (vcl_session_read_ready (s) > 0)) + { + session_event_t e = { 0 }; + e.event_type = SESSION_IO_EVT_RX; + e.session_index = s->session_index; + vec_add1 (wrk->unhandled_evts_vector, e); + s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; + } + s->vep.et_mask = VEP_DEFAULT_ET_MASK; + s->vep.ev = *event; + txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + if (txf) + { + if (event->events & EPOLLOUT) + svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + else + svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + } + VDBG (1, "EPOLL_CTL_MOD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!", + vep_handle, session_handle, event->events, event->data.u64); break; case EPOLL_CTL_DEL: - if (PREDICT_FALSE (!session->is_vep_session)) + if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION))) { - clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: " - "not a vep session!", getpid (), session_index); - rv = VPPCOM_EINVAL; + VDBG (0, "EPOLL_CTL_DEL: %u not a vep session!", session_handle); + rv = VPPCOM_ENOENT; goto done; } - else if (PREDICT_FALSE (session->vep.vep_idx != vep_idx)) + else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle)) { - clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: " - "vep_idx (%u) != vep_idx (%u)!", - getpid (), session_index, - session->vep.vep_idx, vep_idx); + VDBG (0, "EPOLL_CTL_DEL: sh %u vep_sh (%u) != vep_sh (%u)!", + session_handle, s->vep.vep_sh, vep_handle); rv = VPPCOM_EINVAL; goto done; } - /* VCL Event Un-register handler */ - if ((session->state & STATE_LISTEN) && vep_session->poll_reg) - { - (void) vce_unregister_handler (&vcm->event_thread, - vep_session->poll_reg); - } - - vep_session->wait_cont_idx = - (vep_session->wait_cont_idx == session_index) ? - session->vep.next_sid : vep_session->wait_cont_idx; - - if (session->vep.prev_sid == vep_idx) - vep_session->vep.next_sid = session->vep.next_sid; + if (s->vep.prev_sh == vep_handle) + vep_session->vep.next_sh = s->vep.next_sh; else { - session_t *prev_session; - rv = vppcom_session_at_index (session->vep.prev_sid, &prev_session); - if (PREDICT_FALSE (rv)) + vcl_session_t *prev_session; + prev_session = vcl_session_get_w_handle (wrk, s->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_sid, session_index); - goto done; + VDBG (0, "EPOLL_CTL_DEL: Invalid prev_sh (%u) on sh (%u)!", + s->vep.prev_sh, session_handle); + return VPPCOM_EBADFD; } - ASSERT (prev_session->vep.next_sid == session_index); - prev_session->vep.next_sid = session->vep.next_sid; + ASSERT (prev_session->vep.next_sh == session_handle); + prev_session->vep.next_sh = s->vep.next_sh; } - if (session->vep.next_sid != ~0) + if (s->vep.next_sh != ~0) { - session_t *next_session; - rv = vppcom_session_at_index (session->vep.next_sid, &next_session); - if (PREDICT_FALSE (rv)) + vcl_session_t *next_session; + next_session = vcl_session_get_w_handle (wrk, s->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_sid, session_index); - goto done; + VDBG (0, "EPOLL_CTL_DEL: Invalid next_sh (%u) on sh (%u)!", + s->vep.next_sh, session_handle); + return VPPCOM_EBADFD; } - ASSERT (next_session->vep.prev_sid == session_index); - next_session->vep.prev_sid = session->vep.prev_sid; + ASSERT (next_session->vep.prev_sh == session_handle); + next_session->vep.prev_sh = s->vep.prev_sh; } - 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; - VDBG (1, "VCL<%d>: EPOLL_CTL_DEL: vep_idx %u, sid %u!", - getpid (), vep_idx, session_index); - vcl_evt (VCL_EVT_EPOLL_CTLDEL, session, vep_idx); + if (s->vep.lt_next != VCL_INVALID_SESSION_INDEX) + vcl_epoll_lt_del (wrk, s); + + memset (&s->vep, 0, sizeof (s->vep)); + s->vep.next_sh = ~0; + s->vep.prev_sh = ~0; + s->vep.vep_sh = ~0; + s->vep.lt_next = VCL_INVALID_SESSION_INDEX; + s->flags &= ~VCL_SESSION_F_IS_VEP_SESSION; + + if (vcl_session_is_open (s)) + { + txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + if (txf) + svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + } + + VDBG (1, "EPOLL_CTL_DEL: vep_idx %u, sh %u!", vep_handle, + session_handle); + vcl_evt (VCL_EVT_EPOLL_CTLDEL, s, vep_sh); break; default: - clib_warning ("VCL<%d>: ERROR: Invalid operation (%d)!", getpid (), op); + VDBG (0, "Invalid operation (%d)!", op); rv = VPPCOM_EINVAL; } - vep_verify_epoll_chain (vep_idx); + vep_verify_epoll_chain (wrk, vep_handle); done: - VCL_SESSION_UNLOCK (); return rv; } -int -vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, - int maxevents, double wait_for_time) +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_t *vep_session; - int rv; - f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time; - u32 keep_trying = 1; - int num_ev = 0; - u32 vep_next_sid, wait_cont_idx; - u8 is_vep; + session_disconnected_msg_t *disconnected_msg; + session_connected_msg_t *connected_msg; + u32 sid = ~0, session_events; + u64 session_evt_data = ~0; + vcl_session_t *s; + u8 add_event = 0; + + switch (e->event_type) + { + case SESSION_IO_EVT_RX: + sid = e->session_index; + s = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (s)) + break; + vcl_fifo_rx_evt_valid_or_break (s); + session_events = s->vep.ev.events; + if (!(EPOLLIN & s->vep.ev.events) + || (s->flags & VCL_SESSION_F_HAS_RX_EVT)) + break; + add_event = 1; + events[*num_ev].events = EPOLLIN; + session_evt_data = s->vep.ev.data.u64; + s->flags |= VCL_SESSION_F_HAS_RX_EVT; + break; + case SESSION_IO_EVT_TX: + sid = e->session_index; + s = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (s)) + break; + session_events = s->vep.ev.events; + if (!(EPOLLOUT & session_events)) + break; + add_event = 1; + events[*num_ev].events = EPOLLOUT; + session_evt_data = s->vep.ev.data.u64; + svm_fifo_reset_has_deq_ntf (vcl_session_is_ct (s) ? + s->ct_tx_fifo : s->tx_fifo); + break; + case SESSION_CTRL_EVT_ACCEPTED: + if (!e->postponed) + s = vcl_session_accepted (wrk, (session_accepted_msg_t *) e->data); + else + s = vcl_session_get (wrk, e->session_index); + if (!s) + break; + session_events = s->vep.ev.events; + sid = s->session_index; + if (!(EPOLLIN & session_events)) + break; + add_event = 1; + events[*num_ev].events = EPOLLIN; + session_evt_data = s->vep.ev.data.u64; + break; + case SESSION_CTRL_EVT_CONNECTED: + if (!e->postponed) + { + connected_msg = (session_connected_msg_t *) e->data; + sid = vcl_session_connected_handler (wrk, connected_msg); + } + else + sid = e->session_index; + s = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (s)) + break; + session_events = s->vep.ev.events; + /* Generate EPOLLOUT because there's no connected event */ + if (!(EPOLLOUT & session_events)) + break; + add_event = 1; + events[*num_ev].events = EPOLLOUT; + session_evt_data = s->vep.ev.data.u64; + if (s->session_state == VCL_STATE_DETACHED) + events[*num_ev].events |= EPOLLHUP; + break; + case SESSION_CTRL_EVT_DISCONNECTED: + if (!e->postponed) + { + disconnected_msg = (session_disconnected_msg_t *) e->data; + s = vcl_session_disconnected_handler (wrk, disconnected_msg); + } + else + { + s = vcl_session_get (wrk, e->session_index); + } + if (vcl_session_is_closed (s) || + !(s->flags & VCL_SESSION_F_IS_VEP_SESSION)) + break; + sid = s->session_index; + session_events = s->vep.ev.events; + add_event = 1; + events[*num_ev].events = EPOLLHUP | EPOLLRDHUP; + session_evt_data = s->vep.ev.data.u64; + break; + case SESSION_CTRL_EVT_RESET: + if (!e->postponed) + sid = vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + else + sid = e->session_index; + s = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (s) || + !(s->flags & VCL_SESSION_F_IS_VEP_SESSION)) + break; + session_events = s->vep.ev.events; + add_event = 1; + events[*num_ev].events = EPOLLHUP | EPOLLRDHUP; + session_evt_data = s->vep.ev.data.u64; + break; + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + vcl_session_unlisten_reply_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_MIGRATED: + vcl_session_migrated_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_CLEANUP: + vcl_session_cleanup_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_REQ_WORKER_UPDATE: + vcl_session_req_worker_update_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_WORKER_UPDATE_REPLY: + vcl_session_worker_update_reply_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_ADD_SEGMENT: + vcl_session_app_add_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_DEL_SEGMENT: + vcl_session_app_del_segment_handler (wrk, e->data); + break; + case SESSION_CTRL_EVT_APP_WRK_RPC: + vcl_worker_rpc_handler (wrk, e->data); + break; + default: + VDBG (0, "unhandled: %u", e->event_type); + break; + } - if (PREDICT_FALSE (maxevents <= 0)) + if (add_event) { - clib_warning ("VCL<%d>: ERROR: Invalid maxevents (%d)!", - getpid (), maxevents); - return VPPCOM_EINVAL; + events[*num_ev].data.u64 = session_evt_data; + if (EPOLLONESHOT & session_events) + { + s = vcl_session_get (wrk, sid); + s->vep.ev.events = 0; + } + else if (!(EPOLLET & session_events)) + { + s = vcl_session_get (wrk, sid); + if (s->vep.lt_next == VCL_INVALID_SESSION_INDEX) + vcl_epoll_lt_add (wrk, s); + } + *num_ev += 1; } - memset (events, 0, sizeof (*events) * maxevents); +} + +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; - VCL_SESSION_LOCK_AND_GET (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; - VCL_SESSION_UNLOCK (); + if (vec_len (wrk->mq_msg_vector) && svm_msg_q_is_empty (mq)) + goto handle_dequeued; - if (PREDICT_FALSE (!is_vep)) + if (svm_msg_q_is_empty (mq)) { - clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", - getpid (), vep_idx); - rv = VPPCOM_EINVAL; - goto done; + if (!wait_for_time) + return 0; + else if (wait_for_time < 0) + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); + else + { + if (svm_msg_q_timedwait (mq, wait_for_time / 1e3)) + return 0; + } } - if (PREDICT_FALSE (vep_next_sid == ~0)) + ASSERT (maxevents > *num_ev); + vcl_mq_dequeue_batch (wrk, mq, ~0); + +handle_dequeued: + for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { - VDBG (1, "VCL<%d>: WARNING: vep_idx (%u) is empty!", - getpid (), vep_idx); - goto done; + 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 + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (mq, msg); + } + vec_reset_length (wrk->mq_msg_vector); + vcl_handle_pending_wrk_updates (wrk); + return *num_ev; +} + +static int +vppcom_epoll_wait_condvar (vcl_worker_t *wrk, struct epoll_event *events, + int maxevents, u32 n_evts, double timeout_ms) +{ + double end = -1; + + if (!n_evts) + { + if (timeout_ms > 0) + end = clib_time_now (&wrk->clib_time) + (timeout_ms / 1e3); } do { - u32 sid; - u32 next_sid = ~0; - session_t *session; + vcl_epoll_wait_handle_mq (wrk, wrk->app_event_queue, events, maxevents, + timeout_ms, &n_evts); + if (n_evts || !timeout_ms) + return n_evts; + } + while (end == -1 || clib_time_now (&wrk->clib_time) < end); + + return 0; +} + +static int +vppcom_epoll_wait_eventfd (vcl_worker_t *wrk, struct epoll_event *events, + int maxevents, u32 n_evts, double timeout_ms) +{ + int __clib_unused n_read; + vcl_mq_evt_conn_t *mqc; + int n_mq_evts, i; + double end = -1; + u64 buf; + + vec_validate (wrk->mq_events, pool_elts (wrk->mq_evt_conns)); + if (!n_evts) + { + if (timeout_ms > 0) + end = clib_time_now (&wrk->clib_time) + (timeout_ms / 1e3); + } - for (sid = (wait_cont_idx == ~0) ? vep_next_sid : wait_cont_idx; - sid != ~0; sid = next_sid) + do + { + n_mq_evts = epoll_wait (wrk->mqs_epfd, wrk->mq_events, + vec_len (wrk->mq_events), timeout_ms); + if (n_mq_evts < 0) { - u32 session_events, et_mask, clear_et_mask, session_vep_idx; - u8 add_event, is_vep_session; - int ready; - u64 session_ev_data; - - VCL_SESSION_LOCK_AND_GET (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; - - VCL_SESSION_UNLOCK (); - - if (PREDICT_FALSE (is_vep)) - { - VDBG (0, "VCL<%d>: ERROR: sid (%u) is a vep!", - getpid (), vep_idx); - rv = VPPCOM_EINVAL; - goto done; - } - if (PREDICT_FALSE (!is_vep_session)) - { - VDBG (0, "VCL<%d>: ERROR: session (%u) is not " - "a vep session!", getpid (), sid); - rv = VPPCOM_EINVAL; - goto done; - } - if (PREDICT_FALSE (session_vep_idx != vep_idx)) - { - clib_warning ("VCL<%d>: ERROR: session (%u) " - "vep_idx (%u) != vep_idx (%u)!", - getpid (), sid, session_vep_idx, vep_idx); - rv = VPPCOM_EINVAL; - goto done; - } + VDBG (0, "epoll_wait error %u", errno); + return n_evts; + } - add_event = clear_et_mask = 0; + 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 (EPOLLIN & session_events) - { - VCL_SESSION_LOCK_AND_GET (sid, &session); - ready = vppcom_session_read_ready (session, sid); - VCL_SESSION_UNLOCK (); - if ((ready > 0) && (EPOLLIN & et_mask)) - { - add_event = 1; - events[num_ev].events |= EPOLLIN; - if (((EPOLLET | EPOLLIN) & session_events) == - (EPOLLET | EPOLLIN)) - clear_et_mask |= EPOLLIN; - } - else if (ready < 0) - { - add_event = 1; - switch (ready) - { - case VPPCOM_ECONNRESET: - events[num_ev].events |= EPOLLHUP | EPOLLRDHUP; - break; + if (n_evts || !timeout_ms) + return n_evts; + } + while (end == -1 || clib_time_now (&wrk->clib_time) < end); - default: - events[num_ev].events |= EPOLLERR; - break; - } - } + return 0; +} + +static void +vcl_epoll_wait_handle_lt (vcl_worker_t *wrk, struct epoll_event *events, + int maxevents, u32 *n_evts) +{ + u32 add_event = 0, next; + vcl_session_t *s; + u64 evt_data; + int rv; + + ASSERT (wrk->ep_lt_current != VCL_INVALID_SESSION_INDEX); + if (*n_evts >= maxevents) + return; + + next = wrk->ep_lt_current; + do + { + s = vcl_session_get (wrk, next); + next = s->vep.lt_next; + + if ((s->vep.ev.events & EPOLLIN) && (rv = vcl_session_read_ready (s))) + { + add_event = 1; + events[*n_evts].events |= rv > 0 ? EPOLLIN : EPOLLHUP | EPOLLRDHUP; + evt_data = s->vep.ev.data.u64; + } + if ((s->vep.ev.events & EPOLLOUT) && (rv = vcl_session_write_ready (s))) + { + add_event = 1; + events[*n_evts].events |= rv > 0 ? EPOLLOUT : EPOLLHUP | EPOLLRDHUP; + evt_data = s->vep.ev.data.u64; + } + if (!add_event && s->session_state > VCL_STATE_READY) + { + add_event = 1; + events[*n_evts].events |= EPOLLHUP | EPOLLRDHUP; + evt_data = s->vep.ev.data.u64; + } + if (add_event) + { + events[*n_evts].data.u64 = evt_data; + *n_evts += 1; + add_event = 0; + if (EPOLLONESHOT & s->vep.ev.events) + s->vep.ev.events = 0; + if (*n_evts == maxevents) + { + wrk->ep_lt_current = next; + break; } + } + else + { + vcl_epoll_lt_del (wrk, s); + if (wrk->ep_lt_current == VCL_INVALID_SESSION_INDEX) + break; + } + } + while (next != wrk->ep_lt_current); +} + +int +vppcom_epoll_wait (uint32_t vep_handle, struct epoll_event *events, + int maxevents, double wait_for_time) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *vep_session; + u32 n_evts = 0; + int i; + + if (PREDICT_FALSE (maxevents <= 0)) + { + VDBG (0, "ERROR: Invalid maxevents (%d)!", maxevents); + return VPPCOM_EINVAL; + } - if (EPOLLOUT & session_events) - { - VCL_SESSION_LOCK_AND_GET (sid, &session); - ready = vppcom_session_write_ready (session, sid); - VCL_SESSION_UNLOCK (); - if ((ready > 0) && (EPOLLOUT & et_mask)) - { - add_event = 1; - events[num_ev].events |= EPOLLOUT; - if (((EPOLLET | EPOLLOUT) & session_events) == - (EPOLLET | EPOLLOUT)) - clear_et_mask |= EPOLLOUT; - } - else if (ready < 0) - { - add_event = 1; - switch (ready) - { - case VPPCOM_ECONNRESET: - events[num_ev].events |= EPOLLHUP; - break; + vep_session = vcl_session_get_w_handle (wrk, vep_handle); + if (!vep_session) + return VPPCOM_EBADFD; - default: - events[num_ev].events |= EPOLLERR; - break; - } - } - } + if (PREDICT_FALSE (!(vep_session->flags & VCL_SESSION_F_IS_VEP))) + { + VDBG (0, "ERROR: vep_idx (%u) is not a vep!", vep_handle); + return VPPCOM_EINVAL; + } - if (add_event) - { - events[num_ev].data.u64 = session_ev_data; - if (EPOLLONESHOT & session_events) - { - VCL_SESSION_LOCK_AND_GET (sid, &session); - session->vep.ev.events = 0; - VCL_SESSION_UNLOCK (); - } - num_ev++; - if (num_ev == maxevents) - { - VCL_SESSION_LOCK_AND_GET (vep_idx, &vep_session); - vep_session->wait_cont_idx = next_sid; - VCL_SESSION_UNLOCK (); - goto done; - } - } - if (wait_cont_idx != ~0) + if (vec_len (wrk->unhandled_evts_vector)) + { + 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) { - if (next_sid == ~0) - next_sid = vep_next_sid; - else if (next_sid == wait_cont_idx) - next_sid = ~0; + vec_delete (wrk->unhandled_evts_vector, i + 1, 0); + return n_evts; } } - if (wait_for_time != -1) - keep_trying = (clib_time_now (&vcm->clib_time) <= timeout) ? 1 : 0; + vec_reset_length (wrk->unhandled_evts_vector); } - while ((num_ev == 0) && keep_trying); + /* Request to only drain unhandled */ + if ((int) wait_for_time == -2) + return n_evts; - if (wait_cont_idx != ~0) - { - VCL_SESSION_LOCK_AND_GET (vep_idx, &vep_session); - vep_session->wait_cont_idx = ~0; - VCL_SESSION_UNLOCK (); - } -done: - return (rv != VPPCOM_OK) ? rv : num_ev; + + if (vcm->cfg.use_mq_eventfd) + n_evts = vppcom_epoll_wait_eventfd (wrk, events, maxevents, n_evts, + wait_for_time); + else + n_evts = vppcom_epoll_wait_condvar (wrk, events, maxevents, n_evts, + wait_for_time); + + if (PREDICT_FALSE (wrk->ep_lt_current != VCL_INVALID_SESSION_INDEX)) + vcl_epoll_wait_handle_lt (wrk, events, maxevents, &n_evts); + + return n_evts; } int -vppcom_session_attr (uint32_t session_index, uint32_t op, +vppcom_session_attr (uint32_t session_handle, uint32_t op, void *buffer, uint32_t * buflen) { - session_t *session; - int rv = VPPCOM_OK; + vcl_worker_t *wrk = vcl_worker_get_current (); u32 *flags = buffer; vppcom_endpt_t *ep = buffer; + transport_endpt_attr_t tea; + vcl_session_t *session; + int rv = VPPCOM_OK; - VCL_SESSION_LOCK_AND_GET (session_index, &session); - - ASSERT (session); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; switch (op) { case VPPCOM_ATTR_GET_NREAD: - rv = vppcom_session_read_ready (session, session_index); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_NREAD: sid %u, nread = %d", - getpid (), rv); + rv = vcl_session_read_ready (session); + VDBG (2, "VPPCOM_ATTR_GET_NREAD: sh %u, nread = %d", session_handle, + rv); break; case VPPCOM_ATTR_GET_NWRITE: - rv = vppcom_session_write_ready (session, session_index); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_NWRITE: sid %u, nwrite = %d", - getpid (), session_index, rv); + rv = vcl_session_write_ready (session); + VDBG (2, "VPPCOM_ATTR_GET_NWRITE: sh %u, nwrite = %d", session_handle, + rv); break; case VPPCOM_ATTR_GET_FLAGS: if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*flags)))) { - *flags = O_RDWR | (VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_NONBLOCK)); + *flags = + O_RDWR | + (vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK) ? + O_NONBLOCK : 0); *buflen = sizeof (*flags); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_FLAGS: sid %u, flags = 0x%08x, " - "is_nonblocking = %u", getpid (), - session_index, *flags, - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); + VDBG (2, "VPPCOM_ATTR_GET_FLAGS: sh %u, flags = 0x%08x, " + "is_nonblocking = %u", session_handle, *flags, + vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK)); } else rv = VPPCOM_EINVAL; @@ -3654,14 +3428,13 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (PREDICT_TRUE (buffer && buflen && (*buflen == sizeof (*flags)))) { if (*flags & O_NONBLOCK) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK); + vcl_session_set_attr (session, VCL_SESS_ATTR_NONBLOCK); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK); + vcl_session_clear_attr (session, VCL_SESS_ATTR_NONBLOCK); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_FLAGS: sid %u, flags = 0x%08x," - " is_nonblocking = %u", - getpid (), session_index, *flags, - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); + VDBG (2, "VPPCOM_ATTR_SET_FLAGS: sh %u, flags = 0x%08x," + " is_nonblocking = %u", session_handle, *flags, + vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK)); } else rv = VPPCOM_EINVAL; @@ -3671,19 +3444,18 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*ep)) && ep->ip)) { - 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)); + 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 (ep->ip, &session->peer_addr.ip46.ip6, - sizeof (ip6_address_t)); + 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_index, ep->is_ip4, format_ip46_address, - &session->peer_addr.ip46, + VDBG (1, "VPPCOM_ATTR_GET_PEER_ADDR: sh %u, is_ip4 = %u, " + "addr = %U, port %u", session_handle, ep->is_ip4, + format_ip46_address, &session->transport.rmt_ip, ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, clib_net_to_host_u16 (ep->port)); } @@ -3695,19 +3467,36 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*ep)) && ep->ip)) { - 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)); + 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 (ep->ip, &session->lcl_addr.ip46.ip6, - sizeof (ip6_address_t)); + clib_memcpy_fast (ep->ip, &session->transport.lcl_ip.ip6, + sizeof (ip6_address_t)); + *buflen = sizeof (*ep); + VDBG (1, "VPPCOM_ATTR_GET_LCL_ADDR: sh %u, is_ip4 = %u, addr = %U" + " port %d", session_handle, ep->is_ip4, format_ip46_address, + &session->transport.lcl_ip, + ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (ep->port)); + } + else + rv = VPPCOM_EINVAL; + break; + + case VPPCOM_ATTR_SET_LCL_ADDR: + if (PREDICT_TRUE (buffer && buflen && + (*buflen >= sizeof (*ep)) && ep->ip)) + { + session->transport.is_ip4 = ep->is_ip4; + session->transport.lcl_port = ep->port; + vcl_ip_copy_from_ep (&session->transport.lcl_ip, ep); *buflen = sizeof (*ep); - VDBG (1, "VCL<%d>: VPPCOM_ATTR_GET_LCL_ADDR: sid %u, is_ip4 = %u," - " addr = %U port %d", getpid (), - session_index, ep->is_ip4, format_ip46_address, - &session->lcl_addr.ip46, + VDBG (1, "VPPCOM_ATTR_SET_LCL_ADDR: sh %u, is_ip4 = %u, addr = %U" + " port %d", session_handle, ep->is_ip4, format_ip46_address, + &session->transport.lcl_ip, ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, clib_net_to_host_u16 (ep->port)); } @@ -3717,8 +3506,7 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, case VPPCOM_ATTR_GET_LIBC_EPFD: rv = session->libc_epfd; - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d", - getpid (), rv); + VDBG (2, "VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d", rv); break; case VPPCOM_ATTR_SET_LIBC_EPFD: @@ -3728,8 +3516,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, session->libc_epfd = *(int *) buffer; *buflen = sizeof (session->libc_epfd); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd %d, " - "buflen %d", getpid (), session->libc_epfd, *buflen); + VDBG (2, "VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd %d, buflen %d", + session->libc_epfd, *buflen); } else rv = VPPCOM_EINVAL; @@ -3738,12 +3526,11 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, case VPPCOM_ATTR_GET_PROTOCOL: if (buffer && buflen && (*buflen >= sizeof (int))) { - *(int *) buffer = session->proto; + *(int *) buffer = session->session_type; *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_PROTOCOL: %d (%s), buflen %d", - getpid (), *(int *) buffer, *(int *) buffer ? "UDP" : "TCP", - *buflen); + VDBG (2, "VPPCOM_ATTR_GET_PROTOCOL: %d (%s), buflen %d", + *(int *) buffer, *(int *) buffer ? "UDP" : "TCP", *buflen); } else rv = VPPCOM_EINVAL; @@ -3752,12 +3539,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, case VPPCOM_ATTR_GET_LISTEN: if (buffer && buflen && (*buflen >= sizeof (int))) { - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_LISTEN); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_LISTEN); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LISTEN: %d, buflen %d", - getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_LISTEN: %d, buflen %d", *(int *) buffer, + *buflen); } else rv = VPPCOM_EINVAL; @@ -3769,8 +3556,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, *(int *) buffer = 0; *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_ERROR: %d, buflen %d, #VPP-TBD#", - getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_ERROR: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3782,13 +3569,14 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, /* VPP-TBD */ *(size_t *) buffer = (session->sndbuf_size ? session->sndbuf_size : - session->tx_fifo ? session->tx_fifo->nitems : + session->tx_fifo ? + svm_fifo_size (session->tx_fifo) : vcm->cfg.tx_fifo_size); *buflen = sizeof (u32); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - *(size_t *) buffer, *(size_t *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_TX_FIFO_LEN: %u (0x%x), buflen %d," + " #VPP-TBD#", *(size_t *) buffer, *(size_t *) buffer, + *buflen); } else rv = VPPCOM_EINVAL; @@ -3799,9 +3587,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ session->sndbuf_size = *(u32 *) buffer; - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - session->sndbuf_size, session->sndbuf_size, *buflen); + VDBG (2, "VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), buflen %d," + " #VPP-TBD#", session->sndbuf_size, session->sndbuf_size, + *buflen); } else rv = VPPCOM_EINVAL; @@ -3813,13 +3601,13 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, /* VPP-TBD */ *(size_t *) buffer = (session->rcvbuf_size ? session->rcvbuf_size : - session->rx_fifo ? session->rx_fifo->nitems : + session->rx_fifo ? + svm_fifo_size (session->rx_fifo) : vcm->cfg.rx_fifo_size); *buflen = sizeof (u32); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_RX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - *(size_t *) buffer, *(size_t *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_RX_FIFO_LEN: %u (0x%x), buflen %d, " + "#VPP-TBD#", *(size_t *) buffer, *(size_t *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3830,9 +3618,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ session->rcvbuf_size = *(u32 *) buffer; - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_RX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - session->sndbuf_size, session->sndbuf_size, *buflen); + VDBG (2, "VPPCOM_ATTR_SET_RX_FIFO_LEN: %u (0x%x), buflen %d," + " #VPP-TBD#", session->sndbuf_size, session->sndbuf_size, + *buflen); } else rv = VPPCOM_EINVAL; @@ -3842,12 +3630,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEADDR); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_REUSEADDR); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEADDR: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_REUSEADDR: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3855,18 +3643,17 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, case VPPCOM_ATTR_SET_REUSEADDR: if (buffer && buflen && (*buflen == sizeof (int)) && - !VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_LISTEN)) + !vcl_session_has_attr (session, VCL_SESS_ATTR_LISTEN)) { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_REUSEADDR); + vcl_session_set_attr (session, VCL_SESS_ATTR_REUSEADDR); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEADDR); + vcl_session_clear_attr (session, VCL_SESS_ATTR_REUSEADDR); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_REUSEADDR: %d, buflen %d," - " #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEADDR), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_REUSEADDR: %d, buflen %d, #VPP-TBD#", + vcl_session_has_attr (session, VCL_SESS_ATTR_REUSEADDR), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3876,12 +3663,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEPORT); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_REUSEPORT); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEPORT: %d, buflen %d," - " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_REUSEPORT: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3889,18 +3676,17 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, case VPPCOM_ATTR_SET_REUSEPORT: if (buffer && buflen && (*buflen == sizeof (int)) && - !VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_LISTEN)) + !vcl_session_has_attr (session, VCL_SESS_ATTR_LISTEN)) { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_REUSEPORT); + vcl_session_set_attr (session, VCL_SESS_ATTR_REUSEPORT); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEPORT); + vcl_session_clear_attr (session, VCL_SESS_ATTR_REUSEPORT); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_REUSEPORT: %d, buflen %d," - " #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEPORT), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_REUSEPORT: %d, buflen %d, #VPP-TBD#", + vcl_session_has_attr (session, VCL_SESS_ATTR_REUSEPORT), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3910,12 +3696,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_BROADCAST); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_BROADCAST); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_BROADCAST: %d, buflen %d," - " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_BROADCAST: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3926,14 +3712,13 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_BROADCAST); + vcl_session_set_attr (session, VCL_SESS_ATTR_BROADCAST); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_BROADCAST); + vcl_session_clear_attr (session, VCL_SESS_ATTR_BROADCAST); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_BROADCAST: %d, buflen %d, " - "#VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_BROADCAST), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_BROADCAST: %d, buflen %d, #VPP-TBD#", + vcl_session_has_attr (session, VCL_SESS_ATTR_BROADCAST), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3943,12 +3728,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_V6ONLY); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_V6ONLY); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_V6ONLY: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_V6ONLY: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3959,14 +3744,13 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_V6ONLY); + vcl_session_set_attr (session, VCL_SESS_ATTR_V6ONLY); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_V6ONLY); + vcl_session_clear_attr (session, VCL_SESS_ATTR_V6ONLY); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_V6ONLY: %d, buflen %d, " - "#VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_V6ONLY), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_V6ONLY: %d, buflen %d, #VPP-TBD#", + vcl_session_has_attr (session, VCL_SESS_ATTR_V6ONLY), + *buflen); } else rv = VPPCOM_EINVAL; @@ -3976,12 +3760,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_KEEPALIVE); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_KEEPALIVE); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_KEEPALIVE: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_KEEPALIVE: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -3992,14 +3776,13 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_KEEPALIVE); + vcl_session_set_attr (session, VCL_SESS_ATTR_KEEPALIVE); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_KEEPALIVE); + vcl_session_clear_attr (session, VCL_SESS_ATTR_KEEPALIVE); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_KEEPALIVE: %d, buflen %d, " - "#VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_KEEPALIVE), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_KEEPALIVE: %d, buflen %d, #VPP-TBD#", + vcl_session_has_attr (session, VCL_SESS_ATTR_KEEPALIVE), + *buflen); } else rv = VPPCOM_EINVAL; @@ -4009,12 +3792,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_NODELAY); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_NODELAY); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_NODELAY: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_TCP_NODELAY: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4025,14 +3808,13 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_NODELAY); + vcl_session_set_attr (session, VCL_SESS_ATTR_TCP_NODELAY); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_NODELAY); + vcl_session_clear_attr (session, VCL_SESS_ATTR_TCP_NODELAY); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_NODELAY: %d, buflen %d, " - "#VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_NODELAY), *buflen); + VDBG (2, "VPPCOM_ATTR_SET_TCP_NODELAY: %d, buflen %d, #VPP-TBD#", + vcl_session_has_attr (session, VCL_SESS_ATTR_TCP_NODELAY), + *buflen); } else rv = VPPCOM_EINVAL; @@ -4042,12 +3824,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPIDLE); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_KEEPIDLE); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4058,14 +3840,13 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE); + vcl_session_set_attr (session, VCL_SESS_ATTR_TCP_KEEPIDLE); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE); + vcl_session_clear_attr (session, 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); + VDBG (2, "VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d, buflen %d, #VPP-TBD#", + vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_KEEPIDLE), *buflen); } else rv = VPPCOM_EINVAL; @@ -4075,12 +3856,12 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPINTVL); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_KEEPINTVL); *buflen = sizeof (int); - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, buflen %d, " - "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); + VDBG (2, "VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, buflen %d, #VPP-TBD#", + *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4091,44 +3872,132 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL); + vcl_session_set_attr (session, VCL_SESS_ATTR_TCP_KEEPINTVL); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL); + vcl_session_clear_attr (session, 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); + VDBG (2, "VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d, buflen %d, #VPP-TBD#", + vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_KEEPINTVL), *buflen); } else rv = VPPCOM_EINVAL; break; case VPPCOM_ATTR_GET_TCP_USER_MSS: - if (buffer && buflen && (*buflen >= sizeof (u32))) + if (!(buffer && buflen && (*buflen >= sizeof (u32)))) { - /* VPP-TBD */ - *(u32 *) buffer = session->user_mss; - *buflen = sizeof (int); + rv = VPPCOM_EINVAL; + break; + } + + tea.type = TRANSPORT_ENDPT_ATTR_MSS; + tea.mss = *(u32 *) buffer; + if (vcl_session_transport_attr (wrk, session, 1 /* is_get */, &tea)) + rv = VPPCOM_ENOPROTOOPT; - VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_USER_MSS: %d, buflen %d," - " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); + if (!rv) + { + *(u32 *) buffer = tea.mss; + *buflen = sizeof (int); } - else - rv = VPPCOM_EINVAL; + + VDBG (2, "VPPCOM_ATTR_GET_TCP_USER_MSS: %d, buflen %d", *(int *) buffer, + *buflen); break; case VPPCOM_ATTR_SET_TCP_USER_MSS: - if (buffer && buflen && (*buflen == sizeof (u32))) + if (!(buffer && buflen && (*buflen == sizeof (u32)))) { - /* VPP-TBD */ - session->user_mss = *(u32 *) buffer; + rv = VPPCOM_EINVAL; + break; + } + + tea.type = TRANSPORT_ENDPT_ATTR_MSS; + tea.mss = *(u32 *) buffer; + if (vcl_session_transport_attr (wrk, session, 0 /* is_get */, &tea)) + rv = VPPCOM_ENOPROTOOPT; + + VDBG (2, "VPPCOM_ATTR_SET_TCP_USER_MSS: %u, buflen %d", tea.mss, + *buflen); + break; + + case VPPCOM_ATTR_SET_CONNECTED: + session->flags |= VCL_SESSION_F_CONNECTED; + break; + + case VPPCOM_ATTR_SET_CKPAIR: + if (!(buffer && buflen && (*buflen == sizeof (int))) || + !vcl_session_has_crypto (session)) + { + rv = VPPCOM_EINVAL; + break; + } + if (!session->ext_config) + { + vcl_session_alloc_ext_cfg (session, TRANSPORT_ENDPT_EXT_CFG_CRYPTO, + sizeof (transport_endpt_ext_cfg_t)); + } + else if (session->ext_config->type != TRANSPORT_ENDPT_EXT_CFG_CRYPTO) + { + rv = VPPCOM_EINVAL; + break; + } + + session->ext_config->crypto.ckpair_index = *(uint32_t *) buffer; + break; + + case VPPCOM_ATTR_SET_VRF: + if (!(buffer && buflen && (*buflen == sizeof (u32)))) + { + rv = VPPCOM_EINVAL; + break; + } + session->vrf = *(u32 *) buffer; + break; + + case VPPCOM_ATTR_GET_VRF: + if (!(buffer && buflen && (*buflen >= sizeof (u32)))) + { + rv = VPPCOM_EINVAL; + break; + } + *(u32 *) buffer = session->vrf; + *buflen = sizeof (u32); + break; - VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_USER_MSS: %u, buflen %d, " - "#VPP-TBD#", getpid (), session->user_mss, *buflen); + case VPPCOM_ATTR_GET_DOMAIN: + if (!(buffer && buflen && (*buflen >= sizeof (int)))) + { + rv = VPPCOM_EINVAL; + break; } + + if (session->transport.is_ip4) + *(int *) buffer = AF_INET; else - rv = VPPCOM_EINVAL; + *(int *) buffer = AF_INET6; + *buflen = sizeof (int); + + VDBG (2, "VPPCOM_ATTR_GET_DOMAIN: %d, buflen %u", *(int *) buffer, + *buflen); + break; + + case VPPCOM_ATTR_SET_ENDPT_EXT_CFG: + if (!(buffer && buflen && (*buflen > 0))) + { + rv = VPPCOM_EINVAL; + break; + } + if (session->ext_config) + { + rv = VPPCOM_EINVAL; + break; + } + vcl_session_alloc_ext_cfg (session, TRANSPORT_ENDPT_EXT_CFG_NONE, + *buflen + sizeof (u32)); + clib_memcpy (session->ext_config->data, buffer, *buflen); + session->ext_config->len = *buflen; break; default: @@ -4136,115 +4005,136 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, break; } -done: - VCL_SESSION_UNLOCK (); return rv; } int -vppcom_session_recvfrom (uint32_t session_index, void *buffer, +vppcom_session_recvfrom (uint32_t session_handle, void *buffer, uint32_t buflen, int flags, vppcom_endpt_t * ep) { + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; int rv = VPPCOM_OK; - session_t *session = 0; - - if (ep) - { - VCL_SESSION_LOCK (); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - VCL_SESSION_UNLOCK (); - VDBG (0, "VCL<%d>: invalid session, sid (%u) has been closed!", - getpid (), session_index); - rv = VPPCOM_EBADFD; - VCL_SESSION_UNLOCK (); - goto done; - } - 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)); - VCL_SESSION_UNLOCK (); - } if (flags == 0) - rv = vppcom_session_read (session_index, buffer, buflen); + rv = vppcom_session_read (session_handle, buffer, buflen); else if (flags & MSG_PEEK) - rv = vppcom_session_peek (session_index, buffer, buflen); + rv = vppcom_session_peek (session_handle, buffer, buflen); else { - clib_warning ("VCL<%d>: Unsupport flags for recvfrom %d", - getpid (), flags); - rv = VPPCOM_EAFNOSUPPORT; + VDBG (0, "Unsupport flags for recvfrom %d", flags); + return VPPCOM_EAFNOSUPPORT; + } + + if (ep && rv > 0) + { + session = vcl_session_get_w_handle (wrk, session_handle); + if (session->transport.is_ip4) + clib_memcpy_fast (ep->ip, &session->transport.rmt_ip.ip4, + sizeof (ip4_address_t)); + else + clib_memcpy_fast (ep->ip, &session->transport.rmt_ip.ip6, + sizeof (ip6_address_t)); + ep->is_ip4 = session->transport.is_ip4; + ep->port = session->transport.rmt_port; } -done: return rv; } int -vppcom_session_sendto (uint32_t session_index, void *buffer, +vppcom_session_sendto (uint32_t session_handle, void *buffer, uint32_t buflen, int flags, vppcom_endpt_t * ep) { - if (!buffer) - return VPPCOM_EINVAL; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s)) + return VPPCOM_EBADFD; if (ep) { - // TBD - return VPPCOM_EINVAL; + if (!vcl_session_is_cl (s)) + return VPPCOM_EINVAL; + + /* Session not connected/bound in vpp. Create it by 'connecting' it */ + if (PREDICT_FALSE (s->session_state == VCL_STATE_CLOSED)) + { + u32 session_index = s->session_index; + f64 timeout = vcm->cfg.session_timeout; + int rv; + + vcl_send_session_connect (wrk, s); + rv = vppcom_wait_for_session_state_change (session_index, + VCL_STATE_READY, + timeout); + if (rv < 0) + return rv; + s = vcl_session_get (wrk, session_index); + } + + s->transport.is_ip4 = ep->is_ip4; + s->transport.rmt_port = ep->port; + vcl_ip_copy_from_ep (&s->transport.rmt_ip, ep); } if (flags) { // TBD check the flags and do the right thing - VDBG (2, "VCL<%d>: handling flags 0x%u (%d) not implemented yet.", - getpid (), flags, flags); + VDBG (2, "handling flags 0x%u (%d) not implemented yet.", flags, flags); } - return (vppcom_session_write (session_index, buffer, buflen)); + return (vppcom_session_write_inline (wrk, s, buffer, buflen, 1, + s->is_dgram ? 1 : 0)); } int vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) { - 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; 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); + VDBG (3, "vp %p, nsids %u, wait_for_time %f", vp, n_sids, wait_for_time); if (!vp) return VPPCOM_EFAULT; do { - session_t *session; + vcl_session_t *session; - for (i = 0; i < n_sids; i++) + /* Dequeue all events and drop all unhandled io events */ + while (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_NOWAIT, 0) == 0) { - ASSERT (vp[i].revents); + 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); - VCL_SESSION_LOCK_AND_GET (vp[i].sid, &session); - VCL_SESSION_UNLOCK (); + for (i = 0; i < n_sids; i++) + { + session = vcl_session_get (wrk, vp[i].sh); + if (!session) + { + vp[i].revents = POLLHUP; + num_ev++; + continue; + } - if (*vp[i].revents) - *vp[i].revents = 0; + vp[i].revents = 0; if (POLLIN & vp[i].events) { - VCL_SESSION_LOCK_AND_GET (vp[i].sid, &session); - rv = vppcom_session_read_ready (session, vp[i].sid); - VCL_SESSION_UNLOCK (); + rv = vcl_session_read_ready (session); if (rv > 0) { - *vp[i].revents |= POLLIN; + vp[i].revents |= POLLIN; num_ev++; } else if (rv < 0) @@ -4252,11 +4142,11 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) switch (rv) { case VPPCOM_ECONNRESET: - *vp[i].revents = POLLHUP; + vp[i].revents = POLLHUP; break; default: - *vp[i].revents = POLLERR; + vp[i].revents = POLLERR; break; } num_ev++; @@ -4265,12 +4155,10 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) if (POLLOUT & vp[i].events) { - VCL_SESSION_LOCK_AND_GET (vp[i].sid, &session); - rv = vppcom_session_write_ready (session, vp[i].sid); - VCL_SESSION_UNLOCK (); + rv = vcl_session_write_ready (session); if (rv > 0) { - *vp[i].revents |= POLLOUT; + vp[i].revents |= POLLOUT; num_ev++; } else if (rv < 0) @@ -4278,11 +4166,11 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) switch (rv) { case VPPCOM_ECONNRESET: - *vp[i].revents = POLLHUP; + vp[i].revents = POLLHUP; break; default: - *vp[i].revents = POLLERR; + vp[i].revents = POLLERR; break; } num_ev++; @@ -4291,291 +4179,229 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) if (0) // Note "done:" label used by VCL_SESSION_LOCK_AND_GET() { - done: - *vp[i].revents = POLLNVAL; + vp[i].revents = POLLNVAL; num_ev++; } } if (wait_for_time != -1) - keep_trying = (clib_time_now (&vcm->clib_time) <= timeout) ? 1 : 0; + keep_trying = (clib_time_now (&wrk->clib_time) <= timeout) ? 1 : 0; } while ((num_ev == 0) && keep_trying); - if (VPPCOM_DEBUG > 3) - { - clib_warning ("VCL<%d>: returning %d", getpid (), num_ev); - for (i = 0; i < n_sids; i++) - { - clib_warning ("VCL<%d>: vp[%d].sid %d (0x%x), .events 0x%x, " - ".revents 0x%x", getpid (), i, vp[i].sid, vp[i].sid, - vp[i].events, *vp[i].revents); - } - } return num_ev; } -/* - * VPPCOM Event Functions - */ +int +vppcom_mq_epoll_fd (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + return wrk->mqs_epfd; +} -void * -vppcom_session_io_thread_fn (void *arg) +int +vppcom_session_index (vcl_session_handle_t session_handle) { - vppcom_session_io_thread_t *evt = (vppcom_session_io_thread_t *) arg; - u32 *session_indexes = 0, *session_index; - int i, rv; - u32 bytes = 0; - session_t *session; + return session_handle & 0xFFFFFF; +} - while (1) - { - vec_reset_length (session_indexes); - VCE_IO_SESSIONS_LOCK (); - pool_foreach (session_index, evt->active_session_indexes, ( - { - vec_add1 - (session_indexes, - *session_index); - } - )); - VCE_IO_SESSIONS_UNLOCK (); - if (session_indexes) - { - for (i = 0; i < vec_len (session_indexes); ++i) - { - VCL_SESSION_LOCK_AND_GET (session_indexes[i], &session); - bytes = svm_fifo_max_dequeue (session->rx_fifo); - VCL_SESSION_UNLOCK (); +int +vppcom_session_worker (vcl_session_handle_t session_handle) +{ + return session_handle >> 24; +} - if (bytes) - { - vppcom_ioevent_t *eio; - vce_event_t *ev; - u32 ev_idx; +int +vppcom_worker_register (void) +{ + if (!vcl_worker_alloc_and_init ()) + return VPPCOM_EEXIST; - VCL_EVENTS_LOCK (); + if (vcl_worker_register_with_vpp ()) + return VPPCOM_EEXIST; - pool_get (vcm->event_thread.vce_events, ev); - ev_idx = (u32) (ev - vcm->event_thread.vce_events); - eio = vce_get_event_data (ev, sizeof (*eio)); - ev->evk.eid = VCL_EVENT_IOEVENT_RX_FIFO; - ev->evk.session_index = session_indexes[i]; - eio->bytes = bytes; - eio->session_index = session_indexes[i]; + return VPPCOM_OK; +} - VCL_EVENTS_UNLOCK (); +void +vppcom_worker_unregister (void) +{ + vcl_worker_cleanup (vcl_worker_get_current (), 1 /* notify vpp */ ); + vcl_set_worker_index (~0); +} - rv = vce_generate_event (&vcm->event_thread, ev_idx); - } - } - } - struct timespec ts; - ts.tv_sec = 0; - ts.tv_nsec = 1000000; /* 1 millisecond */ - nanosleep (&ts, NULL); - } -done: - VCL_SESSION_UNLOCK (); - return NULL; +void +vppcom_worker_index_set (int index) +{ + vcl_set_worker_index (index); } int -vppcom_start_io_event_thread (vppcom_session_io_thread_t * evt, - u8 max_sessions) +vppcom_worker_index (void) { - pthread_cond_init (&(evt->vce_io_cond), NULL); - pthread_mutex_init (&(evt->vce_io_lock), NULL); + return vcl_get_worker_index (); +} - clib_spinlock_init (&(evt->io_sessions_lockp)); +int +vppcom_worker_mqs_epfd (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + if (!vcm->cfg.use_mq_eventfd) + return -1; + return wrk->mqs_epfd; +} - return pthread_create (&(evt->thread), NULL /* attr */ , - vppcom_session_io_thread_fn, evt); +int +vppcom_session_is_connectable_listener (uint32_t session_handle) +{ + vcl_session_t *session; + vcl_worker_t *wrk = vcl_worker_get_current (); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + return vcl_session_is_connectable_listener (wrk, session); } -void -vce_registered_ioevent_handler_fn (void *arg) +int +vppcom_session_listener (uint32_t session_handle) { - vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; - vppcom_ioevent_t *eio; - vce_event_t *ev; - u32 ioevt_ndx = (u64) (reg->handler_fn_args); - vppcom_session_ioevent_t *ioevent, ioevent_; - - VCL_EVENTS_LOCK (); - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); - eio = vce_get_event_data (ev, sizeof (*eio)); - VCL_EVENTS_UNLOCK (); - - VCL_IO_SESSIONS_LOCK (); - ioevent = pool_elt_at_index (vcm->session_io_thread.ioevents, ioevt_ndx); - ioevent_ = *ioevent; - VCL_IO_SESSIONS_UNLOCK (); - (ioevent_.user_cb) (eio, ioevent_.user_cb_data); - vce_clear_event (&vcm->event_thread, reg->ev_idx); - return; - - /*TODO - Unregister check in close for this listener */ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *listen_session, *session; + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + if (session->listener_index == VCL_INVALID_SESSION_INDEX) + return VPPCOM_EBADFD; + listen_session = vcl_session_get_w_handle (wrk, session->listener_index); + if (!listen_session) + return VPPCOM_EBADFD; + return vcl_session_handle (listen_session); +} +int +vppcom_session_n_accepted (uint32_t session_handle) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + return session->n_accepted_sessions; } -void -vce_registered_listener_connect_handler_fn (void *arg) +const char * +vppcom_proto_str (vppcom_proto_t proto) { - vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; - vce_event_connect_request_t *ecr; - vce_event_t *ev; - vppcom_endpt_t ep; + char const *proto_str; - session_t *new_session; - int rv; + switch (proto) + { + case VPPCOM_PROTO_TCP: + proto_str = "TCP"; + break; + case VPPCOM_PROTO_UDP: + proto_str = "UDP"; + break; + case VPPCOM_PROTO_TLS: + proto_str = "TLS"; + break; + case VPPCOM_PROTO_QUIC: + proto_str = "QUIC"; + break; + case VPPCOM_PROTO_DTLS: + proto_str = "DTLS"; + break; + case VPPCOM_PROTO_SRTP: + proto_str = "SRTP"; + break; + default: + proto_str = "UNKNOWN"; + break; + } + return proto_str; +} - vppcom_session_listener_t *session_listener = - (vppcom_session_listener_t *) reg->handler_fn_args; +const char * +vppcom_retval_str (int retval) +{ + char const *st; - VCL_EVENTS_LOCK (); - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); - ecr = vce_get_event_data (ev, sizeof (*ecr)); - VCL_EVENTS_UNLOCK (); - VCL_SESSION_LOCK_AND_GET (ecr->accepted_session_index, &new_session); + switch (retval) + { + case VPPCOM_OK: + st = "VPPCOM_OK"; + break; - ep.is_ip4 = new_session->peer_addr.is_ip4; - ep.port = new_session->peer_port; - if (new_session->peer_addr.is_ip4) - clib_memcpy (&ep.ip, &new_session->peer_addr.ip46.ip4, - sizeof (ip4_address_t)); - else - clib_memcpy (&ep.ip, &new_session->peer_addr.ip46.ip6, - sizeof (ip6_address_t)); + case VPPCOM_EAGAIN: + st = "VPPCOM_EAGAIN"; + break; - vppcom_send_accept_session_reply (new_session->vpp_handle, - new_session->client_context, - 0 /* retval OK */ ); - VCL_SESSION_UNLOCK (); + case VPPCOM_EFAULT: + st = "VPPCOM_EFAULT"; + break; - (session_listener->user_cb) (ecr->accepted_session_index, &ep, - session_listener->user_cb_data); + case VPPCOM_ENOMEM: + st = "VPPCOM_ENOMEM"; + break; - if (vcm->session_io_thread.io_sessions_lockp) - { - /* Throw this new accepted session index into the rx poll thread pool */ - VCL_IO_SESSIONS_LOCK (); - u32 *active_session_index; - pool_get (vcm->session_io_thread.active_session_indexes, - active_session_index); - *active_session_index = ecr->accepted_session_index; - VCL_IO_SESSIONS_UNLOCK (); - } + case VPPCOM_EINVAL: + st = "VPPCOM_EINVAL"; + break; - /*TODO - Unregister check in close for this listener */ - return; + case VPPCOM_EBADFD: + st = "VPPCOM_EBADFD"; + break; -done: - ASSERT (0); // If we can't get a lock or accepted session fails, lets blow up. -} + case VPPCOM_EAFNOSUPPORT: + st = "VPPCOM_EAFNOSUPPORT"; + break; -/** - * @brief vce_poll_wait_connect_request_handler_fn - * - used by vppcom_epoll_xxxx() for listener sessions - * - when a vl_api_accept_session_t_handler() generates an event - * this callback is alerted and sets the fields that vppcom_epoll_wait() - * expects to see. - * - * @param arg - void* to be cast to vce_event_handler_reg_t* - */ -void -vce_poll_wait_connect_request_handler_fn (void *arg) -{ - vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; - vce_event_t *ev; - /* Retrieve the VCL_EVENT_CONNECT_REQ_ACCEPTED event */ - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); - vce_event_connect_request_t *ecr = vce_get_event_data (ev, sizeof (*ecr)); - - /* Add the accepted_session_index to the FIFO */ - VCL_ACCEPT_FIFO_LOCK (); - clib_fifo_add1 (vcm->client_session_index_fifo, - ecr->accepted_session_index); - VCL_ACCEPT_FIFO_UNLOCK (); - - /* Recycling the event. */ - VCL_EVENTS_LOCK (); - ev->recycle = 1; - clib_fifo_add1 (vcm->event_thread.event_index_fifo, reg->ev_idx); - VCL_EVENTS_UNLOCK (); -} + case VPPCOM_ECONNABORTED: + st = "VPPCOM_ECONNABORTED"; + break; -int -vppcom_session_register_ioevent_cb (uint32_t session_index, - vppcom_session_ioevent_cb cb, - uint8_t rx, void *ptr) -{ - int rv = VPPCOM_OK; - vce_event_key_t evk; - vppcom_session_ioevent_t *ioevent; + case VPPCOM_ECONNRESET: + st = "VPPCOM_ECONNRESET"; + break; - if (!vcm->session_io_thread.io_sessions_lockp) - rv = vppcom_start_io_event_thread (&vcm->session_io_thread, 100 /* DAW_TODO: ??? hard-coded value */ - ); + case VPPCOM_ENOTCONN: + st = "VPPCOM_ENOTCONN"; + break; - if (rv == VPPCOM_OK) - { - void *io_evt_ndx; - - /* Register handler for ioevent on session_index */ - VCL_IO_SESSIONS_LOCK (); - pool_get (vcm->session_io_thread.ioevents, ioevent); - io_evt_ndx = (void *) (ioevent - vcm->session_io_thread.ioevents); - ioevent->user_cb = cb; - ioevent->user_cb_data = ptr; - VCL_IO_SESSIONS_UNLOCK (); - - evk.session_index = session_index; - evk.eid = rx ? VCL_EVENT_IOEVENT_RX_FIFO : VCL_EVENT_IOEVENT_TX_FIFO; - - (void) vce_register_handler (&vcm->event_thread, &evk, - vce_registered_ioevent_handler_fn, - io_evt_ndx); + case VPPCOM_ECONNREFUSED: + st = "VPPCOM_ECONNREFUSED"; + break; + + case VPPCOM_ETIMEDOUT: + st = "VPPCOM_ETIMEDOUT"; + break; + + default: + st = "UNKNOWN_STATE"; + break; } - return rv; + + return st; } int -vppcom_session_register_listener (uint32_t session_index, - vppcom_session_listener_cb cb, - vppcom_session_listener_errcb - errcb, uint8_t flags, int q_len, void *ptr) +vppcom_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair) { - int rv = VPPCOM_OK; - vce_event_key_t evk; - vppcom_session_listener_t *listener_args; - - if (!vcm->session_io_thread.io_sessions_lockp) - rv = vppcom_start_io_event_thread (&vcm->session_io_thread, 100 /* DAW_TODO: ??? hard-coded value */ - ); - if (rv) + if (vcm->cfg.vpp_app_socket_api) { - goto done; + clib_warning ("not supported"); + return VPPCOM_EINVAL; } - rv = vppcom_session_listen (session_index, q_len); - if (rv) + return vcl_bapi_add_cert_key_pair (ckpair); +} + +int +vppcom_del_cert_key_pair (uint32_t ckpair_index) +{ + if (vcm->cfg.vpp_app_socket_api) { - goto done; + clib_warning ("not supported"); + return VPPCOM_EINVAL; } - - /* Register handler for connect_request event on listen_session_index */ - listener_args = clib_mem_alloc (sizeof (vppcom_session_listener_t)); // DAW_TODO: Use a pool instead of thrashing the memory allocator! - listener_args->user_cb = cb; - listener_args->user_cb_data = ptr; - listener_args->user_errcb = errcb; - - evk.session_index = session_index; - evk.eid = VCL_EVENT_CONNECT_REQ_ACCEPTED; - (void) vce_register_handler (&vcm->event_thread, &evk, - vce_registered_listener_connect_handler_fn, - listener_args); - -done: - return rv; + return vcl_bapi_del_cert_key_pair (ckpair_index); } /*