X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=f20167226e8c23a9b68475cf3da620090a2882aa;hp=e8366d70566452e57a0b7bcf42b2e09010ce8d4d;hb=c1f5a43;hpb=e535644dd3066eb843c7b0056a7f6346a36e702a diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index e8366d70566..f20167226e8 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -15,309 +15,56 @@ #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; - -#define SERVER_STATE_OPEN (STATE_ACCEPT|STATE_CLOSE_ON_EMPTY) -#define CLIENT_STATE_OPEN (STATE_CONNECT|STATE_CLOSE_ON_EMPTY) - -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; +#include +#include - 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; - -/* VPPCOM Event typedefs */ -typedef enum vcl_event_id_ -{ - VCL_EVENT_INVALID_EVENT, - VCL_EVENT_CONNECT_REQ_ACCEPTED, - VCL_EVENT_N_EVENTS -} vcl_event_id_t; +__thread uword __vcl_worker_index = ~0; -typedef struct vce_event_connect_request_ -{ - u32 accepted_session_index; -} vce_event_connect_request_t; - -typedef struct vppcom_session_listener -{ - vppcom_session_listener_cb user_cb; - vppcom_session_listener_errcb user_errcb; - void *user_cb_data; -} vppcom_session_listener_t; +static u8 not_ready; -typedef struct vppcom_main_t_ +void +sigsegv_signal (int signum) { - 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; - - /* VPP Event-logger */ - elog_main_t elog_main; - elog_track_t elog_track; - - /* VNET_API_ERROR_FOO -> "Foo" hash table */ - uword *error_string_by_error_number; -} vppcom_main_t; + not_ready = 1; +} -/* 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_LOCK_AND_GET_SESSION(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) - -static const char * -vppcom_app_state_str (app_state_t state) +static void +vcl_wait_for_memory (void *mem) { - char *st; - - switch (state) + u8 __clib_unused test; + if (vcm->mounting_segment) { - case STATE_APP_START: - st = "STATE_APP_START"; - break; - - case STATE_APP_CONN_VPP: - st = "STATE_APP_CONN_VPP"; - break; - - case STATE_APP_ENABLED: - st = "STATE_APP_ENABLED"; - break; - - case STATE_APP_ATTACHED: - st = "STATE_APP_ATTACHED"; - break; + while (vcm->mounting_segment) + ; + return; + } + if (1 || vcm->debug) + { + usleep (1e5); + return; + } + if (signal (SIGSEGV, sigsegv_signal)) + { + perror ("signal()"); + return; + } + not_ready = 0; - default: - st = "UNKNOWN_APP_STATE"; - break; +again: + test = *(u8 *) mem; + if (not_ready) + { + not_ready = 0; + usleep (1); + goto again; } - return st; + signal (SIGSEGV, SIG_DFL); } -static const char * +const char * vppcom_session_state_str (session_state_t state) { char *st; @@ -360,1795 +107,631 @@ vppcom_session_state_str (session_state_t state) return st; } - -/* - * VPPCOM Utility Functions - */ -static inline int -vppcom_session_at_index (u32 session_index, session_t * volatile *sess) -{ - /* 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; -} - -static inline void -vppcom_session_table_add_listener (u64 listener_handle, u32 value) +u8 * +format_ip4_address (u8 * s, va_list * args) { - /* 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); + u8 *a = va_arg (*args, u8 *); + return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]); } -static inline session_t * -vppcom_session_table_lookup_listener (u64 listener_handle) +u8 * +format_ip6_address (u8 * s, va_list * args) { - uword *p; - u64 handle = listener_handle | (1ULL << 63); - session_t *session; + 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; - p = hash_get (vcm->session_index_by_vpp_handles, handle); - if (!p) + i_max_n_zero = ARRAY_LEN (a->as_u16); + max_n_zeros = 0; + i_first_zero = i_max_n_zero; + n_zeros = 0; + for (i = 0; i < ARRAY_LEN (a->as_u16); i++) { - clib_warning ("VCL<%d>: couldn't find listen session: unknown vpp " - "listener handle %llx", getpid (), listener_handle); - return 0; + 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; + } } - if (pool_is_free_index (vcm->sessions, p[0])) + + last_double_colon = 0; + for (i = 0; i < ARRAY_LEN (a->as_u16); i++) { - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: invalid listen session, sid (%u)", - getpid (), p[0]); - return 0; + 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; + } } - session = pool_elt_at_index (vcm->sessions, p[0]); - ASSERT (session->state & STATE_LISTEN); - return session; + return s; } -static inline void -vppcom_session_table_del_listener (u64 listener_handle) +/* Format an IP46 address. */ +u8 * +format_ip46_address (u8 * s, va_list * args) { - listener_handle |= 1ULL << 63; - hash_unset (vcm->session_index_by_vpp_handles, listener_handle); -} + ip46_address_t *ip46 = va_arg (*args, ip46_address_t *); + ip46_type_t type = va_arg (*args, ip46_type_t); + int is_ip4 = 1; -static void -write_elog (void) -{ - elog_main_t *em = &vcm->elog_main; - char *chroot_file; - clib_error_t *error = 0; - - chroot_file = - (char *) format (0, "%s/%d-%d-vcl-elog%c", vcm->cfg.event_log_path, - vcm->my_client_index, getpid (), 0); - error = elog_write_file (em, chroot_file, 1 /* flush ring */ ); - if (error) + switch (type) { - clib_error_report (error); + 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 (VPPCOM_DEBUG > 0) - clib_warning ("[%d] Event Log:'%s' ", getpid (), chroot_file); - -} - -static inline void -vppcom_send_accept_session_reply (u64 handle, u32 context, int retval) -{ - vl_api_accept_session_reply_t *rmp; - 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); + return is_ip4 ? + format (s, "%U", format_ip4_address, &ip46->ip4) : + format (s, "%U", format_ip6_address, &ip46->ip6); } /* - * VPPCOM Event Functions + * VPPCOM Utility Functions */ -void -vce_registered_listener_connect_handler_fn (void *arg) -{ - 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; - - session_t *new_session; - int rv; - - vppcom_session_listener_t *session_listener = - (vppcom_session_listener_t *) reg->handler_fn_args; - - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); - - ecr = (vce_event_connect_request_t *) ev->data; - VCL_LOCK_AND_GET_SESSION (ecr->accepted_session_index, &new_session); - - 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)); +static svm_msg_q_t * +vcl_session_vpp_evt_q (vcl_worker_t * wrk, vcl_session_t * s) +{ + if (vcl_session_is_ct (s)) + return wrk->vpp_event_queues[0]; else - clib_memcpy (&ep.ip, &new_session->peer_addr.ip46.ip6, - sizeof (ip6_address_t)); - - vppcom_send_accept_session_reply (new_session->vpp_handle, - new_session->client_context, - 0 /* retval OK */ ); - clib_spinlock_unlock (&vcm->sessions_lockp); - - (session_listener->user_cb) (ecr->accepted_session_index, &ep, - session_listener->user_cb_data); - - /*TODO - Unregister check in close for this listener */ - - return; - -done: - ASSERT (0); // If we can't get a lock or accepted session fails, lets blow up. + return wrk->vpp_event_queues[s->tx_fifo->master_thread_index]; } -/** - * * @brief vce_connect_request_handler_fn - * - used for listener sessions - * - when a vl_api_accept_session_t_handler() generates an event - * this callback is alerted and sets fields that consumers such as - * vppcom_session_accept() expect to see, ie. accepted_client_index - * - * @param arg - void* to be cast to vce_event_handler_reg_t* - */ -void -vce_connect_request_handler_fn (void *arg) +static void +vcl_send_session_accepted_reply (svm_msg_q_t * mq, u32 context, + session_handle_t handle, int retval) { - vce_event_handler_reg_t *reg = (vce_event_handler_reg_t *) arg; + 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); +} - pthread_mutex_lock (®->handler_lock); - pthread_cond_signal (®->handler_cond); - pthread_mutex_unlock (®->handler_lock); +static void +vcl_send_session_disconnected_reply (svm_msg_q_t * mq, u32 context, + session_handle_t handle, int retval) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_disconnected_reply_msg_t *rmp; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, + SESSION_CTRL_EVT_DISCONNECTED_REPLY); + rmp = (session_disconnected_reply_msg_t *) app_evt->evt->data; + rmp->handle = handle; + rmp->context = context; + rmp->retval = retval; + app_send_ctrl_evt_to_vpp (mq, app_evt); } -/** - * @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) +static void +vcl_send_session_reset_reply (svm_msg_q_t * mq, u32 context, + session_handle_t handle, int retval) { - 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_event_connect_request_t *) ev->data; - - /* Add the accepted_session_index to the FIFO */ - clib_spinlock_lock (&vcm->session_fifo_lockp); - clib_fifo_add1 (vcm->client_session_index_fifo, - ecr->accepted_session_index); - clib_spinlock_unlock (&vcm->session_fifo_lockp); - - /* Recycling the event. */ - clib_spinlock_lock (&(vcm->event_thread.events_lockp)); - vcm->event_thread.recycle_event = 1; - clib_fifo_add1 (vcm->event_thread.event_index_fifo, reg->ev_idx); - clib_spinlock_unlock (&(vcm->event_thread.events_lockp)); + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_reset_reply_msg_t *rmp; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_RESET_REPLY); + rmp = (session_reset_reply_msg_t *) app_evt->evt->data; + rmp->handle = handle; + rmp->context = context; + rmp->retval = retval; + app_send_ctrl_evt_to_vpp (mq, app_evt); } -static int -vppcom_connect_to_vpp (char *app_name) +static u32 +vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp) { - api_main_t *am = &api_main; - vppcom_cfg_t *vcl_cfg = &vcm->cfg; - int rv = VPPCOM_OK; - - if (!vcl_cfg->vpp_api_filename) - vcl_cfg->vpp_api_filename = format (0, "/vpe-api%c", 0); + vcl_session_t *session, *listen_session; + svm_fifo_t *rx_fifo, *tx_fifo; + u32 vpp_wrk_index; + svm_msg_q_t *evt_q; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: app (%s) connecting to VPP api (%s)...", - getpid (), app_name, vcl_cfg->vpp_api_filename); + session = vcl_session_alloc (wrk); - if (vl_client_connect_to_vlib ((char *) vcl_cfg->vpp_api_filename, app_name, - vcm->cfg.vpp_api_q_length) < 0) + listen_session = vcl_session_table_lookup_listener (wrk, + mp->listener_handle); + if (!listen_session) { - clib_warning ("VCL<%d>: app (%s) connect failed!", getpid (), app_name); - rv = VPPCOM_ECONNREFUSED; + svm_msg_q_t *evt_q; + evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); + clib_warning ("VCL<%d>: ERROR: couldn't find listen session: " + "unknown vpp listener handle %llx", + getpid (), mp->listener_handle); + vcl_send_session_accepted_reply (evt_q, mp->context, mp->handle, + VNET_API_ERROR_INVALID_ARGUMENT); + vcl_session_free (wrk, session); + return VCL_INVALID_SESSION_INDEX; + } + + rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); + tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); + + if (mp->server_event_queue_address) + { + session->vpp_evt_q = uword_to_pointer (mp->client_event_queue_address, + svm_msg_q_t *); + session->our_evt_q = uword_to_pointer (mp->server_event_queue_address, + svm_msg_q_t *); + vcl_wait_for_memory (session->vpp_evt_q); + rx_fifo->master_session_index = session->session_index; + tx_fifo->master_session_index = session->session_index; + rx_fifo->master_thread_index = vcl_get_worker_index (); + tx_fifo->master_thread_index = vcl_get_worker_index (); + vec_validate (wrk->vpp_event_queues, 0); + evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); + wrk->vpp_event_queues[0] = evt_q; } else { - 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; - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: app (%s) is connected to VPP!", - getpid (), app_name); + session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, + svm_msg_q_t *); + rx_fifo->client_session_index = session->session_index; + tx_fifo->client_session_index = session->session_index; + rx_fifo->client_thread_index = vcl_get_worker_index (); + tx_fifo->client_thread_index = vcl_get_worker_index (); + vpp_wrk_index = tx_fifo->master_thread_index; + vec_validate (wrk->vpp_event_queues, vpp_wrk_index); + wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; } - if (VPPCOM_DEBUG > 0) - { - vcm->elog_main.lock = - clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES); - vcm->elog_main.lock[0] = 0; - vcm->elog_main.event_ring_size = vcm->cfg.event_ring_size; - elog_init (&vcm->elog_main, vcm->elog_main.event_ring_size); - elog_enable_disable (&vcm->elog_main, 1); - - vcm->elog_track.name = - (char *) format (0, "P:%d:C:%d%c", getpid (), - vcm->my_client_index, 0); - elog_track_register (&vcm->elog_main, &vcm->elog_track); + session->vpp_handle = mp->handle; + session->client_context = mp->context; + session->rx_fifo = rx_fifo; + session->tx_fifo = tx_fifo; - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "connect_vpp:rv:%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track); - ed->data = (u32) rv; - /* *INDENT-ON* */ - } - return rv; -} + session->session_state = STATE_ACCEPT; + session->transport.rmt_port = mp->port; + session->transport.is_ip4 = mp->is_ip4; + clib_memcpy_fast (&session->transport.rmt_ip, mp->ip, + sizeof (ip46_address_t)); -static u8 * -format_api_error (u8 * s, va_list * args) -{ - i32 error = va_arg (*args, u32); - uword *p; + vcl_session_table_add_vpp_handle (wrk, mp->handle, session->session_index); + session->transport.lcl_port = listen_session->transport.lcl_port; + session->transport.lcl_ip = listen_session->transport.lcl_ip; + session->session_type = listen_session->session_type; + session->is_dgram = session->session_type == VPPCOM_PROTO_UDP; - p = hash_get (vcm->error_string_by_error_number, -error); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: client accept request from %s" + " address %U port %d queue %p!", getpid (), mp->handle, + session->session_index, + mp->is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &mp->ip, + mp->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (mp->port), session->vpp_evt_q); + vcl_evt (VCL_EVT_ACCEPT, session, listen_session, session_index); - if (p) - s = format (s, "%s (%d)", p[0], error); - else - s = format (s, "%d", error); - return s; + return session->session_index; } -static void -vppcom_init_error_string_table (void) +static u32 +vcl_session_connected_handler (vcl_worker_t * wrk, + session_connected_msg_t * mp) { - vcm->error_string_by_error_number = hash_create (0, sizeof (uword)); + u32 session_index, vpp_wrk_index; + svm_fifo_t *rx_fifo, *tx_fifo; + vcl_session_t *session = 0; + svm_msg_q_t *evt_q; -#define _(n, v, s) hash_set (vcm->error_string_by_error_number, -v, s); - foreach_vnet_api_error; -#undef _ + session_index = mp->context; + session = vcl_session_get (wrk, session_index); + if (!session) + { + clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: " + "Invalid session index (%u)!", + getpid (), mp->handle, session_index); + return VCL_INVALID_SESSION_INDEX; + } + if (mp->retval) + { + clib_warning ("VCL<%d>: ERROR: sid %u: connect failed! %U", getpid (), + session_index, format_api_error, ntohl (mp->retval)); + session->session_state = STATE_FAILED; + session->vpp_handle = mp->handle; + return session_index; + } - hash_set (vcm->error_string_by_error_number, 99, "Misc"); -} + rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); + tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); + vcl_wait_for_memory (rx_fifo); + rx_fifo->client_session_index = session_index; + tx_fifo->client_session_index = session_index; + rx_fifo->client_thread_index = vcl_get_worker_index (); + tx_fifo->client_thread_index = vcl_get_worker_index (); -static inline int -vppcom_wait_for_app_state_change (app_state_t app_state) -{ - f64 timeout = clib_time_now (&vcm->clib_time) + vcm->cfg.app_timeout; + if (mp->client_event_queue_address) + { + session->vpp_evt_q = uword_to_pointer (mp->server_event_queue_address, + svm_msg_q_t *); + session->our_evt_q = uword_to_pointer (mp->client_event_queue_address, + svm_msg_q_t *); - while (clib_time_now (&vcm->clib_time) < timeout) + vec_validate (wrk->vpp_event_queues, 0); + evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); + wrk->vpp_event_queues[0] = evt_q; + } + else { - if (vcm->app_state == app_state) - return VPPCOM_OK; + session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, + svm_msg_q_t *); + vpp_wrk_index = tx_fifo->master_thread_index; + vec_validate (wrk->vpp_event_queues, vpp_wrk_index); + wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; } - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: timeout waiting for state %s (%d)", getpid (), - vppcom_app_state_str (app_state), app_state); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "ERR: timeout state:%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; + session->rx_fifo = rx_fifo; + session->tx_fifo = tx_fifo; + session->vpp_handle = mp->handle; + session->transport.is_ip4 = mp->is_ip4; + clib_memcpy_fast (&session->transport.lcl_ip, mp->lcl_ip, + sizeof (session->transport.lcl_ip)); + session->transport.lcl_port = mp->lcl_port; + session->session_state = STATE_CONNECT; - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track); + /* Add it to lookup table */ + hash_set (wrk->session_index_by_vpp_handles, mp->handle, session_index); - ed->data = app_state; - /* *INDENT-ON* */ - } + 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); - return VPPCOM_ETIMEDOUT; + return 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_reset_handler (vcl_worker_t * wrk, + session_reset_msg_t * reset_msg) { - f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time; - session_t *volatile session; - int rv; + vcl_session_t *session; + u32 sid; - do + sid = vcl_session_index_from_vpp_handle (wrk, reset_msg->handle); + session = vcl_session_get (wrk, sid); + if (!session) { - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - return rv; - } - if (session->state & state) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - return VPPCOM_OK; - } - if (session->state & STATE_FAILED) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - return VPPCOM_ECONNREFUSED; - } - - clib_spinlock_unlock (&vcm->sessions_lockp); - } - while (clib_time_now (&vcm->clib_time) < timeout); - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: timeout waiting for state 0x%x (%s)", getpid (), - state, vppcom_session_state_str (state)); - - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "ERR: timeout state:%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->data = state; - /* *INDENT-ON* */ - } - - return VPPCOM_ETIMEDOUT; -} - -/* - * 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); -} - -static int -vppcom_app_session_enable (void) -{ - int rv; - - if (vcm->app_state != STATE_APP_ENABLED) - { - vppcom_send_session_enable_disable (1 /* is_enabled == TRUE */ ); - rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); - if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: application session enable timed out! " - "returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); - return rv; - } - } - return VPPCOM_OK; -} - -static void - vl_api_session_enable_disable_reply_t_handler - (vl_api_session_enable_disable_reply_t * mp) -{ - if (mp->retval) - { - 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; + session->session_state = STATE_CLOSE_ON_EMPTY; + VDBG (0, "reset handle 0x%llx, sid %u ", reset_msg->handle, sid); + vcl_send_session_reset_reply (vcl_session_vpp_evt_q (wrk, session), + vcm->my_client_index, reset_msg->handle, 0); + return sid; } -static void -vppcom_app_send_attach (void) +static u32 +vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) { - 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] = - (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) - { - bmp->namespace_id_len = nsid_len; - clib_memcpy (bmp->namespace_id, vcm->cfg.namespace_id, nsid_len); - bmp->options[APP_OPTIONS_NAMESPACE_SECRET] = vcm->cfg.namespace_secret; - } - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); -} - -static int -vppcom_app_attach (void) -{ - 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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: application attach timed out! " - "returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); - return rv; - } - - return VPPCOM_OK; -} - -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); -} - -static void -vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t * - mp) -{ - static svm_fifo_segment_create_args_t _a; - svm_fifo_segment_create_args_t *a = &_a; - int rv; - - memset (a, 0, sizeof (*a)); + session = vcl_session_get (wrk, sid); if (mp->retval) { - clib_warning ("VCL<%d>: attach failed: %U", getpid (), - format_api_error, ntohl (mp->retval)); - return; - } - - if (mp->segment_name_length == 0) - { - clib_warning ("VCL<%d>: segment_name_length zero", getpid ()); - return; - } - - a->segment_name = (char *) mp->segment_name; - a->segment_size = mp->segment_size; - - 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); - 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)); - - vcm->app_state = STATE_APP_ENABLED; -} - -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)); -} - -static void -vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) -{ - static svm_fifo_segment_create_args_t _a; - svm_fifo_segment_create_args_t *a = &_a; - int rv; - - 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)) - { - clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed", - getpid (), mp->segment_name); - return; - } - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: mapped new segment '%s' size %d", getpid (), - mp->segment_name, mp->segment_size); -} - -static void -vl_api_unmap_segment_t_handler (vl_api_unmap_segment_t * mp) -{ - -/* - * XXX Need segment_name to session_id hash, - * XXX - have sessionID by handle hash currently - */ - if (VPPCOM_DEBUG > 1) - clib_warning ("Unmapped segment '%s'", mp->segment_name); -} - -static void -vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp) -{ - uword *p; - - p = hash_get (vcm->session_index_by_vpp_handles, mp->handle); - if (p) - { - int rv; - session_t *session = 0; - u32 session_index = p[0]; - - VCL_LOCK_AND_GET_SESSION (session_index, &session); - session->state = STATE_CLOSE_ON_EMPTY; - - if (VPPCOM_DEBUG > 1) - clib_warning ("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)); - clib_spinlock_unlock (&vcm->sessions_lockp); - return; - - done: - if (VPPCOM_DEBUG > 1) - clib_warning ("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); -} - -static void -vl_api_reset_session_t_handler (vl_api_reset_session_t * mp) -{ - session_t *session = 0; - vl_api_reset_session_reply_t *rmp; - uword *p; - int rv = 0; - - p = hash_get (vcm->session_index_by_vpp_handles, mp->handle); - if (p) - { - int rval; - clib_spinlock_lock (&vcm->sessions_lockp); - 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; - - if (VPPCOM_DEBUG > 1) - clib_warning ("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)); - } - clib_spinlock_unlock (&vcm->sessions_lockp); - } - else - { - 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); - } - - 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); -} - -static void -vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp) -{ - session_t *session = 0; - u32 session_index; - svm_fifo_t *rx_fifo, *tx_fifo; - int rv = VPPCOM_OK; - - session_index = mp->context; - VCL_LOCK_AND_GET_SESSION (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)); + VDBG (0, "VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: bind failed: %U", + getpid (), mp->handle, sid, format_api_error, ntohl (mp->retval)); if (session) { - session->state = STATE_FAILED; + session->session_state = STATE_FAILED; session->vpp_handle = mp->handle; + return sid; } else { clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: " "Invalid session index (%u)!", - getpid (), mp->handle, session_index); + getpid (), mp->handle, sid); + return VCL_INVALID_SESSION_INDEX; } - goto done_unlock; } - if (rv) - goto done_unlock; - - /* - * Setup session - */ - 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; - - 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; - - /* Add it to lookup table */ - hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index); - - if (VPPCOM_DEBUG > 1) - clib_warning ("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: - clib_spinlock_unlock (&vcm->sessions_lockp); -} - -static void -vppcom_send_connect_sock (session_t * session, u32 session_index) -{ - 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); -} - -static inline void -vppcom_send_disconnect_session_reply (u64 vpp_handle, u32 session_index, - int rv) -{ - vl_api_disconnect_session_reply_t *rmp; - - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "sending disconnect msg", - getpid (), vpp_handle, session_index); - - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - - 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); -} - -static inline void -vppcom_send_disconnect_session (u64 vpp_handle, u32 session_index) -{ - vl_api_disconnect_session_t *dmp; - - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "sending disconnect msg", - getpid (), vpp_handle, session_index); - - 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); -} - -static void -vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_reply_t * mp) -{ - session_t *session = 0; - u32 session_index = mp->context; - int rv; + session->transport.is_ip4 = mp->lcl_is_ip4; + clib_memcpy_fast (&session->transport.lcl_ip, mp->lcl_ip, + sizeof (ip46_address_t)); + session->transport.lcl_port = mp->lcl_port; + vcl_session_table_add_listener (wrk, mp->handle, sid); + session->session_state = STATE_LISTEN; - VCL_LOCK_AND_GET_SESSION (session_index, &session); -done: - if (mp->retval) + if (session->is_dgram) { - 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) - { - 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; + svm_fifo_t *rx_fifo, *tx_fifo; + session->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); + rx_fifo = uword_to_pointer (mp->rx_fifo, svm_fifo_t *); + rx_fifo->client_session_index = sid; + tx_fifo = uword_to_pointer (mp->tx_fifo, svm_fifo_t *); + tx_fifo->client_session_index = sid; + session->rx_fifo = rx_fifo; + session->tx_fifo = tx_fifo; } - session->vpp_handle = mp->handle; - session->lcl_addr.is_ip4 = mp->lcl_is_ip4; - clib_memcpy (&session->lcl_addr.ip46, mp->lcl_ip, - sizeof (session->peer_addr.ip46)); - session->lcl_port = mp->lcl_port; - vppcom_session_table_add_listener (mp->handle, session_index); - session->state = STATE_LISTEN; - - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!", - getpid (), mp->handle, mp->context); -done_unlock: - clib_spinlock_unlock (&vcm->sessions_lockp); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!", + getpid (), mp->handle, sid); + return sid; } -static void -vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp) -{ - if (mp->retval) - clib_warning ("VCL<%d>: ERROR: sid %u: unbind failed: %U", - getpid (), mp->context, format_api_error, - ntohl (mp->retval)); - - else if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: sid %u: unbind succeeded!", - getpid (), mp->context); -} +static int +vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) +{ + session_accepted_msg_t *accepted_msg; + session_disconnected_msg_t *disconnected_msg; + vcl_session_msg_t *vcl_msg; + vcl_session_t *session; + u64 handle; + u32 sid; + + switch (e->event_type) + { + case FIFO_EVENT_APP_RX: + case FIFO_EVENT_APP_TX: + case SESSION_IO_EVT_CT_RX: + case SESSION_IO_EVT_CT_TX: + vec_add1 (wrk->unhandled_evts_vector, *e); + break; + case SESSION_CTRL_EVT_ACCEPTED: + accepted_msg = (session_accepted_msg_t *) e->data; + handle = accepted_msg->listener_handle; + session = vcl_session_table_lookup_listener (wrk, handle); + if (!session) + { + clib_warning ("VCL<%d>: ERROR: couldn't find listen session:" + "listener handle %llx", getpid (), handle); + break; + } -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]); + clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); + vcl_msg->accepted_msg = *accepted_msg; + break; + case SESSION_CTRL_EVT_CONNECTED: + vcl_session_connected_handler (wrk, + (session_connected_msg_t *) e->data); + break; + case SESSION_CTRL_EVT_DISCONNECTED: + disconnected_msg = (session_disconnected_msg_t *) e->data; + sid = vcl_session_index_from_vpp_handle (wrk, disconnected_msg->handle); + session = vcl_session_get (wrk, sid); + if (!session) + { + VDBG (0, "request to disconnect unknown handle 0x%llx", + disconnected_msg->handle); + break; + } + session->session_state = STATE_DISCONNECT; + VDBG (0, "disconnected handle 0x%llx, sid %u", disconnected_msg->handle, + sid); + break; + case SESSION_CTRL_EVT_RESET: + vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + break; + case SESSION_CTRL_EVT_BOUND: + vcl_session_bound_handler (wrk, (session_bound_msg_t *) e->data); + break; + default: + clib_warning ("unhandled %u", e->event_type); + } + return VPPCOM_OK; } -u8 * -format_ip6_address (u8 * s, va_list * args) +static inline int +vppcom_wait_for_session_state_change (u32 session_index, + session_state_t state, + f64 wait_for_time) { - 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; + 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; - 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++) + do { - u32 is_zero = a->as_u16[i] == 0; - if (is_zero && i_first_zero >= ARRAY_LEN (a->as_u16)) + session = vcl_session_get (wrk, session_index); + if (PREDICT_FALSE (!session)) { - i_first_zero = i; - n_zeros = 0; + return VPPCOM_EBADFD; } - n_zeros += is_zero; - if ((!is_zero && n_zeros > max_n_zeros) - || (i + 1 >= ARRAY_LEN (a->as_u16) && n_zeros > max_n_zeros)) + if (session->session_state & state) { - i_max_n_zero = i_first_zero; - max_n_zeros = n_zeros; - i_first_zero = ARRAY_LEN (a->as_u16); - n_zeros = 0; - } - } - - 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; + return VPPCOM_OK; } - else + if (session->session_state & STATE_FAILED) { - s = format (s, "%s%x", - (last_double_colon || i == 0) ? "" : ":", - clib_net_to_host_u16 (a->as_u16[i])); - last_double_colon = 0; + return VPPCOM_ECONNREFUSED; } - } - - return s; -} - -/* 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; - 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 (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_NOWAIT, 0)) + continue; + e = svm_msg_q_msg_data (wrk->app_event_queue, &msg); + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); } + while (clib_time_now (&wrk->clib_time) < timeout); - return is_ip4 ? - format (s, "%U", format_ip4_address, &ip46->ip4) : - format (s, "%U", format_ip6_address, &ip46->ip6); + VDBG (0, "VCL<%d>: timeout waiting for state 0x%x (%s)", getpid (), state, + vppcom_session_state_str (state)); + vcl_evt (VCL_EVT_SESSION_TIMEOUT, session, session_state); + + return VPPCOM_ETIMEDOUT; } -static void -vl_api_accept_session_t_handler (vl_api_accept_session_t * mp) +static int +vppcom_app_session_enable (void) { - 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; - clib_spinlock_lock (&vcm->sessions_lockp); - - clib_spinlock_lock (&vcm->session_fifo_lockp); - elts = clib_fifo_free_elts (vcm->client_session_index_fifo); - clib_spinlock_unlock (&vcm->session_fifo_lockp); - - if (!elts) - { - clib_warning ("VCL<%d>: client session queue is full!", getpid ()); - vppcom_send_accept_session_reply (mp->handle, mp->context, - VNET_API_ERROR_QUEUE_FULL); - clib_spinlock_unlock (&vcm->sessions_lockp); - return; - } - - listen_session = vppcom_session_table_lookup_listener (mp->listener_handle); - if (!listen_session) - { - 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); - clib_spinlock_unlock (&vcm->sessions_lockp); - 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 = 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; - clib_memcpy (&session->peer_addr.ip46, mp->ip, - sizeof (session->peer_addr.ip46)); - - /* 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 */ - - clib_spinlock_lock (&vcm->event_thread.events_lockp); - - pool_get (vcm->event_thread.vce_events, ev); - ev->data = clib_mem_alloc (sizeof (vce_event_connect_request_t)); - ev->refcnt = 0; - ev_idx = (u32) (ev - vcm->event_thread.vce_events); - ecr = ev->data; - 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; - - clib_spinlock_unlock (&vcm->event_thread.events_lockp); - - rv = vce_generate_event (&vcm->event_thread, ev_idx); - - ASSERT (rv == 0); - - if (VPPCOM_DEBUG > 1) - clib_warning ("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, - clib_net_to_host_u16 (mp->port), session->vpp_event_queue); - - if (VPPCOM_DEBUG > 0) + if (vcm->app_state != STATE_APP_ENABLED) { - session->elog_track.name = - (char *) format (0, "C:%d:S:%d%c", vcm->my_client_index, - session_index, 0); - elog_track_register (&vcm->elog_main, &session->elog_track); - - if (session->peer_addr.is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = - "client_accept:handle:%x addr:%d.%d.%d.%d:%d", - .format_args = "i8i1i1i1i1i2", - }; - - CLIB_PACKED (struct { - u64 handle; //8 - u8 addr[4]; //4 - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->handle = mp->handle; - ed->addr[0] = session->peer_addr.ip46.ip4.as_u8[0]; - ed->addr[1] = session->peer_addr.ip46.ip4.as_u8[1]; - ed->addr[2] = session->peer_addr.ip46.ip4.as_u8[2]; - ed->addr[3] = session->peer_addr.ip46.ip4.as_u8[3]; - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - else + vppcom_send_session_enable_disable (1 /* is_enabled == TRUE */ ); + rv = vcl_wait_for_app_state_change (STATE_APP_ENABLED); + if (PREDICT_FALSE (rv)) { - clib_warning ("ip6"); + VDBG (0, "VCL<%d>: application session enable timed out! " + "returning %d (%s)", getpid (), rv, vppcom_retval_str (rv)); + return rv; } } - - clib_spinlock_unlock (&vcm->sessions_lockp); - -} - -static void -vppcom_send_bind_sock (session_t * session, u32 session_index) -{ - 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); + return VPPCOM_OK; } -static void -vppcom_send_unbind_sock (u64 vpp_handle) +static int +vppcom_app_attach (void) { - vl_api_unbind_sock_t *ump; + int rv; - ump = vl_msg_api_alloc (sizeof (*ump)); - memset (ump, 0, sizeof (*ump)); + vppcom_app_send_attach (); + rv = vcl_wait_for_app_state_change (STATE_APP_ATTACHED); + if (PREDICT_FALSE (rv)) + { + VDBG (0, "VCL<%d>: application attach timed out! returning %d (%s)", + getpid (), rv, vppcom_retval_str (rv)); + return rv; + } - 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); + return VPPCOM_OK; } static int -vppcom_session_unbind (u32 session_index) +vppcom_session_unbind (u32 session_handle) { - session_t *session = 0; - int rv; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; u64 vpp_handle; - elog_track_t session_elog_track; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; vpp_handle = session->vpp_handle; - vppcom_session_table_del_listener (vpp_handle); + vcl_session_table_del_listener (wrk, vpp_handle); session->vpp_handle = ~0; - session->state = STATE_DISCONNECT; - session_elog_track = session->elog_track; - - clib_spinlock_unlock (&vcm->sessions_lockp); - - if (VPPCOM_DEBUG > 1) - clib_warning ("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)); - - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "unbind: handle:%x", - .format_args = "i8", - }; - - struct - { - u64 handle; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - ed->handle = vpp_handle; - /* *INDENT-ON* */ - } + session->session_state = STATE_DISCONNECT; + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending unbind msg! new state" + " 0x%x (%s)", getpid (), vpp_handle, session_handle, STATE_DISCONNECT, + vppcom_session_state_str (STATE_DISCONNECT)); + vcl_evt (VCL_EVT_UNBIND, session); vppcom_send_unbind_sock (vpp_handle); -done: - return rv; + return VPPCOM_OK; } -static inline int -vppcom_session_disconnect (u32 session_index) -{ - int rv; - session_t *session; - u64 vpp_handle; +static int +vppcom_session_disconnect (u32 session_handle) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + svm_msg_q_t *vpp_evt_q; + vcl_session_t *session; session_state_t state; + u64 vpp_handle; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; vpp_handle = session->vpp_handle; - state = session->state; - clib_spinlock_unlock (&vcm->sessions_lockp); + state = session->session_state; - if (VPPCOM_DEBUG > 1) - { - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u " - "state 0x%x (%s)", - getpid (), vpp_handle, session_index, - state, vppcom_session_state_str (state)); - } + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u state 0x%x (%s)", getpid (), + vpp_handle, session_handle, state, vppcom_session_state_str (state)); if (PREDICT_FALSE (state & STATE_LISTEN)) { 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; + getpid (), vpp_handle, session_handle); + return VPPCOM_EBADFD; } - /* 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 */ ); - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "sending disconnect REPLY...", - getpid (), vpp_handle, session_index); + vpp_evt_q = vcl_session_vpp_evt_q (wrk, session); + vcl_send_session_disconnected_reply (vpp_evt_q, vcm->my_client_index, + vpp_handle, 0); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect " + "REPLY...", getpid (), vpp_handle, session_handle); } - - /* Otherwise, send a disconnect session msg... - */ else { - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "sending disconnect...", - getpid (), vpp_handle, session_index); - - vppcom_send_disconnect_session (vpp_handle, session_index); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect...", + getpid (), vpp_handle, session_handle); + vppcom_send_disconnect_session (vpp_handle); } -done: - return rv; + return VPPCOM_OK; } -#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) - static void -vppcom_api_hookup (void) +vcl_cleanup_bapi (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 _ -} + api_main_t *am = &api_main; -static void -vppcom_cfg_init (vppcom_cfg_t * vcl_cfg) -{ - 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"; + am->my_client_index = ~0; + am->my_registration = 0; + am->vl_input_queue = 0; + am->msg_index_by_name_and_crc = 0; + + vl_client_api_unmap (); } -static void -vppcom_cfg_heapsize (char *conf_fname) +void +vcl_app_fork_child_handler (void) { - vppcom_cfg_t *vcl_cfg = &vcm->cfg; - FILE *fp; - char inbuf[4096]; - int argc = 1; - char **argv = NULL; - char *arg = NULL; - char *p; - int i; - u8 *sizep; - u32 size; - void *vcl_mem; - void *heap; - - fp = fopen (conf_fname, "r"); - if (fp == NULL) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: using default heapsize %lld (0x%llx)", - getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); - goto defaulted; - } - - argv = calloc (1, sizeof (char *)); - if (argv == NULL) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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"); - } - } - - fclose (fp); - fp = NULL; - - char **tmp = realloc (argv, (argc + 1) * sizeof (char *)); - if (tmp == NULL) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: realloc failed, " - "using default heapsize %lld (0x%llx)", - getpid (), vcl_cfg->heapsize, vcl_cfg->heapsize); - goto defaulted; - } - argv = tmp; - argv[argc] = NULL; - - /* - * Look for and parse the "heapsize" config parameter. - * Manual since none of the clib infra has been bootstrapped yet. - * - * Format: heapsize [mM][gG] - */ - - for (i = 1; i < (argc - 1); i++) - { - if (!strncmp (argv[i], "heapsize", 8)) - { - sizep = (u8 *) argv[i + 1]; - size = 0; - while (*sizep >= '0' && *sizep <= '9') - { - size *= 10; - size += *sizep++ - '0'; - } - if (size == 0) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - } + u8 *child_name; + int rv; - if (*sizep == 'g' || *sizep == 'G') - vcl_cfg->heapsize = size << 30; - else if (*sizep == 'm' || *sizep == 'M') - vcl_cfg->heapsize = size << 20; - else - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - } - } - } + vcm->current_pid = getpid (); + vcl_set_worker_index (0); -defaulted: - if (fp != NULL) - fclose (fp); - if (argv != NULL) - free (argv); + VDBG (0, "initializing forked child"); + child_name = format (0, "%v-child-%u%c", vcm->app_name, getpid (), 0); - 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) + vcl_cleanup_bapi (); + vppcom_api_hookup (); + vcm->app_state = STATE_APP_START; + rv = vppcom_connect_to_vpp ((char *) child_name); + vec_free (child_name); + if (rv) { - clib_warning ("VCL<%d>: ERROR: clib_mem_alloc() failed!", getpid ()); - ASSERT (vcl_mem); + VERR ("couldn't connect to VPP!"); return; } - clib_memcpy (vcl_mem, &_vppcom_main, sizeof (_vppcom_main)); - vcm = vcl_mem; - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: allocated VCL heap = %p, size %lld (0x%llx)", - getpid (), heap, vcl_cfg->heapsize, vcl_cfg->heapsize); -} - -static void -vppcom_cfg_read (char *conf_fname) -{ - 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) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: using default configuration.", - getpid (), conf_fname); - goto file_done; - } - - if (fstat (fd, &s) < 0) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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))) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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) + vcm->app_state = STATE_APP_ADDING_WORKER; + vcl_send_app_worker_add_del (1 /* is_add */ ); + if (vcl_wait_for_app_state_change (STATE_APP_READY)) { - (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 (vc_cfg_input) - { - if (unformat (line_input, "heapsize %s", &chroot_path)) - { - vec_terminate_c_string (chroot_path); - if (VPPCOM_DEBUG > 0) - clib_warning ("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); - - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - - if (VPPCOM_DEBUG > 0) - clib_warning ("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); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured uid %d", getpid (), uid); - } - else if (unformat (line_input, "gid %d", &gid)) - { - vl_set_memory_gid (gid); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured gid %d", getpid (), gid); - } - else if (unformat (line_input, "segment-baseva 0x%lx", - &vcl_cfg->segment_baseva)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning - ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning - ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured app_timeout %f", - getpid (), vcl_cfg->app_timeout); - } - else if (unformat (line_input, "session-timeout %f", - &vcl_cfg->session_timeout)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured session_timeout %f", - getpid (), vcl_cfg->session_timeout); - } - else if (unformat (line_input, "accept-timeout %f", - &vcl_cfg->accept_timeout)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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)) - { - if (VPPCOM_DEBUG > 0) - clib_warning - ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured namespace_id is " - "too long, truncated to %d characters!", - getpid (), max_nsid_vec_len); - } - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: configured namespace_id %v", - getpid (), vcl_cfg->namespace_id); - } - else if (unformat (line_input, "}")) - { - vc_cfg_input = 0; - if (VPPCOM_DEBUG > 0) - clib_warning ("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]); - } - } - } + VERR ("failed to add worker to vpp"); + return; } - -input_done: - unformat_free (input); - -file_done: - if (fd >= 0) - close (fd); + VDBG (0, "forked child main worker initialized"); } /* @@ -2158,186 +741,56 @@ int vppcom_app_create (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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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); + vcm->is_init = 1; + vppcom_cfg (&vcm->cfg); 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); - - if (VPPCOM_DEBUG > 0) - clib_warning ("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); - - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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; - if (VPPCOM_DEBUG > 0) - clib_warning ("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); + vcm->main_cpu = pthread_self (); + vcm->main_pid = vcm->current_pid = getpid (); + vcm->app_name = format (0, "%s", app_name); vppcom_init_error_string_table (); svm_fifo_segment_main_init (vcl_cfg->segment_baseva, 20 /* timeout in secs */ ); - clib_spinlock_init (&vcm->sessions_lockp); + pool_init_fixed (vcm->workers, vcl_cfg->max_workers); + clib_spinlock_init (&vcm->workers_lock); + vcl_worker_alloc_and_init (); + pthread_atfork (NULL, NULL, vcl_app_fork_child_handler); } 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 ()); + VERR ("couldn't connect to VPP!"); return rv; } - - /* State event handling thread */ - - rv = vce_start_event_thread (&(vcm->event_thread), 20); - - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: sending session enable", getpid ()); - + VDBG (0, "sending session enable"); rv = vppcom_app_session_enable (); if (rv) { - clib_warning ("VCL<%d>: ERROR: vppcom_app_session_enable() " - "failed!", getpid ()); + VERR ("vppcom_app_session_enable() failed!"); return rv; } - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: sending app attach", getpid ()); - + VDBG (0, "sending app attach"); rv = vppcom_app_attach (); if (rv) { - clib_warning ("VCL<%d>: ERROR: vppcom_app_attach() failed!", - getpid ()); + VERR ("vppcom_app_attach() failed!"); return rv; } - if (VPPCOM_DEBUG > 0) - clib_warning ("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->my_client_index, vcm->my_client_index); } return VPPCOM_OK; @@ -2347,47 +800,27 @@ void vppcom_app_destroy (void) { int rv; + f64 orig_app_timeout; if (vcm->my_client_index == ~0) return; - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: detaching from VPP, my_client_index %d (0x%x)", - getpid (), vcm->my_client_index, vcm->my_client_index); - - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "app_detach:C:%d", - .format_args = "i4", - }; - - struct - { - u32 data; - } *ed; - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track); - ed->data = vcm->my_client_index; - /* *INDENT-ON* */ - } + VDBG (0, "detaching from VPP, my_client_index %d (0x%x)", + vcm->my_client_index, vcm->my_client_index); + vcl_evt (VCL_EVT_DETACH, vcm); - vppcom_app_detach (); - rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); + vppcom_app_send_detach (); + orig_app_timeout = vcm->cfg.app_timeout; + vcm->cfg.app_timeout = 2.0; + rv = vcl_wait_for_app_state_change (STATE_APP_ENABLED); + vcm->cfg.app_timeout = orig_app_timeout; if (PREDICT_FALSE (rv)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: application detach timed out! " - "returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); - } - - /* Finished with logging before client gets reset to ~0 */ - if (VPPCOM_DEBUG > 0) - write_elog (); + VDBG (0, "application detach timed out! returning %d (%s)", + rv, vppcom_retval_str (rv)); + vcl_elog_stop (vcm); vl_client_disconnect_from_vlib (); + vec_free (vcm->app_name); vcm->my_client_index = ~0; vcm->app_state = STATE_APP_START; } @@ -2395,1096 +828,1116 @@ vppcom_app_destroy (void) int vppcom_session_create (u8 proto, u8 is_nonblocking) { - session_t *session; - u32 session_index; - session_state_t state; - elog_track_t session_elog_track; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; - clib_spinlock_lock (&vcm->sessions_lockp); - 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; - state = session->state; + session->session_type = proto; + session->session_state = STATE_START; session->vpp_handle = ~0; + session->is_dgram = proto == VPPCOM_PROTO_UDP; if (is_nonblocking) VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK); - else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK); - - if (VPPCOM_DEBUG > 0) - { - session->elog_track.name = - (char *) format (0, "C:%d:S:%d%c", vcm->my_client_index, - session_index, 0); - elog_track_register (&vcm->elog_main, &session->elog_track); - session_elog_track = session->elog_track; - } - - clib_spinlock_unlock (&vcm->sessions_lockp); - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: sid %u", getpid (), session_index); - - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "session_create:proto:%d state:%d is_nonblocking:%d", - .format_args = "i4i4i4", - }; - struct - { - u32 data[3]; - } *ed; + vcl_evt (VCL_EVT_CREATE, session, session_type, session->session_state, + is_nonblocking, session_index); - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - ed->data[0] = proto; - ed->data[1] = state; - ed->data[2] = is_nonblocking; - /* *INDENT-ON* */ - } + VDBG (0, "created sid %u", session->session_index); - return (int) session_index; + return vcl_session_handle (session); } int -vppcom_session_close (uint32_t session_index) +vppcom_session_close (uint32_t session_handle) { - session_t *session = 0; - int rv; - u8 is_vep; - u8 is_vep_session; - u32 next_sid; - u32 vep_idx; - u64 vpp_handle; - uword *p; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; + u8 is_vep, is_vep_session; session_state_t state; - elog_track_t session_elog_track; + u32 next_sh, vep_sh; + int rv = VPPCOM_OK; + u64 vpp_handle; - VCL_LOCK_AND_GET_SESSION (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; - clib_spinlock_unlock (&vcm->sessions_lockp); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; - /* - * Why two if(VPPCOM_DEBUG) checks? - * - * Eventually all clib_warnings need their own way of being - * logged and signalled (like severity) where event logging - * is a separate debugging tool. It will make the separation - * easier. ... parting is such sweet sorrow ... - */ - if (VPPCOM_DEBUG > 0) - { - session_elog_track = session->elog_track; - } + is_vep = session->is_vep; + is_vep_session = session->is_vep_session; + next_sh = session->vep.next_sh; + vep_sh = session->vep.vep_sh; + state = session->session_state; + vpp_handle = session->vpp_handle; if (VPPCOM_DEBUG > 0) { if (is_vep) clib_warning ("VCL<%d>: vep_idx %u / sid %u: " "closing epoll session...", - getpid (), session_index, session_index); + getpid (), session_handle, session_handle); else clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %d: " "closing session...", - getpid (), vpp_handle, session_index); + getpid (), vpp_handle, session_handle); } if (is_vep) { - while (next_sid != ~0) + while (next_sh != ~0) { - rv = vppcom_epoll_ctl (session_index, EPOLL_CTL_DEL, next_sid, 0); - if ((VPPCOM_DEBUG > 0) && PREDICT_FALSE (rv < 0)) - clib_warning ("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)); + rv = vppcom_epoll_ctl (session_handle, EPOLL_CTL_DEL, next_sh, 0); + if (PREDICT_FALSE (rv < 0)) + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: EPOLL_CTL_DEL " + "vep_idx %u failed! rv %d (%s)", + getpid (), vpp_handle, next_sh, vep_sh, + rv, vppcom_retval_str (rv)); - VCL_LOCK_AND_GET_SESSION (session_index, &session); - next_sid = session->vep.next_sid; - clib_spinlock_unlock (&vcm->sessions_lockp); + next_sh = session->vep.next_sh; } } else { if (is_vep_session) { - rv = vppcom_epoll_ctl (vep_idx, EPOLL_CTL_DEL, session_index, 0); - if ((VPPCOM_DEBUG > 0) && (rv < 0)) - clib_warning ("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)); + rv = vppcom_epoll_ctl (vep_sh, EPOLL_CTL_DEL, session_handle, 0); + if (rv < 0) + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: EPOLL_CTL_DEL " + "vep_idx %u failed! rv %d (%s)", + getpid (), vpp_handle, session_handle, + vep_sh, rv, vppcom_retval_str (rv)); } if (state & STATE_LISTEN) { - rv = vppcom_session_unbind (session_index); + rv = vppcom_session_unbind (session_handle); if (PREDICT_FALSE (rv < 0)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "listener unbind failed! rv %d (%s)", - getpid (), vpp_handle, session_index, - rv, vppcom_retval_str (rv)); - } + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: listener unbind " + "failed! rv %d (%s)", + getpid (), vpp_handle, session_handle, + rv, vppcom_retval_str (rv)); } - - else if (state & (CLIENT_STATE_OPEN | SERVER_STATE_OPEN)) + else if (state & STATE_OPEN) { - rv = vppcom_session_disconnect (session_index); + rv = vppcom_session_disconnect (session_handle); if (PREDICT_FALSE (rv < 0)) clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " "session disconnect failed! rv %d (%s)", - getpid (), vpp_handle, session_index, + getpid (), vpp_handle, session_handle, rv, vppcom_retval_str (rv)); } } - VCL_LOCK_AND_GET_SESSION (session_index, &session); - vpp_handle = session->vpp_handle; - if (vpp_handle != ~0) + if (vcl_session_is_ct (session)) { - p = hash_get (vcm->session_index_by_vpp_handles, vpp_handle); - if (p) - hash_unset (vcm->session_index_by_vpp_handles, vpp_handle); + vcl_cut_through_registration_t *ctr; + uword mq_addr; + + mq_addr = pointer_to_uword (session->our_evt_q); + ctr = vcl_ct_registration_lock_and_lookup (wrk, mq_addr); + ASSERT (ctr); + if (ctr->epoll_evt_conn_index != ~0) + vcl_mq_epoll_del_evfd (wrk, ctr->epoll_evt_conn_index); + VDBG (0, "Removing ct registration %u", + vcl_ct_registration_index (wrk, ctr)); + vcl_ct_registration_del (wrk, ctr); + vcl_ct_registration_lookup_del (wrk, mq_addr); + vcl_ct_registration_unlock (wrk); } - pool_put_index (vcm->sessions, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); + if (vpp_handle != ~0) + { + vcl_session_table_del_vpp_handle (wrk, vpp_handle); + } + vcl_session_free (wrk, session); if (VPPCOM_DEBUG > 0) { if (is_vep) clib_warning ("VCL<%d>: vep_idx %u / sid %u: epoll session removed.", - getpid (), session_index, session_index); + getpid (), session_handle, session_handle); else clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: session removed.", - getpid (), vpp_handle, session_index); + getpid (), vpp_handle, session_handle); } -done: - - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "session_close:rv:%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - ed->data = rv; - /* *INDENT-ON* */ - } + vcl_evt (VCL_EVT_CLOSE, session, rv); return rv; } int -vppcom_session_bind (uint32_t session_index, vppcom_endpt_t * ep) +vppcom_session_bind (uint32_t session_handle, vppcom_endpt_t * ep) { - session_t *session = 0; - int rv; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; if (!ep || !ep->ip) return VPPCOM_EINVAL; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; if (session->is_vep) { - clib_spinlock_unlock (&vcm->sessions_lockp); clib_warning ("VCL<%d>: ERROR: sid %u: cannot " - "bind to an epoll session!", getpid (), session_index); - rv = VPPCOM_EBADFD; - goto done; + "bind to an epoll session!", getpid (), session_handle); + return VPPCOM_EBADFD; } - session->lcl_addr.is_ip4 = ep->is_ip4; - session->lcl_addr.ip46 = to_ip46 (!ep->is_ip4, ep->ip); - session->lcl_port = ep->port; - - if (VPPCOM_DEBUG > 0) - clib_warning ("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, - clib_net_to_host_u16 (session->lcl_port), - session->proto ? "UDP" : "TCP"); - - if (VPPCOM_DEBUG > 0) - { - if (session->lcl_addr.is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "bind local:%s:%d.%d.%d.%d:%d ", - .format_args = "t1i1i1i1i1i2", - .n_enum_strings = 2, - .enum_strings = {"TCP", "UDP",}, - }; - - CLIB_PACKED (struct { - u8 proto; - u8 addr[4]; - u16 port; - }) *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->proto = session->proto; - ed->addr[0] = session->lcl_addr.ip46.ip4.as_u8[0]; - ed->addr[1] = session->lcl_addr.ip46.ip4.as_u8[1]; - ed->addr[2] = session->lcl_addr.ip46.ip4.as_u8[2]; - ed->addr[3] = session->lcl_addr.ip46.ip4.as_u8[3]; - ed->port = clib_net_to_host_u16 (session->lcl_port); - /* *INDENT-ON* */ - } - } + 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, "VCL<%d>: sid %u: binding to local %s address %U port %u, " + "proto %s", getpid (), session_handle, + session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &session->transport.lcl_ip, + session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (session->transport.lcl_port), + session->session_type ? "UDP" : "TCP"); + vcl_evt (VCL_EVT_BIND, session); + + if (session->session_type == VPPCOM_PROTO_UDP) + vppcom_session_listen (session_handle, 10); - clib_spinlock_unlock (&vcm->sessions_lockp); -done: - return rv; + 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) + return VPPCOM_EBADFD; if (q_len == 0 || q_len == ~0) q_len = vcm->cfg.listen_queue_size; - VCL_LOCK_AND_GET_SESSION (listen_session_index, &listen_session); - if (listen_session->is_vep) { - clib_spinlock_unlock (&vcm->sessions_lockp); clib_warning ("VCL<%d>: ERROR: sid %u: cannot listen on an " - "epoll session!", getpid (), listen_session_index); - rv = VPPCOM_EBADFD; - goto done; + "epoll session!", getpid (), listen_sh); + return VPPCOM_EBADFD; } listen_vpp_handle = listen_session->vpp_handle; - if (listen_session->state & STATE_LISTEN) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "already in listen state!", - getpid (), listen_vpp_handle, listen_session_index); - rv = VPPCOM_OK; - goto done; - } - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, " - "sid %u: sending bind request...", - getpid (), listen_vpp_handle, listen_session_index); - - vppcom_send_bind_sock (listen_session, listen_session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - retval = - vppcom_wait_for_session_state_change (listen_session_index, STATE_LISTEN, - vcm->cfg.session_timeout); - - VCL_LOCK_AND_GET_SESSION (listen_session_index, &listen_session); - if (PREDICT_FALSE (retval)) + if (listen_session->session_state & STATE_LISTEN) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: bind failed! " - "returning %d (%s)", getpid (), - listen_session->vpp_handle, listen_session_index, - retval, vppcom_retval_str (retval)); - clib_spinlock_unlock (&vcm->sessions_lockp); - rv = retval; - goto done; + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: already in listen state!", + getpid (), listen_vpp_handle, listen_sh); + return VPPCOM_OK; } - clib_spinlock_lock (&vcm->session_fifo_lockp); - clib_fifo_validate (vcm->client_session_index_fifo, q_len); - clib_spinlock_unlock (&vcm->session_fifo_lockp); - - clib_spinlock_unlock (&vcm->sessions_lockp); - -done: - return rv; -} + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: sending VPP bind+listen " + "request...", getpid (), listen_vpp_handle, listen_sh); -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) -{ - int rv = VPPCOM_OK; - vce_event_key_t evk; - vppcom_session_listener_t *listener_args; + /* + * Send listen request to vpp and wait for reply + */ + vppcom_send_bind_sock (listen_session); + rv = vppcom_wait_for_session_state_change (listen_session->session_index, + STATE_LISTEN, + vcm->cfg.session_timeout); - rv = vppcom_session_listen (session_index, q_len); - if (rv) + if (PREDICT_FALSE (rv)) { - goto done; + listen_session = vcl_session_get_w_handle (wrk, listen_sh); + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: bind+listen failed! " + "returning %d (%s)", getpid (), listen_session->vpp_handle, + listen_sh, rv, vppcom_retval_str (rv)); + return rv; } - - /* Register handler for connect_request event on listen_session_index */ - listener_args = clib_mem_alloc (sizeof (vppcom_session_listener_t)); - 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 VPPCOM_OK; } -int -validate_args_session_accept_ (session_t * listen_session) +static int +validate_args_session_accept_ (vcl_worker_t * wrk, + vcl_session_t * listen_session) { - u32 listen_session_index = listen_session - vcm->sessions; - /* Input validation - expects spinlock on sessions_lockp */ if (listen_session->is_vep) { clib_warning ("VCL<%d>: ERROR: sid %u: cannot accept on an " - "epoll session!", getpid (), listen_session_index); + "epoll session!", getpid (), + listen_session->session_index); return VPPCOM_EBADFD; } - if (listen_session->state != STATE_LISTEN) + if (listen_session->session_state != STATE_LISTEN) { clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " "not in listen state! state 0x%x (%s)", getpid (), - listen_session->vpp_handle, listen_session_index, - listen_session->state, - vppcom_session_state_str (listen_session->state)); + listen_session->vpp_handle, listen_session->session_index, + listen_session->session_state, + vppcom_session_state_str (listen_session->session_state)); return VPPCOM_EBADFD; } return VPPCOM_OK; } int -vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, +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; - int rv; + u32 client_session_index = ~0, listen_session_index; + vcl_worker_t *wrk = vcl_worker_get_current (); + session_accepted_msg_t accepted_msg; + vcl_session_t *listen_session = 0; + vcl_session_t *client_session = 0; + svm_msg_q_t *vpp_evt_q; + vcl_session_msg_t *evt; u64 listen_vpp_handle; - 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_LOCK_AND_GET_SESSION (listen_session_index, &listen_session); - listen_vpp_handle = listen_session->vpp_handle; // For debugging - - rv = validate_args_session_accept_ (listen_session); - if (rv) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - 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; - - clib_spinlock_unlock (&vcm->sessions_lockp); - - /* 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); - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); - pthread_mutex_lock (®->handler_lock); - while (!ev) - { - rv = - pthread_cond_timedwait (®->handler_cond, ®->handler_lock, &ts); - if (rv == ETIMEDOUT) - { - rv = VPPCOM_EAGAIN; - goto cleanup; - } - ev = vce_get_event_from_index (&vcm->event_thread, reg->ev_idx); - } - result = (vce_event_connect_request_t *) ev->data; - client_session_index = result->accepted_session_index; + svm_msg_q_msg_t msg; + session_event_t *e; + u8 is_nonblocking; + int rv; + 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; - /* Remove from the FIFO used to service epoll */ - clib_spinlock_lock (&vcm->session_fifo_lockp); - if (clib_fifo_elts (vcm->client_session_index_fifo)) + if (clib_fifo_elts (listen_session->accept_evts_fifo)) { - 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); + clib_fifo_sub2 (listen_session->accept_evts_fifo, evt); + accepted_msg = evt->accepted_msg; + goto handle; } - clib_spinlock_unlock (&vcm->session_fifo_lockp); - clib_spinlock_lock (&vcm->sessions_lockp); + is_nonblocking = VCL_SESS_ATTR_TEST (listen_session->attr, + VCL_SESS_ATTR_NONBLOCK); + if (svm_msg_q_is_empty (wrk->app_event_queue) && is_nonblocking) + return VPPCOM_EAGAIN; - rv = vppcom_session_at_index (client_session_index, &client_session); - if (PREDICT_FALSE (rv)) + while (1) { - 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; + if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_WAIT, 0)) + return VPPCOM_EAGAIN; + + e = svm_msg_q_msg_data (wrk->app_event_queue, &msg); + if (e->event_type != SESSION_CTRL_EVT_ACCEPTED) + { + clib_warning ("discarded event: %u", e->event_type); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); + continue; + } + clib_memcpy_fast (&accepted_msg, e->data, sizeof (accepted_msg)); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); + break; } +handle: + + client_session_index = vcl_session_accepted_handler (wrk, &accepted_msg); + listen_session = vcl_session_get (wrk, listen_session_index); + client_session = vcl_session_get (wrk, client_session_index); + if (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); - if (VPPCOM_DEBUG > 0) - clib_warning ("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)); + listen_vpp_handle = listen_session->vpp_handle; + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: Got a client request! " + "vpp handle 0x%llx, sid %u, flags %d, is_nonblocking %u", + getpid (), listen_vpp_handle, listen_session_handle, + client_session->vpp_handle, client_session_index, + flags, VCL_SESS_ATTR_TEST (client_session->attr, + VCL_SESS_ATTR_NONBLOCK)); 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)); - } - - vppcom_send_accept_session_reply (client_session->vpp_handle, - client_session->client_context, - 0 /* retval OK */ ); - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: accepted vpp handle " - "0x%llx, sid %u connection to local %s address " - "%U port %u", getpid (), listen_vpp_handle, - listen_session_index, client_session->vpp_handle, - client_session_index, - client_session->lcl_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, &client_session->lcl_addr.ip46, - client_session->lcl_addr.is_ip4, - clib_net_to_host_u16 (client_session->lcl_port)); - - if (VPPCOM_DEBUG > 0) - { - client_session->elog_track.name = - (char *) format (0, "C:%d:S:%d%c", vcm->my_client_index, - client_session_index, 0); - elog_track_register (&vcm->elog_main, &client_session->elog_track); - - // Two elog entries due to 20-byte per entry constraint. - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "accept: listen_handle:%x from_handle:%x", - .format_args = "i8i8", - }; - - struct - { - u64 handle[2]; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, client_session->elog_track); - ed->handle[0] = listen_vpp_handle; - ed->handle[1] = client_session->vpp_handle; - /* *INDENT-ON* */ - - if (client_session->lcl_addr.is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e2) = - { - .format = "accept: S:%d %d.%d.%d.%d:%d ", - .format_args = "i4i1i1i1i1i2", - }; - - CLIB_PACKED (struct { - u32 session; - u8 addr[4]; - u16 port; - }) *ed2; - - ed2 = - ELOG_TRACK_DATA (&vcm->elog_main, e2, client_session->elog_track); - ed2->session = client_session_index; - ed2->addr[0] = client_session->lcl_addr.ip46.ip4.as_u8[0]; - ed2->addr[1] = client_session->lcl_addr.ip46.ip4.as_u8[1]; - ed2->addr[2] = client_session->lcl_addr.ip46.ip4.as_u8[2]; - ed2->addr[3] = client_session->lcl_addr.ip46.ip4.as_u8[3]; - ed2->port = clib_net_to_host_u16 (client_session->lcl_port); - /* *INDENT-ON* */ - } + clib_memcpy_fast (ep->ip, &client_session->transport.rmt_ip.ip6, + sizeof (ip6_address_t)); } - clib_spinlock_unlock (&vcm->sessions_lockp); - - rv = (int) client_session_index; - vce_clear_event (&vcm->event_thread, ev); - -cleanup: - vce_unregister_handler (&vcm->event_thread, reg); - pthread_mutex_unlock (®->handler_lock); - -done: - return rv; + if (accepted_msg.server_event_queue_address) + vpp_evt_q = uword_to_pointer (accepted_msg.vpp_event_queue_address, + svm_msg_q_t *); + else + vpp_evt_q = client_session->vpp_evt_q; + + vcl_send_session_accepted_reply (vpp_evt_q, client_session->client_context, + client_session->vpp_handle, 0); + + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: accepted vpp handle 0x%llx, " + "sid %u connection from peer %s address %U port %u to local %s " + "address %U port %u", getpid (), listen_vpp_handle, + listen_session_handle, client_session->vpp_handle, + client_session_index, + client_session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &client_session->transport.rmt_ip, + client_session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (client_session->transport.rmt_port), + client_session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, &client_session->transport.lcl_ip, + client_session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (client_session->transport.lcl_port)); + vcl_evt (VCL_EVT_ACCEPT, client_session, listen_session, + client_session_index); + + return vcl_session_handle (client_session); } 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_LOCK_AND_GET_SESSION (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)) { - clib_spinlock_unlock (&vcm->sessions_lockp); clib_warning ("VCL<%d>: ERROR: sid %u: cannot " - "connect on an epoll session!", getpid (), session_index); - rv = VPPCOM_EBADFD; - goto done; + "connect on an epoll session!", getpid (), + session_handle); + return VPPCOM_EBADFD; } - if (PREDICT_FALSE (session->state & CLIENT_STATE_OPEN)) + if (PREDICT_FALSE (session->session_state & CLIENT_STATE_OPEN)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: session already " - "connected to %s %U port %d proto %s, state 0x%x (%s)", - getpid (), session->vpp_handle, session_index, - session->peer_addr.is_ip4 ? "IPv4" : "IPv6", - format_ip46_address, - &session->peer_addr.ip46, session->peer_addr.is_ip4, - clib_net_to_host_u16 (session->peer_port), - session->proto ? "UDP" : "TCP", session->state, - vppcom_session_state_str (session->state)); - - clib_spinlock_unlock (&vcm->sessions_lockp); - goto done; + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: session already " + "connected to %s %U port %d proto %s, state 0x%x (%s)", + getpid (), session->vpp_handle, session_handle, + session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, + &session->transport.rmt_ip, session->transport.is_ip4 ? + IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (session->transport.rmt_port), + session->session_type ? "UDP" : "TCP", session->session_state, + vppcom_session_state_str (session->session_state)); + return VPPCOM_OK; } - session->peer_addr.is_ip4 = server_ep->is_ip4; - session->peer_addr.ip46 = to_ip46 (!server_ep->is_ip4, server_ep->ip); - session->peer_port = server_ep->port; + session->transport.is_ip4 = server_ep->is_ip4; + if (session->transport.is_ip4) + clib_memcpy_fast (&session->transport.rmt_ip.ip4, server_ep->ip, + sizeof (ip4_address_t)); + else + clib_memcpy_fast (&session->transport.rmt_ip.ip6, server_ep->ip, + sizeof (ip6_address_t)); + session->transport.rmt_port = server_ep->port; + + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: connecting to server %s %U " + "port %d proto %s", + getpid (), session->vpp_handle, session_handle, + session->transport.is_ip4 ? "IPv4" : "IPv6", + format_ip46_address, + &session->transport.rmt_ip, session->transport.is_ip4 ? + IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (session->transport.rmt_port), + session->session_type ? "UDP" : "TCP"); - if (VPPCOM_DEBUG > 0) - clib_warning ("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", - format_ip46_address, - &session->peer_addr.ip46, session->peer_addr.is_ip4, - clib_net_to_host_u16 (session->peer_port), - session->proto ? "UDP" : "TCP"); - - vppcom_send_connect_sock (session, session_index); - clib_spinlock_unlock (&vcm->sessions_lockp); - - retval = - vppcom_wait_for_session_state_change (session_index, STATE_CONNECT, - vcm->cfg.session_timeout); - - VCL_LOCK_AND_GET_SESSION (session_index, &session); - vpp_handle = session->vpp_handle; - clib_spinlock_unlock (&vcm->sessions_lockp); + /* + * Send connect request and wait for reply from vpp + */ + vppcom_send_connect_sock (session); + rv = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT, + vcm->cfg.session_timeout); -done: - if (PREDICT_FALSE (retval)) + session = vcl_session_get (wrk, session_index); + + if (PREDICT_FALSE (rv)) { - 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)); + clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connect " + "failed! returning %d (%s)", getpid (), + session->vpp_handle, session_handle, rv, + vppcom_retval_str (rv)); else clib_warning ("VCL<%d>: no session for sid %u: connect failed! " "returning %d (%s)", getpid (), - session_index, rv, vppcom_retval_str (rv)); + session_handle, rv, vppcom_retval_str (rv)); } } - else if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: connected!", - getpid (), vpp_handle, session_index); + else + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: connected!", + getpid (), session->vpp_handle, session_handle); return rv; } +static u8 +vcl_is_rx_evt_for_session (session_event_t * e, u32 sid, u8 is_ct) +{ + if (!is_ct) + return (e->event_type == FIFO_EVENT_APP_RX + && e->fifo->client_session_index == sid); + else + return (e->event_type == SESSION_IO_EVT_CT_TX); +} + +static inline u8 +vcl_session_is_readable (vcl_session_t * s) +{ + return ((s->session_state & STATE_OPEN) + || (s->session_state == STATE_LISTEN + && s->session_type == VPPCOM_PROTO_UDP)); +} + 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 n_read = 0, rv, 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); + svm_msg_q_msg_t msg; + session_event_t *e; + svm_msg_q_t *mq; + u8 is_ct; - VCL_LOCK_AND_GET_SESSION (session_index, &session); - - 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; + if (PREDICT_FALSE (!buf)) + return VPPCOM_EINVAL; - if (PREDICT_FALSE (session->is_vep)) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - clib_warning ("VCL<%d>: ERROR: sid %u: cannot " - "read from an epoll session!", getpid (), session_index); - rv = VPPCOM_EBADFD; - goto done; - } + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || s->is_vep)) + return VPPCOM_EBADFD; - if (PREDICT_FALSE (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN)))) + if (PREDICT_FALSE (!vcl_session_is_readable (s))) { - clib_spinlock_unlock (&vcm->sessions_lockp); + session_state_t state = s->session_state; rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - if (VPPCOM_DEBUG > 0) - clib_warning ("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; + VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: %s session is not open! " + "state 0x%x (%s), returning %d (%s)", + getpid (), s->vpp_handle, session_handle, state, + vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); + return rv; } - clib_spinlock_unlock (&vcm->sessions_lockp); - - do - { - if (peek) - n_read = svm_fifo_peek (rx_fifo, 0, n, buf); - else - n_read = svm_fifo_dequeue_nowait (rx_fifo, n, buf); - } - while (!is_nonblocking && (n_read <= 0)); + is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + is_ct = vcl_session_is_ct (s); + mq = is_ct ? s->our_evt_q : wrk->app_event_queue; + rx_fifo = s->rx_fifo; + s->has_rx_evt = 0; - if (n_read <= 0) + if (svm_fifo_is_empty (rx_fifo)) { - VCL_LOCK_AND_GET_SESSION (session_index, &session); - - poll_et = (((EPOLLET | EPOLLIN) & session->vep.ev.events) == - (EPOLLET | EPOLLIN)); - if (poll_et) - session->vep.et_mask |= EPOLLIN; - - if (state & STATE_CLOSE_ON_EMPTY) + if (is_nonblocking) { - rv = VPPCOM_ECONNRESET; + svm_fifo_unset_event (rx_fifo); + return VPPCOM_EWOULDBLOCK; + } + while (svm_fifo_is_empty (rx_fifo)) + { + svm_fifo_unset_event (rx_fifo); + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) + svm_msg_q_wait (mq); - if (VPPCOM_DEBUG > 1) + svm_msg_q_sub_w_lock (mq, &msg); + e = svm_msg_q_msg_data (mq, &msg); + svm_msg_q_unlock (mq); + if (!vcl_is_rx_evt_for_session (e, s->session_index, is_ct)) { - clib_warning ("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)); + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (mq, &msg); + continue; } + svm_msg_q_free_msg (mq, &msg); - session->state = STATE_DISCONNECT; + if (PREDICT_FALSE (s->session_state == STATE_CLOSE_ON_EMPTY)) + return 0; } - else - rv = VPPCOM_EAGAIN; - - clib_spinlock_unlock (&vcm->sessions_lockp); } + + if (s->is_dgram) + n_read = app_recv_dgram_raw (rx_fifo, buf, n, &s->transport, 0, peek); else - rv = n_read; + n_read = app_recv_stream_raw (rx_fifo, buf, n, 0, peek); + + if (svm_fifo_is_empty (rx_fifo)) + svm_fifo_unset_event (rx_fifo); - if (VPPCOM_DEBUG > 2) + if (is_ct && svm_fifo_want_tx_evt (rx_fifo)) { - 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_set_want_tx_evt (s->rx_fifo, 0); + app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo, SESSION_IO_EVT_CT_RX, + SVM_Q_WAIT); } -done: - return rv; + + VDBG (2, "VCL<%d>: vpp handle 0x%llx, sid %u: read %d bytes from (%p)", + getpid (), s->vpp_handle, session_handle, n_read, rx_fifo); + + 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_segments_t ds) { - 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, rv, is_nonblocking; + vcl_session_t *s = 0; + svm_fifo_t *rx_fifo; + svm_msg_q_msg_t msg; + session_event_t *e; + svm_msg_q_t *mq; + u8 is_ct; - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - if (PREDICT_FALSE (session->is_vep)) - { - clib_warning ("VCL<%d>: ERROR: sid %u: cannot read from an " - "epoll session!", getpid (), session_index); - rv = VPPCOM_EBADFD; - goto done; - } + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || s->is_vep)) + return VPPCOM_EBADFD; - if (session->state & STATE_LISTEN) + if (PREDICT_FALSE (!vcl_session_is_readable (s))) { - clib_spinlock_lock (&vcm->session_fifo_lockp); - ready = clib_fifo_elts (vcm->client_session_index_fifo); - clib_spinlock_unlock (&vcm->session_fifo_lockp); + session_state_t state = s->session_state; + rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); + return rv; } - else - { - if (!(state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN | STATE_LISTEN))) - { - rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : - VPPCOM_ENOTCONN); - - if (VPPCOM_DEBUG > 1) - clib_warning ("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; - } - ready = svm_fifo_max_dequeue (session->rx_fifo); - } + is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + is_ct = vcl_session_is_ct (s); + mq = is_ct ? s->our_evt_q : wrk->app_event_queue; + rx_fifo = s->rx_fifo; + s->has_rx_evt = 0; - if (ready == 0) + if (svm_fifo_is_empty (rx_fifo)) { - poll_et = - ((EPOLLET | EPOLLIN) & session->vep.ev.events) == (EPOLLET | EPOLLIN); - if (poll_et) - session->vep.et_mask |= EPOLLIN; - - if (state & STATE_CLOSE_ON_EMPTY) + if (is_nonblocking) + { + svm_fifo_unset_event (rx_fifo); + return VPPCOM_EWOULDBLOCK; + } + while (svm_fifo_is_empty (rx_fifo)) { - rv = VPPCOM_ECONNRESET; + svm_fifo_unset_event (rx_fifo); + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) + svm_msg_q_wait (mq); - if (VPPCOM_DEBUG > 1) + svm_msg_q_sub_w_lock (mq, &msg); + e = svm_msg_q_msg_data (mq, &msg); + svm_msg_q_unlock (mq); + if (!vcl_is_rx_evt_for_session (e, s->session_index, is_ct)) { - clib_warning ("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)); + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (mq, &msg); + continue; } - session->state = STATE_DISCONNECT; - goto done; + svm_msg_q_free_msg (mq, &msg); + + if (PREDICT_FALSE (s->session_state == STATE_CLOSE_ON_EMPTY)) + return 0; } } - 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; - for (i = 0; i < n_to_dequeue; i++) - svm_queue_sub_raw (vcm->app_event_queue, (u8 *) & e); + n_read = svm_fifo_segments (rx_fifo, (svm_fifo_segment_t *) ds); + svm_fifo_unset_event (rx_fifo); - pthread_mutex_unlock (&vcm->app_event_queue->mutex); + if (is_ct && n_read + svm_fifo_max_dequeue (rx_fifo) == rx_fifo->nitems) + { + /* If the peer is not polling send notification */ + if (!svm_fifo_has_event (s->rx_fifo)) + app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo, + SESSION_IO_EVT_CT_RX, SVM_Q_WAIT); } -done: - return rv; + + return n_read; } -int -vppcom_session_write (uint32_t session_index, void *buf, size_t n) +void +vppcom_session_free_segments (uint32_t session_handle, + vppcom_data_segments_t ds) { - 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; - - ASSERT (buf); + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s; - VCL_LOCK_AND_GET_SESSION (session_index, &session); + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || s->is_vep)) + return; - 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; + svm_fifo_segments_free (s->rx_fifo, (svm_fifo_segment_t *) ds); +} +static inline int +vppcom_session_read_ready (vcl_session_t * session) +{ + /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ if (PREDICT_FALSE (session->is_vep)) { - clib_spinlock_unlock (&vcm->sessions_lockp); - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " - "cannot write to an epoll session!", - getpid (), vpp_handle, session_index); + clib_warning ("VCL<%d>: ERROR: sid %u: cannot read from an " + "epoll session!", getpid (), session->session_index); + return VPPCOM_EBADFD; + } - rv = VPPCOM_EBADFD; - goto done; + if (PREDICT_FALSE (!(session->session_state & (STATE_OPEN | STATE_LISTEN)))) + { + session_state_t state = session->session_state; + int rv; + + rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); + + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session is not open!" + " state 0x%x (%s), returning %d (%s)", getpid (), + session->vpp_handle, session->session_index, state, + vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); + return rv; } - if (!(session->state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))) + if (session->session_state & STATE_LISTEN) + return clib_fifo_elts (session->accept_evts_fifo); + + return svm_fifo_max_dequeue (session->rx_fifo); +} + +int +vppcom_data_segment_copy (void *buf, vppcom_data_segments_t ds, u32 max_bytes) +{ + u32 first_copy = clib_min (ds[0].len, max_bytes); + clib_memcpy_fast (buf, ds[0].data, first_copy); + if (first_copy < max_bytes) { - rv = - ((session->state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : - VPPCOM_ENOTCONN); - - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("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; + clib_memcpy_fast (buf + first_copy, ds[1].data, + clib_min (ds[1].len, max_bytes - first_copy)); } + return 0; +} + +static u8 +vcl_is_tx_evt_for_session (session_event_t * e, u32 sid, u8 is_ct) +{ + if (!is_ct) + return (e->event_type == FIFO_EVENT_APP_TX + && e->fifo->client_session_index == sid); + else + return (e->event_type == SESSION_IO_EVT_CT_RX); +} + +int +vppcom_session_write (uint32_t session_handle, void *buf, size_t n) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + int rv, n_write, is_nonblocking; + vcl_session_t *s = 0; + svm_fifo_t *tx_fifo = 0; + session_evt_type_t et; + svm_msg_q_msg_t msg; + session_event_t *e; + svm_msg_q_t *mq; + u8 is_ct; + + if (PREDICT_FALSE (!buf)) + return VPPCOM_EINVAL; - clib_spinlock_unlock (&vcm->sessions_lockp); + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s)) + return VPPCOM_EBADFD; + + if (PREDICT_FALSE (s->is_vep)) + { + clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " + "cannot write to an epoll session!", + getpid (), s->vpp_handle, session_handle); - do - { - n_write = svm_fifo_enqueue_nowait (tx_fifo, n, (void *) buf); + return VPPCOM_EBADFD; } - while (!is_nonblocking && (n_write <= 0)); - /* If event wasn't set, add one */ - if ((n_write > 0) && svm_fifo_set_event (tx_fifo)) + if (PREDICT_FALSE (!(s->session_state & STATE_OPEN))) { - /* Fabricate TX event, send to vpp */ - evt.fifo = tx_fifo; - evt.event_type = FIFO_EVENT_APP_TX; - - VCL_LOCK_AND_GET_SESSION (session_index, &session); - q = session->vpp_event_queue; - ASSERT (q); - svm_queue_add (q, (u8 *) & evt, 0 /* do wait for mutex */ ); - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("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); + session_state_t state = s->session_state; + rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session is not open! " + "state 0x%x (%s)", getpid (), s->vpp_handle, session_handle, + state, vppcom_session_state_str (state)); + return rv; } - if (n_write <= 0) + tx_fifo = s->tx_fifo; + is_ct = vcl_session_is_ct (s); + is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + mq = is_ct ? s->our_evt_q : wrk->app_event_queue; + if (svm_fifo_is_full (tx_fifo)) { - VCL_LOCK_AND_GET_SESSION (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) + if (is_nonblocking) + { + return VPPCOM_EWOULDBLOCK; + } + while (svm_fifo_is_full (tx_fifo)) { - rv = VPPCOM_ECONNRESET; + svm_fifo_set_want_tx_evt (tx_fifo, 1); + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) + svm_msg_q_wait (mq); - if (VPPCOM_DEBUG > 1) - { - clib_warning ("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)); - } + svm_msg_q_sub_w_lock (mq, &msg); + e = svm_msg_q_msg_data (mq, &msg); + svm_msg_q_unlock (mq); - session->state = STATE_DISCONNECT; + if (!vcl_is_tx_evt_for_session (e, s->session_index, is_ct)) + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (mq, &msg); } - else - rv = VPPCOM_EAGAIN; - - clib_spinlock_unlock (&vcm->sessions_lockp); } + + ASSERT (FIFO_EVENT_APP_TX + 1 == SESSION_IO_EVT_CT_TX); + et = FIFO_EVENT_APP_TX + vcl_session_is_ct (s); + if (s->is_dgram) + n_write = app_send_dgram_raw (tx_fifo, &s->transport, + s->vpp_evt_q, buf, n, et, SVM_Q_WAIT); else - rv = n_write; + n_write = app_send_stream_raw (tx_fifo, s->vpp_evt_q, buf, n, et, + SVM_Q_WAIT); + + ASSERT (n_write > 0); + + VDBG (2, "VCL<%d>: vpp handle 0x%llx, sid %u: wrote %d bytes", getpid (), + s->vpp_handle, session_handle, n_write); - if (VPPCOM_DEBUG > 2) + return n_write; +} + +static vcl_session_t * +vcl_ct_session_get_from_fifo (vcl_worker_t * wrk, svm_fifo_t * f, u8 type) +{ + vcl_session_t *s; + s = vcl_session_get (wrk, f->client_session_index); + if (s) { - 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); + /* rx fifo */ + if (type == 0 && s->rx_fifo == f) + return s; + /* tx fifo */ + if (type == 1 && s->tx_fifo == f) + return s; } -done: - return rv; + s = vcl_session_get (wrk, f->master_session_index); + if (s) + { + if (type == 0 && s->rx_fifo == f) + return s; + if (type == 1 && s->tx_fifo == f) + return s; + } + return 0; } static inline int -vppcom_session_write_ready (session_t * session, u32 session_index) +vppcom_session_write_ready (vcl_session_t * session) { - int ready; - u32 poll_et; - int rv; - - ASSERT (session); - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ if (PREDICT_FALSE (session->is_vep)) { clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " "cannot write to an epoll session!", - getpid (), session->vpp_handle, session_index); - rv = VPPCOM_EBADFD; - goto done; + getpid (), session->vpp_handle, session->session_index); + return VPPCOM_EBADFD; } - if (PREDICT_FALSE (session->state & STATE_LISTEN)) + if (PREDICT_FALSE (session->session_state & STATE_LISTEN)) { 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; + getpid (), session->vpp_handle, session->session_index); + return VPPCOM_EBADFD; } - if (!(session->state & (SERVER_STATE_OPEN | CLIENT_STATE_OPEN))) + if (PREDICT_FALSE (!(session->session_state & STATE_OPEN))) { - session_state_t state = session->state; + session_state_t state = session->session_state; + int rv; rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " "session is not open! state 0x%x (%s), " "returning %d (%s)", getpid (), session->vpp_handle, - session_index, + session->session_index, state, vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); - goto done; + return rv; } - ready = svm_fifo_max_enqueue (session->tx_fifo); + VDBG (3, "VCL<%d>: vpp handle 0x%llx, sid %u: peek %s (%p), ready = %d", + getpid (), session->vpp_handle, session->session_index, + session->tx_fifo, svm_fifo_max_enqueue (session->tx_fifo)); - if (VPPCOM_DEBUG > 3) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "peek %s (%p), ready = %d", getpid (), - session->vpp_handle, session_index, - session->tx_fifo, ready); + return svm_fifo_max_enqueue (session->tx_fifo); +} + +static inline int +vcl_mq_dequeue_batch (vcl_worker_t * wrk, svm_msg_q_t * mq) +{ + svm_msg_q_msg_t *msg; + u32 n_msgs; + int i; - if (ready == 0) + n_msgs = svm_msg_q_size (mq); + for (i = 0; i < n_msgs; i++) { - poll_et = (((EPOLLET | EPOLLOUT) & session->vep.ev.events) == - (EPOLLET | EPOLLOUT)); - if (poll_et) - session->vep.et_mask |= EPOLLOUT; + vec_add2 (wrk->mq_msg_vector, msg, 1); + svm_msg_q_sub_w_lock (mq, msg); + } + return n_msgs; +} + +#define vcl_fifo_rx_evt_valid_or_break(_fifo) \ +if (PREDICT_FALSE (svm_fifo_is_empty (_fifo))) \ + { \ + svm_fifo_unset_event (_fifo); \ + if (svm_fifo_is_empty (_fifo)) \ + break; \ + } \ + +static void +vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, + unsigned long n_bits, unsigned long *read_map, + unsigned long *write_map, + unsigned long *except_map, u32 * bits_set) +{ + session_disconnected_msg_t *disconnected_msg; + session_connected_msg_t *connected_msg; + session_accepted_msg_t *accepted_msg; + vcl_session_msg_t *vcl_msg; + vcl_session_t *session; + u64 handle; + u32 sid; + + switch (e->event_type) + { + case FIFO_EVENT_APP_RX: + vcl_fifo_rx_evt_valid_or_break (e->fifo); + sid = e->fifo->client_session_index; + session = vcl_session_get (wrk, sid); + if (!session) + break; + if (sid < n_bits && read_map) + { + clib_bitmap_set_no_check (read_map, sid, 1); + *bits_set += 1; + } + break; + case FIFO_EVENT_APP_TX: + sid = e->fifo->client_session_index; + session = vcl_session_get (wrk, sid); + if (!session) + break; + if (sid < n_bits && write_map) + { + clib_bitmap_set_no_check (write_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_IO_EVT_CT_TX: + vcl_fifo_rx_evt_valid_or_break (e->fifo); + session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 0); + if (!session) + break; + sid = session->session_index; + if (sid < n_bits && read_map) + { + clib_bitmap_set_no_check (read_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_IO_EVT_CT_RX: + session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 1); + if (!session) + break; + sid = session->session_index; + if (sid < n_bits && write_map) + { + clib_bitmap_set_no_check (write_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_CTRL_EVT_ACCEPTED: + accepted_msg = (session_accepted_msg_t *) e->data; + handle = accepted_msg->listener_handle; + session = vcl_session_table_lookup_listener (wrk, handle); + if (!session) + { + clib_warning ("VCL<%d>: ERROR: couldn't find listen session:" + "listener handle %llx", getpid (), handle); + break; + } - if (session->state & STATE_CLOSE_ON_EMPTY) + clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); + vcl_msg->accepted_msg = *accepted_msg; + sid = session->session_index; + if (sid < n_bits && read_map) { - rv = VPPCOM_ECONNRESET; + clib_bitmap_set_no_check (read_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_CTRL_EVT_CONNECTED: + connected_msg = (session_connected_msg_t *) e->data; + vcl_session_connected_handler (wrk, connected_msg); + break; + case SESSION_CTRL_EVT_DISCONNECTED: + disconnected_msg = (session_disconnected_msg_t *) e->data; + sid = vcl_session_index_from_vpp_handle (wrk, disconnected_msg->handle); + if (sid < n_bits && except_map) + { + clib_bitmap_set_no_check (except_map, sid, 1); + *bits_set += 1; + } + break; + case SESSION_CTRL_EVT_RESET: + sid = vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + if (sid < n_bits && except_map) + { + clib_bitmap_set_no_check (except_map, sid, 1); + *bits_set += 1; + } + break; + default: + clib_warning ("unhandled: %u", e->event_type); + break; + } +} + +static int +vcl_select_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, + unsigned long n_bits, unsigned long *read_map, + unsigned long *write_map, unsigned long *except_map, + double time_to_wait, u32 * bits_set) +{ + svm_msg_q_msg_t *msg; + session_event_t *e; + u32 i; - if (VPPCOM_DEBUG > 1) + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) + { + if (*bits_set) + { + svm_msg_q_unlock (mq); + return 0; + } + + if (!time_to_wait) + { + svm_msg_q_unlock (mq); + return 0; + } + else if (time_to_wait < 0) + { + svm_msg_q_wait (mq); + } + else + { + if (svm_msg_q_timedwait (mq, time_to_wait)) { - clib_warning ("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)); + svm_msg_q_unlock (mq); + return 0; } - session->state = STATE_DISCONNECT; - goto done; } } - rv = ready; -done: - return rv; + vcl_mq_dequeue_batch (wrk, mq); + svm_msg_q_unlock (mq); + + for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) + { + msg = vec_elt_at_index (wrk->mq_msg_vector, i); + e = svm_msg_q_msg_data (mq, msg); + vcl_select_handle_mq_event (wrk, e, n_bits, read_map, write_map, + except_map, bits_set); + svm_msg_q_free_msg (mq, msg); + } + vec_reset_length (wrk->mq_msg_vector); + return *bits_set; +} + +static int +vppcom_select_condvar (vcl_worker_t * wrk, unsigned long n_bits, + unsigned long *read_map, unsigned long *write_map, + unsigned long *except_map, double time_to_wait, + u32 * bits_set) +{ + double total_wait = 0, wait_slice; + vcl_cut_through_registration_t *cr; + + time_to_wait = (time_to_wait == -1) ? 10e9 : time_to_wait; + wait_slice = wrk->cut_through_registrations ? 10e-6 : time_to_wait; + do + { + vcl_ct_registration_lock (wrk); + /* *INDENT-OFF* */ + pool_foreach (cr, wrk->cut_through_registrations, ({ + vcl_select_handle_mq (wrk, cr->mq, n_bits, read_map, write_map, except_map, + 0, bits_set); + })); + /* *INDENT-ON* */ + vcl_ct_registration_unlock (wrk); + + vcl_select_handle_mq (wrk, wrk->app_event_queue, n_bits, read_map, + write_map, except_map, time_to_wait, bits_set); + total_wait += wait_slice; + if (*bits_set) + return *bits_set; + } + while (total_wait < time_to_wait); + + return 0; +} + +static int +vppcom_select_eventfd (vcl_worker_t * wrk, unsigned long n_bits, + unsigned long *read_map, unsigned long *write_map, + unsigned long *except_map, double time_to_wait, + u32 * bits_set) +{ + 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++) + { + 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); + } + + return (n_mq_evts > 0 ? (int) *bits_set : 0); } int @@ -3492,176 +1945,113 @@ 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)); + u32 sid, minbits = clib_max (n_bits, BITS (uword)), bits_set = 0; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; + int rv, i; ASSERT (sizeof (clib_bitmap_t) == sizeof (long int)); 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)); + clib_bitmap_validate (wrk->rd_bitmap, minbits); + clib_memcpy_fast (wrk->rd_bitmap, read_map, + vec_len (wrk->rd_bitmap) * sizeof (clib_bitmap_t)); + memset (read_map, 0, vec_len (wrk->rd_bitmap) * sizeof (clib_bitmap_t)); } if (n_bits && write_map) { - clib_bitmap_validate (vcm->wr_bitmap, minbits); - clib_memcpy (vcm->wr_bitmap, write_map, - vec_len (vcm->wr_bitmap) * sizeof (clib_bitmap_t)); + clib_bitmap_validate (wrk->wr_bitmap, minbits); + clib_memcpy_fast (wrk->wr_bitmap, write_map, + vec_len (wrk->wr_bitmap) * sizeof (clib_bitmap_t)); memset (write_map, 0, - vec_len (vcm->wr_bitmap) * sizeof (clib_bitmap_t)); + vec_len (wrk->wr_bitmap) * sizeof (clib_bitmap_t)); } if (n_bits && except_map) { - clib_bitmap_validate (vcm->ex_bitmap, minbits); - clib_memcpy (vcm->ex_bitmap, except_map, - vec_len (vcm->ex_bitmap) * sizeof (clib_bitmap_t)); + clib_bitmap_validate (wrk->ex_bitmap, minbits); + clib_memcpy_fast (wrk->ex_bitmap, except_map, + vec_len (wrk->ex_bitmap) * sizeof (clib_bitmap_t)); memset (except_map, 0, - vec_len (vcm->ex_bitmap) * sizeof (clib_bitmap_t)); + vec_len (wrk->ex_bitmap) * sizeof (clib_bitmap_t)); } - do + if (!n_bits) + return 0; + + if (!write_map) + goto check_rd; + + /* *INDENT-OFF* */ + clib_bitmap_foreach (sid, wrk->wr_bitmap, ({ + if (!(session = vcl_session_get (wrk, sid))) + { + VDBG (0, "VCL<%d>: session %d specified in write_map is closed.", + getpid (), sid); + return VPPCOM_EBADFD; + } + + rv = svm_fifo_is_full (session->tx_fifo); + if (!rv) + { + clib_bitmap_set_no_check (write_map, sid, 1); + bits_set++; + } + })); + +check_rd: + if (!read_map) + goto check_mq; + + clib_bitmap_foreach (sid, wrk->rd_bitmap, ({ + if (!(session = vcl_session_get (wrk, sid))) + { + VDBG (0, "VCL<%d>: session %d specified in write_map is closed.", + getpid (), sid); + return VPPCOM_EBADFD; + } + + rv = vppcom_session_read_ready (session); + if (rv) + { + clib_bitmap_set_no_check (read_map, sid, 1); + bits_set++; + } + })); + /* *INDENT-ON* */ + +check_mq: + + for (i = 0; i < vec_len (wrk->unhandled_evts_vector); i++) { - /* *INDENT-OFF* */ - if (n_bits) - { - if (read_map) - { - clib_bitmap_foreach (session_index, vcm->rd_bitmap, - ({ - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (rv < 0) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("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); - clib_spinlock_unlock (&vcm->sessions_lockp); - 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, - ({ - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (rv < 0) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("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); - clib_spinlock_unlock (&vcm->sessions_lockp); - 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, - ({ - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (rv < 0) - { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 1) - clib_warning ("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); - clib_spinlock_unlock (&vcm->sessions_lockp); - 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_idx) { - session_t *session; + vcl_session_t *session; vppcom_epoll_t *vep; - int rv; u32 sid = vep_idx; if (VPPCOM_DEBUG <= 1) return; /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - rv = vppcom_session_at_index (vep_idx, &session); - if (PREDICT_FALSE (rv)) + session = vcl_session_get (wrk, vep_idx); + if (PREDICT_FALSE (!session)) { clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", getpid (), vep_idx); @@ -3682,13 +2072,13 @@ vep_verify_epoll_chain (u32 vep_idx) " wait_cont_idx = 0x%x (%u)\n" "}\n", getpid (), vep_idx, session->is_vep, session->is_vep_session, - vep->next_sid, vep->next_sid, + vep->next_sh, vep->next_sh, session->wait_cont_idx, session->wait_cont_idx); - for (sid = vep->next_sid; sid != ~0; sid = vep->next_sid) + for (sid = vep->next_sh; sid != ~0; sid = vep->next_sh) { - rv = vppcom_session_at_index (sid, &session); - if (PREDICT_FALSE (rv)) + session = vcl_session_get (wrk, sid); + if (PREDICT_FALSE (!session)) { clib_warning ("VCL<%d>: ERROR: Invalid sid (%u)!", getpid (), sid); goto done; @@ -3703,10 +2093,10 @@ vep_verify_epoll_chain (u32 vep_idx) goto done; } vep = &session->vep; - if (PREDICT_FALSE (vep->vep_idx != vep_idx)) + if (PREDICT_FALSE (vep->vep_sh != vep_idx)) clib_warning ("VCL<%d>: ERROR: session (%u) vep_idx (%u) != " "vep_idx (%u)!", getpid (), - sid, session->vep.vep_idx, vep_idx); + sid, session->vep.vep_sh, vep_idx); if (session->is_vep_session) { clib_warning ("vep_idx[%u]: sid 0x%x (%u)\n" @@ -3719,9 +2109,9 @@ vep_verify_epoll_chain (u32 vep_idx) " 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->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); } } @@ -3734,107 +2124,68 @@ done: int vppcom_epoll_create (void) { - session_t *vep_session; - u32 vep_idx; - elog_track_t vep_elog_track; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *vep_session; - clib_spinlock_lock (&vcm->sessions_lockp); - pool_get (vcm->sessions, vep_session); - memset (vep_session, 0, sizeof (*vep_session)); - vep_idx = vep_session - vcm->sessions; + vep_session = vcl_session_alloc (wrk); 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->vep.vep_sh = ~0; + vep_session->vep.next_sh = ~0; + vep_session->vep.prev_sh = ~0; vep_session->wait_cont_idx = ~0; vep_session->vpp_handle = ~0; - vep_session->poll_reg = 0; - - if (VPPCOM_DEBUG > 0) - { - vep_session->elog_track.name = - (char *) format (0, "C:%d:VEP:%d%c", vcm->my_client_index, - vep_idx, 0); - elog_track_register (&vcm->elog_main, &vep_session->elog_track); - vep_elog_track = vep_session->elog_track; - } - - clib_spinlock_unlock (&vcm->sessions_lockp); - - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: Created vep_idx %u / sid %u!", - getpid (), vep_idx, vep_idx); - if (VPPCOM_DEBUG > 0) - { - - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "created epoll session:%d", - .format_args = "i4", - }; - - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vep_elog_track); - ed->data = vep_idx; - /* *INDENT-ON* */ - } + vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_sh); + VDBG (0, "VCL<%d>: Created vep_idx %u / sid %u!", + getpid (), vep_session->session_index, vep_session->session_index); - 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 (); + vcl_session_t *vep_session; + vcl_session_t *session; + int rv = VPPCOM_OK; - if (vep_idx == session_index) + if (vep_handle == session_handle) { clib_warning ("VCL<%d>: ERROR: vep_idx == session_index (%u)!", - getpid (), vep_idx); + getpid (), vep_handle); return VPPCOM_EINVAL; } - clib_spinlock_lock (&vcm->sessions_lockp); - 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; + clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", vep_handle); + return VPPCOM_EBADFD; } if (PREDICT_FALSE (!vep_session->is_vep)) { clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", - getpid (), vep_idx); - rv = VPPCOM_EINVAL; - goto done; + getpid (), 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)) + session = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!session)) { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: ERROR: Invalid session_index (%u)!", - getpid (), session_index); - goto done; + VDBG (0, "VCL<%d>: ERROR: Invalid session_handle (%u)!", + getpid (), session_handle); + return VPPCOM_EBADFD; } if (PREDICT_FALSE (session->is_vep)) { - clib_warning ("ERROR: session_index (%u) is a vep!", vep_idx); - rv = VPPCOM_EINVAL; - goto done; + clib_warning ("ERROR: session_handle (%u) is a vep!", vep_handle); + return VPPCOM_EINVAL; } switch (op) @@ -3844,70 +2195,36 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, { clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_ADD: NULL pointer to " "epoll_event structure!", getpid ()); - rv = VPPCOM_EINVAL; - goto done; + return VPPCOM_EINVAL; } - 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; + getpid (), 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; } - session->vep.next_sid = vep_session->vep.next_sid; - session->vep.prev_sid = vep_idx; - session->vep.vep_idx = vep_idx; + session->vep.next_sh = vep_session->vep.next_sh; + session->vep.prev_sh = vep_handle; + session->vep.vep_sh = vep_handle; session->vep.et_mask = VEP_DEFAULT_ET_MASK; session->vep.ev = *event; session->is_vep = 0; session->is_vep_session = 1; - vep_session->vep.next_sid = session_index; + vep_session->vep.next_sh = session_handle; - /* VCL Event Register handler */ - if (session->state & STATE_LISTEN) - { - /* 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 */ ); - } - if (VPPCOM_DEBUG > 1) - clib_warning ("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); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "epoll_ctladd: events:%x data:%x", - .format_args = "i4i4i8", - }; - struct - { - u32 events; - u64 event_data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->events = event->events; - ed->event_data = event->data.u64; - /* *INDENT-ON* */ - } + VDBG (1, "VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, sid %u, events 0x%x, " + "data 0x%llx!", getpid (), vep_handle, session_handle, + event->events, event->data.u64); + vcl_evt (VCL_EVT_EPOLL_CTLADD, session, event->events, event->data.u64); break; case EPOLL_CTL_MOD: @@ -3921,114 +2238,87 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, else if (PREDICT_FALSE (!session->is_vep_session)) { clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: " - "not a vep session!", getpid (), session_index); + "not a vep session!", getpid (), session_handle); rv = VPPCOM_EINVAL; goto done; } - else if (PREDICT_FALSE (session->vep.vep_idx != vep_idx)) + else if (PREDICT_FALSE (session->vep.vep_sh != vep_handle)) { clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_MOD: " "vep_idx (%u) != vep_idx (%u)!", - getpid (), session_index, - session->vep.vep_idx, vep_idx); + getpid (), session_handle, + session->vep.vep_sh, vep_handle); rv = VPPCOM_EINVAL; goto done; } session->vep.et_mask = VEP_DEFAULT_ET_MASK; session->vep.ev = *event; - if (VPPCOM_DEBUG > 1) - clib_warning - ("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); + VDBG (1, "VCL<%d>: EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x," + " data 0x%llx!", getpid (), vep_handle, session_handle, + event->events, event->data.u64); break; case EPOLL_CTL_DEL: if (PREDICT_FALSE (!session->is_vep_session)) { clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: " - "not a vep session!", getpid (), session_index); + "not a vep session!", getpid (), session_handle); rv = VPPCOM_EINVAL; goto done; } - else if (PREDICT_FALSE (session->vep.vep_idx != vep_idx)) + else if (PREDICT_FALSE (session->vep.vep_sh != vep_handle)) { clib_warning ("VCL<%d>: ERROR: sid %u EPOLL_CTL_DEL: " "vep_idx (%u) != vep_idx (%u)!", - getpid (), session_index, - session->vep.vep_idx, vep_idx); + getpid (), session_handle, + session->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; + (vep_session->wait_cont_idx == session_handle) ? + session->vep.next_sh : vep_session->wait_cont_idx; - if (session->vep.prev_sid == vep_idx) - vep_session->vep.next_sid = session->vep.next_sid; + if (session->vep.prev_sh == vep_handle) + vep_session->vep.next_sh = session->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, session->vep.prev_sh); + if (PREDICT_FALSE (!prev_session)) { clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_DEL: Invalid " "vep.prev_sid (%u) on sid (%u)!", - getpid (), session->vep.prev_sid, session_index); - goto done; + getpid (), session->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 = session->vep.next_sh; } - if (session->vep.next_sid != ~0) + if (session->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, session->vep.next_sh); + if (PREDICT_FALSE (!next_session)) { clib_warning ("VCL<%d>: ERROR: EPOLL_CTL_DEL: Invalid " "vep.next_sid (%u) on sid (%u)!", - getpid (), session->vep.next_sid, session_index); - goto done; + getpid (), session->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 = session->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->vep.next_sh = ~0; + session->vep.prev_sh = ~0; + session->vep.vep_sh = ~0; session->is_vep_session = 0; - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: EPOLL_CTL_DEL: vep_idx %u, sid %u!", - getpid (), vep_idx, session_index); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "epoll_ctldel: vep:%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->data = vep_idx; - /* *INDENT-ON* */ - } + VDBG (1, "VCL<%d>: EPOLL_CTL_DEL: vep_idx %u, sid %u!", + getpid (), vep_handle, session_handle); + vcl_evt (VCL_EVT_EPOLL_CTLDEL, session, vep_sh); break; default: @@ -4036,333 +2326,332 @@ vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index, rv = VPPCOM_EINVAL; } - vep_verify_epoll_chain (vep_idx); + vep_verify_epoll_chain (wrk, vep_handle); done: - clib_spinlock_unlock (&vcm->sessions_lockp); return rv; } -int -vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, - int maxevents, double wait_for_time) -{ - session_t *vep_session; - elog_track_t vep_elog_track; - 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; +static inline void +vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, + struct epoll_event *events, u32 * num_ev) +{ + session_disconnected_msg_t *disconnected_msg; + session_connected_msg_t *connected_msg; + session_accepted_msg_t *accepted_msg; + u64 session_evt_data = ~0, handle; + u32 sid = ~0, session_events; + vcl_session_msg_t *vcl_msg; + vcl_session_t *session; + u8 add_event = 0; + + switch (e->event_type) + { + case FIFO_EVENT_APP_RX: + ASSERT (e->fifo->client_thread_index == vcl_get_worker_index ()); + vcl_fifo_rx_evt_valid_or_break (e->fifo); + sid = e->fifo->client_session_index; + session = vcl_session_get (wrk, sid); + session_events = session->vep.ev.events; + if (!(EPOLLIN & session->vep.ev.events) || session->has_rx_evt) + break; + add_event = 1; + events[*num_ev].events |= EPOLLIN; + session_evt_data = session->vep.ev.data.u64; + session->has_rx_evt = 1; + break; + case FIFO_EVENT_APP_TX: + sid = e->fifo->client_session_index; + session = vcl_session_get (wrk, sid); + session_events = session->vep.ev.events; + if (!(EPOLLOUT & session_events)) + break; + add_event = 1; + events[*num_ev].events |= EPOLLOUT; + session_evt_data = session->vep.ev.data.u64; + break; + case SESSION_IO_EVT_CT_TX: + vcl_fifo_rx_evt_valid_or_break (e->fifo); + session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 0); + sid = session->session_index; + session_events = session->vep.ev.events; + if (!(EPOLLIN & session->vep.ev.events) || session->has_rx_evt) + break; + add_event = 1; + events[*num_ev].events |= EPOLLIN; + session_evt_data = session->vep.ev.data.u64; + session->has_rx_evt = 1; + break; + case SESSION_IO_EVT_CT_RX: + session = vcl_ct_session_get_from_fifo (wrk, e->fifo, 1); + sid = session->session_index; + session_events = session->vep.ev.events; + if (!(EPOLLOUT & session_events)) + break; + add_event = 1; + events[*num_ev].events |= EPOLLOUT; + session_evt_data = session->vep.ev.data.u64; + break; + case SESSION_CTRL_EVT_ACCEPTED: + accepted_msg = (session_accepted_msg_t *) e->data; + handle = accepted_msg->listener_handle; + session = vcl_session_table_lookup_listener (wrk, handle); + if (!session) + { + clib_warning ("VCL<%d>: ERROR: couldn't find listen session:" + "listener handle %llx", getpid (), handle); + break; + } - if (PREDICT_FALSE (maxevents <= 0)) - { - clib_warning ("VCL<%d>: ERROR: Invalid maxevents (%d)!", - getpid (), maxevents); - return VPPCOM_EINVAL; - } - memset (events, 0, sizeof (*events) * maxevents); + clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); + vcl_msg->accepted_msg = *accepted_msg; + session_events = session->vep.ev.events; + if (!(EPOLLIN & session_events)) + break; - VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session); - vep_next_sid = vep_session->vep.next_sid; - is_vep = vep_session->is_vep; - wait_cont_idx = vep_session->wait_cont_idx; - vep_elog_track = vep_session->elog_track; - clib_spinlock_unlock (&vcm->sessions_lockp); + add_event = 1; + events[*num_ev].events |= EPOLLIN; + session_evt_data = session->vep.ev.data.u64; + break; + case SESSION_CTRL_EVT_CONNECTED: + connected_msg = (session_connected_msg_t *) e->data; + vcl_session_connected_handler (wrk, connected_msg); + /* Generate EPOLLOUT because there's no connected event */ + sid = vcl_session_index_from_vpp_handle (wrk, connected_msg->handle); + session = vcl_session_get (wrk, sid); + session_events = session->vep.ev.events; + if (EPOLLOUT & session_events) + { + add_event = 1; + events[*num_ev].events |= EPOLLOUT; + session_evt_data = session->vep.ev.data.u64; + } + break; + case SESSION_CTRL_EVT_DISCONNECTED: + disconnected_msg = (session_disconnected_msg_t *) e->data; + sid = vcl_session_index_from_vpp_handle (wrk, disconnected_msg->handle); + if (!(session = vcl_session_get (wrk, sid))) + break; + add_event = 1; + events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; + session_evt_data = session->vep.ev.data.u64; + session_events = session->vep.ev.events; + break; + case SESSION_CTRL_EVT_RESET: + sid = vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + if (!(session = vcl_session_get (wrk, sid))) + break; + add_event = 1; + events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; + session_evt_data = session->vep.ev.data.u64; + session_events = session->vep.ev.events; + break; + default: + VDBG (0, "unhandled: %u", e->event_type); + break; + } - if (PREDICT_FALSE (!is_vep)) + if (add_event) { - clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", - getpid (), vep_idx); - rv = VPPCOM_EINVAL; - goto done; + events[*num_ev].data.u64 = session_evt_data; + if (EPOLLONESHOT & session_events) + { + session = vcl_session_get (wrk, sid); + session->vep.ev.events = 0; + } + *num_ev += 1; } - if (PREDICT_FALSE (vep_next_sid == ~0)) +} + +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; + + if (vec_len (wrk->mq_msg_vector) && svm_msg_q_is_empty (mq)) + goto handle_dequeued; + + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) { - if (VPPCOM_DEBUG > 1) - clib_warning ("VCL<%d>: WARNING: vep_idx (%u) is empty!", - getpid (), vep_idx); - if (VPPCOM_DEBUG > 1) + if (!wait_for_time) + { + svm_msg_q_unlock (mq); + return 0; + } + else if (wait_for_time < 0) + { + svm_msg_q_wait (mq); + } + else { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = + if (svm_msg_q_timedwait (mq, wait_for_time / 1e3)) { - .format = "WRN: vep_idx:%d empty", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vep_elog_track); - - ed->data = vep_idx; - /* *INDENT-ON* */ + svm_msg_q_unlock (mq); + return 0; + } } - goto done; } + vcl_mq_dequeue_batch (wrk, mq); + svm_msg_q_unlock (mq); - do +handle_dequeued: + for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { - u32 sid; - u32 next_sid = ~0; - session_t *session; - elog_track_t session_elog_track; + msg = vec_elt_at_index (wrk->mq_msg_vector, i); + e = svm_msg_q_msg_data (mq, msg); + if (*num_ev < maxevents) + vcl_epoll_wait_handle_mq_event (wrk, e, events, num_ev); + else + vec_add1 (wrk->unhandled_evts_vector, *e); + svm_msg_q_free_msg (mq, msg); + } + vec_reset_length (wrk->mq_msg_vector); - for (sid = (wait_cont_idx == ~0) ? vep_next_sid : wait_cont_idx; - sid != ~0; sid = next_sid) - { - u32 session_events, et_mask, clear_et_mask, session_vep_idx; - u8 add_event, is_vep_session; - int ready; - u64 session_ev_data; - - VCL_LOCK_AND_GET_SESSION (sid, &session); - next_sid = session->vep.next_sid; - session_events = session->vep.ev.events; - et_mask = session->vep.et_mask; - is_vep = session->is_vep; - is_vep_session = session->is_vep_session; - session_vep_idx = session->vep.vep_idx; - session_ev_data = session->vep.ev.data.u64; - - if (VPPCOM_DEBUG > 0) - { - session_elog_track = session->elog_track; - } + return *num_ev; +} + +static int +vppcom_epoll_wait_condvar (vcl_worker_t * wrk, struct epoll_event *events, + int maxevents, u32 n_evts, double wait_for_time) +{ + vcl_cut_through_registration_t *cr; + double total_wait = 0, wait_slice; + int rv; + + wait_for_time = (wait_for_time == -1) ? (double) 10e9 : wait_for_time; + wait_slice = wrk->cut_through_registrations ? 10e-6 : wait_for_time; + + do + { + vcl_ct_registration_lock (wrk); + /* *INDENT-OFF* */ + pool_foreach (cr, wrk->cut_through_registrations, ({ + vcl_epoll_wait_handle_mq (wrk, cr->mq, events, maxevents, 0, &n_evts); + })); + /* *INDENT-ON* */ + vcl_ct_registration_unlock (wrk); - clib_spinlock_unlock (&vcm->sessions_lockp); + rv = vcl_epoll_wait_handle_mq (wrk, wrk->app_event_queue, events, + maxevents, n_evts ? 0 : wait_slice, + &n_evts); + if (rv) + total_wait += wait_slice; + if (n_evts) + return n_evts; + } + while (total_wait < wait_for_time); + return n_evts; +} - if (PREDICT_FALSE (is_vep)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: ERROR: sid (%u) is a vep!", - getpid (), vep_idx); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "ERR:vep_idx:%d is vep", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - - ed->data = vep_idx; - /* *INDENT-ON* */ - } +static int +vppcom_epoll_wait_eventfd (vcl_worker_t * wrk, struct epoll_event *events, + int maxevents, u32 n_evts, double wait_for_time) +{ + vcl_mq_evt_conn_t *mqc; + int __clib_unused n_read; + int n_mq_evts, i; + u64 buf; - rv = VPPCOM_EINVAL; - goto done; - } - if (PREDICT_FALSE (!is_vep_session)) - { - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: ERROR: session (%u) is not " - "a vep session!", getpid (), sid); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "ERR:SID:%d not vep", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session_elog_track); - - ed->data = sid; - /* *INDENT-ON* */ - } + vec_validate (wrk->mq_events, pool_elts (wrk->mq_evt_conns)); +again: + n_mq_evts = epoll_wait (wrk->mqs_epfd, wrk->mq_events, + vec_len (wrk->mq_events), wait_for_time); + for (i = 0; i < n_mq_evts; i++) + { + mqc = vcl_mq_evt_conn_get (wrk, wrk->mq_events[i].data.u32); + n_read = read (mqc->mq_fd, &buf, sizeof (buf)); + vcl_epoll_wait_handle_mq (wrk, mqc->mq, events, maxevents, 0, &n_evts); + } + if (!n_evts && n_mq_evts > 0) + goto again; - 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; - } + return (int) n_evts; +} - add_event = clear_et_mask = 0; +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 (EPOLLIN & session_events) - { - VCL_LOCK_AND_GET_SESSION (sid, &session); - ready = vppcom_session_read_ready (session, sid); - clib_spinlock_unlock (&vcm->sessions_lockp); - 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 (PREDICT_FALSE (maxevents <= 0)) + { + clib_warning ("VCL<%d>: ERROR: Invalid maxevents (%d)!", + getpid (), maxevents); + return VPPCOM_EINVAL; + } - default: - events[num_ev].events |= EPOLLERR; - break; - } - } - } + vep_session = vcl_session_get_w_handle (wrk, vep_handle); + if (!vep_session) + return VPPCOM_EBADFD; - if (EPOLLOUT & session_events) - { - VCL_LOCK_AND_GET_SESSION (sid, &session); - ready = vppcom_session_write_ready (session, sid); - clib_spinlock_unlock (&vcm->sessions_lockp); - 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; + if (PREDICT_FALSE (!vep_session->is_vep)) + { + clib_warning ("VCL<%d>: ERROR: vep_idx (%u) is not a vep!", + getpid (), vep_handle); + return VPPCOM_EINVAL; + } - default: - events[num_ev].events |= EPOLLERR; - break; - } - } - } + memset (events, 0, sizeof (*events) * maxevents); - if (add_event) - { - events[num_ev].data.u64 = session_ev_data; - if (EPOLLONESHOT & session_events) - { - VCL_LOCK_AND_GET_SESSION (sid, &session); - session->vep.ev.events = 0; - clib_spinlock_unlock (&vcm->sessions_lockp); - } - num_ev++; - if (num_ev == maxevents) - { - VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session); - vep_session->wait_cont_idx = next_sid; - clib_spinlock_unlock (&vcm->sessions_lockp); - goto done; - } - } - if (wait_cont_idx != ~0) + if (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; + i += 1; + break; } } - if (wait_for_time != -1) - keep_trying = (clib_time_now (&vcm->clib_time) <= timeout) ? 1 : 0; - } - while ((num_ev == 0) && keep_trying); - if (wait_cont_idx != ~0) - { - VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session); - vep_session->wait_cont_idx = ~0; - clib_spinlock_unlock (&vcm->sessions_lockp); + vec_delete (wrk->unhandled_evts_vector, i, 0); } -done: - return (rv != VPPCOM_OK) ? rv : num_ev; + + if (vcm->cfg.use_mq_eventfd) + return vppcom_epoll_wait_eventfd (wrk, events, maxevents, n_evts, + wait_for_time); + + return vppcom_epoll_wait_condvar (wrk, events, maxevents, n_evts, + wait_for_time); } 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; + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; int rv = VPPCOM_OK; u32 *flags = buffer; vppcom_endpt_t *ep = buffer; - VCL_LOCK_AND_GET_SESSION (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); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_NREAD: sid %u, nread = %d", - getpid (), rv); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_NREAD: nread=%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->data = rv; - /* *INDENT-ON* */ - } - + rv = vppcom_session_read_ready (session); + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_NREAD: sid %u, nread = %d", + getpid (), rv); break; case VPPCOM_ATTR_GET_NWRITE: - rv = vppcom_session_write_ready (session, session_index); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_NWRITE: sid %u, nwrite = %d", - getpid (), session_index, rv); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_NWRITE: nwrite=%d", - .format_args = "i4", - }; - struct - { - u32 data; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->data = rv; - /* *INDENT-ON* */ - } + rv = vppcom_session_write_ready (session); + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_NWRITE: sid %u, nwrite = %d", + getpid (), session_handle, rv); break; case VPPCOM_ATTR_GET_FLAGS: @@ -4371,33 +2660,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, *flags = O_RDWR | (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); *buflen = sizeof (*flags); - if (VPPCOM_DEBUG > 2) - clib_warning ("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)); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_FLAGS: flags=%x is_nonblk=%d", - .format_args = "i4i4", - }; - struct - { - u32 flags; - u32 is_nonblk; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->flags = *flags; - ed->is_nonblk = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK); - /* *INDENT-ON* */ - } - + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_FLAGS: sid %u, flags = 0x%08x, " + "is_nonblocking = %u", getpid (), + session_handle, *flags, + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); } else rv = VPPCOM_EINVAL; @@ -4411,32 +2677,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK); - if (VPPCOM_DEBUG > 2) - clib_warning ("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)); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_FLAGS: flags=%x is_nonblk=%d", - .format_args = "i4i4", - }; - struct - { - u32 flags; - u32 is_nonblk; - } *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->flags = *flags; - ed->is_nonblk = VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK); - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_FLAGS: sid %u, flags = 0x%08x," + " is_nonblocking = %u", + getpid (), session_handle, *flags, + VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); } else rv = VPPCOM_EINVAL; @@ -4446,63 +2690,21 @@ 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); - if (VPPCOM_DEBUG > 1) - clib_warning ("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, ep->is_ip4, - clib_net_to_host_u16 (ep->port)); - if (VPPCOM_DEBUG > 0) - { - if (ep->is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_PEER_ADDR: addr:%d.%d.%d.%d:%d", - .format_args = "i1i1i1i1i2", - }; - CLIB_PACKED (struct { - u8 addr[4]; //4 - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->addr[0] = session->peer_addr.ip46.ip4.as_u8[0]; - ed->addr[1] = session->peer_addr.ip46.ip4.as_u8[1]; - ed->addr[2] = session->peer_addr.ip46.ip4.as_u8[2]; - ed->addr[3] = session->peer_addr.ip46.ip4.as_u8[3]; - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - else - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_PEER_ADDR: addr:IP6:%d", - .format_args = "i2", - }; - CLIB_PACKED (struct { - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - } + VDBG (1, "VCL<%d>: VPPCOM_ATTR_GET_PEER_ADDR: sid %u, is_ip4 = %u, " + "addr = %U, port %u", getpid (), + session_handle, ep->is_ip4, format_ip46_address, + &session->transport.rmt_ip, + ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (ep->port)); } else rv = VPPCOM_EINVAL; @@ -4512,63 +2714,21 @@ 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); - if (VPPCOM_DEBUG > 1) - clib_warning ("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, ep->is_ip4, - clib_net_to_host_u16 (ep->port)); - if (VPPCOM_DEBUG > 0) - { - if (ep->is_ip4) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_LCL_ADDR: addr:%d.%d.%d.%d:%d", - .format_args = "i1i1i1i1i2", - }; - CLIB_PACKED (struct { - u8 addr[4]; //4 - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->addr[0] = session->lcl_addr.ip46.ip4.as_u8[0]; - ed->addr[1] = session->lcl_addr.ip46.ip4.as_u8[1]; - ed->addr[2] = session->lcl_addr.ip46.ip4.as_u8[2]; - ed->addr[3] = session->lcl_addr.ip46.ip4.as_u8[3]; - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - else - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_LCL_ADDR: addr:IP6:%d", - .format_args = "i2", - }; - CLIB_PACKED (struct { - u16 port; //2 - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->port = clib_net_to_host_u16 (session->peer_port); - /* *INDENT-ON* */ - } - } + VDBG (1, "VCL<%d>: VPPCOM_ATTR_GET_LCL_ADDR: sid %u, is_ip4 = %u," + " addr = %U port %d", getpid (), + session_handle, ep->is_ip4, format_ip46_address, + &session->transport.lcl_ip, + ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (ep->port)); } else rv = VPPCOM_EINVAL; @@ -4576,26 +2736,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, case VPPCOM_ATTR_GET_LIBC_EPFD: rv = session->libc_epfd; - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d", - getpid (), rv); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd=%d", - .format_args = "i4", - }; - CLIB_PACKED (struct { - i32 data; - }) *ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data = session->libc_epfd; - /* *INDENT-ON* */ - } - + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LIBC_EPFD: libc_epfd %d", + getpid (), rv); break; case VPPCOM_ATTR_SET_LIBC_EPFD: @@ -4605,32 +2747,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, session->libc_epfd = *(int *) buffer; *buflen = sizeof (session->libc_epfd); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd %d, " - "buflen %d", getpid (), session->libc_epfd, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd=%s%d buflen=%d", - .format_args = "t1i4i4", - .n_enum_strings = 2, - .enum_strings = {"", "-",}, - }; - CLIB_PACKED (struct { - u8 sign; - u32 data[2]; - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - - ed->sign = (session->libc_epfd < 0); - ed->data[0] = abs(session->libc_epfd); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_LIBC_EPFD: libc_epfd %d, " + "buflen %d", getpid (), session->libc_epfd, *buflen); } else rv = VPPCOM_EINVAL; @@ -4639,34 +2757,12 @@ 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); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_PROTOCOL: %d (%s), " - "buflen %d", getpid (), *(int *) buffer, - *(int *) buffer ? "UDP" : "TCP", *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_PROTOCOL: %s buflen=%d", - .format_args = "t1i4", - .n_enum_strings = 2, - .enum_strings = {"TCP", "UDP",}, - }; - - CLIB_PACKED (struct { - u8 proto; - u32 buflen; - }) * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->proto = session->proto; - ed->buflen = *(int *) buffer; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_PROTOCOL: %d (%s), buflen %d", + getpid (), *(int *) buffer, *(int *) buffer ? "UDP" : "TCP", + *buflen); } else rv = VPPCOM_EINVAL; @@ -4679,27 +2775,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_LISTEN); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_LISTEN: %d, " - "buflen %d", getpid (), *(int *) buffer, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_LISTEN: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_LISTEN: %d, buflen %d", + getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4711,28 +2788,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, *(int *) buffer = 0; *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_ERROR: %d, " - "buflen %d, #VPP-TBD#", getpid (), - *(int *) buffer, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_ERROR: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_ERROR: %d, buflen %d, #VPP-TBD#", + getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4748,28 +2805,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, vcm->cfg.tx_fifo_size); *buflen = sizeof (u32); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - *(size_t *) buffer, *(size_t *) buffer, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TX_FIFO_LEN: 0x%x buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(size_t *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TX_FIFO_LEN: %u (0x%x), " + "buflen %d, #VPP-TBD#", getpid (), + *(size_t *) buffer, *(size_t *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4780,29 +2818,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ session->sndbuf_size = *(u32 *) buffer; - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - session->sndbuf_size, session->sndbuf_size, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TX_FIFO_LEN: 0x%x buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = session->sndbuf_size; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TX_FIFO_LEN: %u (0x%x), " + "buflen %d, #VPP-TBD#", getpid (), + session->sndbuf_size, session->sndbuf_size, *buflen); } else rv = VPPCOM_EINVAL; @@ -4818,28 +2836,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, vcm->cfg.rx_fifo_size); *buflen = sizeof (u32); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_RX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - *(size_t *) buffer, *(size_t *) buffer, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_RX_FIFO_LEN: 0x%x buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(size_t *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_RX_FIFO_LEN: %u (0x%x), " + "buflen %d, #VPP-TBD#", getpid (), + *(size_t *) buffer, *(size_t *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4850,29 +2849,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, { /* VPP-TBD */ session->rcvbuf_size = *(u32 *) buffer; - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_RX_FIFO_LEN: %u (0x%x), " - "buflen %d, #VPP-TBD#", getpid (), - session->sndbuf_size, session->sndbuf_size, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_RX_FIFO_LEN: 0x%x buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = session->sndbuf_size; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_RX_FIFO_LEN: %u (0x%x), " + "buflen %d, #VPP-TBD#", getpid (), + session->sndbuf_size, session->sndbuf_size, *buflen); } else rv = VPPCOM_EINVAL; @@ -4886,28 +2865,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_REUSEADDR); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_REUSEADDR: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_REUSEADDR: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEADDR: %d, " + "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4923,31 +2882,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEADDR); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_REUSEADDR: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEADDR), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_REUSEADDR: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEADDR); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + 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); } else rv = VPPCOM_EINVAL; @@ -4961,28 +2899,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_REUSEPORT); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_REUSEPORT: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_REUSEPORT: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_REUSEPORT: %d, buflen %d," + " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -4998,31 +2916,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEPORT); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_REUSEPORT: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEPORT), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_REUSEPORT: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEPORT); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_REUSEPORT: %d, buflen %d," + " #VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_REUSEPORT), *buflen); } else rv = VPPCOM_EINVAL; @@ -5036,28 +2933,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_BROADCAST); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_BROADCAST: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_BROADCAST: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_BROADCAST: %d, buflen %d," + " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5072,31 +2949,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_BROADCAST); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_BROADCAST: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_BROADCAST), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_BROADCAST: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_BROADCAST); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_BROADCAST: %d, buflen %d, " + "#VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_BROADCAST), *buflen); } else rv = VPPCOM_EINVAL; @@ -5110,28 +2966,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_V6ONLY); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_V6ONLY: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_V6ONLY: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_V6ONLY: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5146,30 +2982,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_V6ONLY); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_V6ONLY: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_V6ONLY), *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_V6ONLY: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_V6ONLY); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_V6ONLY: %d, buflen %d, " + "#VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_V6ONLY), *buflen); } else rv = VPPCOM_EINVAL; @@ -5183,28 +2999,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_KEEPALIVE); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_KEEPALIVE: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_KEEPALIVE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_KEEPALIVE: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5219,31 +3015,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_KEEPALIVE); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_KEEPALIVE: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_KEEPALIVE), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_KEEPALIVE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_KEEPALIVE); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + 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); } else rv = VPPCOM_EINVAL; @@ -5257,28 +3032,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_TCP_NODELAY); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_NODELAY: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TCP_NODELAY: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_NODELAY: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5293,31 +3048,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_NODELAY); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_NODELAY: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_NODELAY), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TCP_NODELAY: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_NODELAY); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + 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); } else rv = VPPCOM_EINVAL; @@ -5331,28 +3065,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_TCP_KEEPIDLE); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5367,31 +3081,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE); - if (VPPCOM_DEBUG > 2) - clib_warning ("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); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPIDLE); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d, buflen %d, " + "#VPP-TBD#", getpid (), + VCL_SESS_ATTR_TEST (session->attr, + VCL_SESS_ATTR_TCP_KEEPIDLE), *buflen); } else rv = VPPCOM_EINVAL; @@ -5405,28 +3098,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VCL_SESS_ATTR_TCP_KEEPINTVL); *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, buflen %d, " + "#VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5441,31 +3114,10 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, else VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d, " - "buflen %d, #VPP-TBD#", getpid (), - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPINTVL), - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPINTVL); - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + 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); } else rv = VPPCOM_EINVAL; @@ -5478,28 +3130,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, *(u32 *) buffer = session->user_mss; *buflen = sizeof (int); - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_USER_MSS: %d, " - "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer, - *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_GET_TCP_USER_MSS: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = *(int *) buffer; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_TCP_USER_MSS: %d, buflen %d," + " #VPP-TBD#", getpid (), *(int *) buffer, *buflen); } else rv = VPPCOM_EINVAL; @@ -5511,28 +3143,8 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, /* VPP-TBD */ session->user_mss = *(u32 *) buffer; - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_USER_MSS: %u, " - "buflen %d, #VPP-TBD#", getpid (), - session->user_mss, *buflen); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "VPPCOM_ATTR_SET_TCP_USER_MSS: %d buflen=%d", - .format_args = "i4i4", - }; - - struct { - u32 data[2]; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track); - ed->data[0] = session->user_mss; - ed->data[1] = *buflen; - /* *INDENT-ON* */ - } + VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_TCP_USER_MSS: %u, buflen %d, " + "#VPP-TBD#", getpid (), session->user_mss, *buflen); } else rv = VPPCOM_EINVAL; @@ -5543,78 +3155,56 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, break; } -done: - clib_spinlock_unlock (&vcm->sessions_lockp); 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 (); int rv = VPPCOM_OK; - session_t *session = 0; + vcl_session_t *session = 0; if (ep) { - clib_spinlock_lock (&vcm->sessions_lockp); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) + session = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!session)) { - clib_spinlock_unlock (&vcm->sessions_lockp); - if (VPPCOM_DEBUG > 0) - clib_warning ("VCL<%d>: invalid session, " - "sid (%u) has been closed!", - getpid (), session_index); - if (VPPCOM_DEBUG > 0) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "invalid session: %d closed", - .format_args = "i4", - }; - - struct { - u32 data; - } * ed; - - ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track); - ed->data = session_index; - /* *INDENT-ON* */ - } - rv = VPPCOM_EBADFD; - clib_spinlock_unlock (&vcm->sessions_lockp); - goto done; + VDBG (0, "VCL<%d>: invalid session, sid (%u) has been closed!", + getpid (), session_handle); + return VPPCOM_EBADFD; } - ep->is_ip4 = session->peer_addr.is_ip4; - ep->port = session->peer_port; - if (session->peer_addr.is_ip4) - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip4, - sizeof (ip4_address_t)); - else - clib_memcpy (ep->ip, &session->peer_addr.ip46.ip6, - sizeof (ip6_address_t)); - clib_spinlock_unlock (&vcm->sessions_lockp); + ep->is_ip4 = session->transport.is_ip4; + ep->port = session->transport.rmt_port; } 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; + return VPPCOM_EAFNOSUPPORT; + } + + if (ep) + { + 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)); } -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) @@ -5629,50 +3219,60 @@ vppcom_session_sendto (uint32_t session_index, void *buffer, if (flags) { // TBD check the flags and do the right thing - if (VPPCOM_DEBUG > 2) - clib_warning ("VCL<%d>: handling flags 0x%u (%d) " - "not implemented yet.", getpid (), flags, flags); + VDBG (2, "VCL<%d>: handling flags 0x%u (%d) not implemented yet.", + getpid (), flags, flags); } - return (vppcom_session_write (session_index, buffer, buflen)); + return (vppcom_session_write (session_handle, buffer, buflen)); } 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; - if (VPPCOM_DEBUG > 3) - clib_warning ("VCL<%d>: vp %p, nsids %u, wait_for_time %f", - getpid (), vp, n_sids, wait_for_time); + VDBG (3, "VCL<%d>: vp %p, nsids %u, wait_for_time %f", + getpid (), vp, n_sids, wait_for_time); if (!vp) return VPPCOM_EFAULT; do { - 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_LOCK_AND_GET_SESSION (vp[i].sid, &session); - clib_spinlock_unlock (&vcm->sessions_lockp); + for (i = 0; i < n_sids; i++) + { + session = vcl_session_get (wrk, vp[i].sid); + 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_LOCK_AND_GET_SESSION (vp[i].sid, &session); - rv = vppcom_session_read_ready (session, vp[i].sid); - clib_spinlock_unlock (&vcm->sessions_lockp); + rv = vppcom_session_read_ready (session); if (rv > 0) { - *vp[i].revents |= POLLIN; + vp[i].revents |= POLLIN; num_ev++; } else if (rv < 0) @@ -5680,11 +3280,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++; @@ -5693,12 +3293,10 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) if (POLLOUT & vp[i].events) { - VCL_LOCK_AND_GET_SESSION (vp[i].sid, &session); - rv = vppcom_session_write_ready (session, vp[i].sid); - clib_spinlock_unlock (&vcm->sessions_lockp); + rv = vppcom_session_write_ready (session); if (rv > 0) { - *vp[i].revents |= POLLOUT; + vp[i].revents |= POLLOUT; num_ev++; } else if (rv < 0) @@ -5706,26 +3304,25 @@ 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++; } } - if (0) // Note "done:" label used by VCL_LOCK_AND_GET_SESSION() + 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); @@ -5736,12 +3333,33 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) { 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); + vp[i].events, vp[i].revents); } } return num_ev; } +int +vppcom_mq_epoll_fd (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + return wrk->mqs_epfd; +} + +int +vppcom_session_index (uint32_t session_handle) +{ + return session_handle & 0xFFFFFF; +} + +int +vppcom_worker_register (void) +{ + if (vcl_worker_alloc_and_init ()) + return VPPCOM_OK; + return VPPCOM_EEXIST; +} + /* * fd.io coding-style-patch-verification: ON *