X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=f20167226e8c23a9b68475cf3da620090a2882aa;hp=29936aa5207c035ae00f96c465e7de6f7002e0b6;hb=c1f5a43;hpb=60f1fc1c17f4e15b8a64ad0b0626e88603790eb7 diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index 29936aa5207..f20167226e8 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -17,10 +17,11 @@ #include #include #include -#include #include #include +__thread uword __vcl_worker_index = ~0; + static u8 not_ready; void @@ -63,37 +64,6 @@ again: signal (SIGSEGV, SIG_DFL); } -static const char * -vppcom_app_state_str (app_state_t state) -{ - char *st; - - switch (state) - { - 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; - - default: - st = "UNKNOWN_APP_STATE"; - break; - } - - return st; -} - const char * vppcom_session_state_str (session_state_t state) { @@ -224,28 +194,14 @@ format_ip46_address (u8 * s, va_list * args) * VPPCOM Utility Functions */ -static inline void -vppcom_session_table_del_listener (u64 listener_handle) -{ - listener_handle |= 1ULL << 63; - hash_unset (vcm->session_index_by_vpp_handles, listener_handle); -} -static inline int -vppcom_wait_for_app_state_change (app_state_t app_state) +static svm_msg_q_t * +vcl_session_vpp_evt_q (vcl_worker_t * wrk, vcl_session_t * s) { - f64 timeout = clib_time_now (&vcm->clib_time) + vcm->cfg.app_timeout; - - while (clib_time_now (&vcm->clib_time) < timeout) - { - if (vcm->app_state == app_state) - return VPPCOM_OK; - } - VDBG (0, "VCL<%d>: timeout waiting for state %s (%d)", getpid (), - vppcom_app_state_str (app_state), app_state); - vcl_evt (VCL_EVT_SESSION_TIMEOUT, vcm, app_state); - - return VPPCOM_ETIMEDOUT; + if (vcl_session_is_ct (s)) + return wrk->vpp_event_queues[0]; + else + return wrk->vpp_event_queues[s->tx_fifo->master_thread_index]; } static void @@ -277,20 +233,32 @@ vcl_send_session_disconnected_reply (svm_msg_q_t * mq, u32 context, app_send_ctrl_evt_to_vpp (mq, app_evt); } +static void +vcl_send_session_reset_reply (svm_msg_q_t * mq, u32 context, + session_handle_t handle, int retval) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_reset_reply_msg_t *rmp; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_RESET_REPLY); + rmp = (session_reset_reply_msg_t *) app_evt->evt->data; + rmp->handle = handle; + rmp->context = context; + rmp->retval = retval; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} + static u32 -vcl_session_accepted_handler (session_accepted_msg_t * mp) +vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp) { vcl_session_t *session, *listen_session; svm_fifo_t *rx_fifo, *tx_fifo; - u32 session_index, vpp_wrk_index; + u32 vpp_wrk_index; svm_msg_q_t *evt_q; - VCL_SESSION_LOCK (); - - session = vcl_session_alloc (); - session_index = vcl_session_index (session); + session = vcl_session_alloc (wrk); - listen_session = vppcom_session_table_lookup_listener (mp->listener_handle); + listen_session = vcl_session_table_lookup_listener (wrk, + mp->listener_handle); if (!listen_session) { svm_msg_q_t *evt_q; @@ -300,8 +268,7 @@ vcl_session_accepted_handler (session_accepted_msg_t * mp) getpid (), mp->listener_handle); vcl_send_session_accepted_reply (evt_q, mp->context, mp->handle, VNET_API_ERROR_INVALID_ARGUMENT); - vcl_session_free (session); - VCL_SESSION_UNLOCK (); + vcl_session_free (wrk, session); return VCL_INVALID_SESSION_INDEX; } @@ -315,22 +282,25 @@ vcl_session_accepted_handler (session_accepted_msg_t * mp) 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_index; - tx_fifo->master_session_index = session_index; - vec_validate (vcm->vpp_event_queues, 0); + 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 *); - vcm->vpp_event_queues[0] = evt_q; + wrk->vpp_event_queues[0] = evt_q; } else { session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); - rx_fifo->client_session_index = session_index; - tx_fifo->client_session_index = session_index; - + 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 (vcm->vpp_event_queues, vpp_wrk_index); - vcm->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; + vec_validate (wrk->vpp_event_queues, vpp_wrk_index); + wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; } session->vpp_handle = mp->handle; @@ -341,65 +311,60 @@ vcl_session_accepted_handler (session_accepted_msg_t * mp) session->session_state = STATE_ACCEPT; session->transport.rmt_port = mp->port; session->transport.is_ip4 = mp->is_ip4; - clib_memcpy (&session->transport.rmt_ip, mp->ip, sizeof (ip46_address_t)); + clib_memcpy_fast (&session->transport.rmt_ip, mp->ip, + sizeof (ip46_address_t)); - hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index); + vcl_session_table_add_vpp_handle (wrk, mp->handle, session->session_index); session->transport.lcl_port = listen_session->transport.lcl_port; session->transport.lcl_ip = listen_session->transport.lcl_ip; session->session_type = listen_session->session_type; session->is_dgram = session->session_type == VPPCOM_PROTO_UDP; VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: client accept request from %s" - " address %U port %d queue %p!", getpid (), mp->handle, session_index, + " 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); - VCL_SESSION_UNLOCK (); - return session_index; + return session->session_index; } static u32 -vcl_session_connected_handler (session_connected_msg_t * mp) +vcl_session_connected_handler (vcl_worker_t * wrk, + session_connected_msg_t * mp) { u32 session_index, vpp_wrk_index; svm_fifo_t *rx_fifo, *tx_fifo; vcl_session_t *session = 0; svm_msg_q_t *evt_q; - int rv = VPPCOM_OK; session_index = mp->context; - VCL_SESSION_LOCK_AND_GET (session_index, &session); -done: + 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: vpp handle 0x%llx, sid %u: " - "connect failed! %U", - getpid (), mp->handle, session_index, - format_api_error, ntohl (mp->retval)); - if (session) - { - session->session_state = STATE_FAILED; - session->vpp_handle = mp->handle; - } - else - { - clib_warning ("[%s] ERROR: vpp handle 0x%llx, sid %u: " - "Invalid session index (%u)!", - getpid (), mp->handle, session_index); - } - goto done_unlock; + 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; } - if (rv) - goto done_unlock; - rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); vcl_wait_for_memory (rx_fifo); rx_fifo->client_session_index = session_index; tx_fifo->client_session_index = session_index; + rx_fifo->client_thread_index = vcl_get_worker_index (); + tx_fifo->client_thread_index = vcl_get_worker_index (); if (mp->client_event_queue_address) { @@ -408,42 +373,113 @@ done: session->our_evt_q = uword_to_pointer (mp->client_event_queue_address, svm_msg_q_t *); - vec_validate (vcm->vpp_event_queues, 0); + vec_validate (wrk->vpp_event_queues, 0); evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); - vcm->vpp_event_queues[0] = evt_q; + wrk->vpp_event_queues[0] = evt_q; } else { session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); vpp_wrk_index = tx_fifo->master_thread_index; - vec_validate (vcm->vpp_event_queues, vpp_wrk_index); - vcm->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; + vec_validate (wrk->vpp_event_queues, vpp_wrk_index); + wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; } session->rx_fifo = rx_fifo; session->tx_fifo = tx_fifo; session->vpp_handle = mp->handle; session->transport.is_ip4 = mp->is_ip4; - clib_memcpy (&session->transport.lcl_ip, mp->lcl_ip, - sizeof (session->transport.lcl_ip)); + 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; /* Add it to lookup table */ - hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index); + hash_set (wrk->session_index_by_vpp_handles, mp->handle, session_index); VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: connect succeeded! " "session_rx_fifo %p, refcnt %d, session_tx_fifo %p, refcnt %d", getpid (), mp->handle, session_index, session->rx_fifo, session->rx_fifo->refcnt, session->tx_fifo, session->tx_fifo->refcnt); -done_unlock: - VCL_SESSION_UNLOCK (); + return session_index; } -int -vcl_handle_mq_ctrl_event (session_event_t * e) +static u32 +vcl_session_reset_handler (vcl_worker_t * wrk, + session_reset_msg_t * reset_msg) +{ + vcl_session_t *session; + u32 sid; + + sid = vcl_session_index_from_vpp_handle (wrk, reset_msg->handle); + session = vcl_session_get (wrk, sid); + if (!session) + { + VDBG (0, "request to reset unknown handle 0x%llx", reset_msg->handle); + return VCL_INVALID_SESSION_INDEX; + } + 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 u32 +vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) +{ + vcl_session_t *session; + u32 sid = mp->context; + + session = vcl_session_get (wrk, sid); + if (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->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, sid); + return VCL_INVALID_SESSION_INDEX; + } + } + + session->vpp_handle = mp->handle; + session->transport.is_ip4 = mp->lcl_is_ip4; + clib_memcpy_fast (&session->transport.lcl_ip, mp->lcl_ip, + sizeof (ip46_address_t)); + session->transport.lcl_port = mp->lcl_port; + vcl_session_table_add_listener (wrk, mp->handle, sid); + session->session_state = STATE_LISTEN; + + if (session->is_dgram) + { + svm_fifo_t *rx_fifo, *tx_fifo; + session->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); + rx_fifo = uword_to_pointer (mp->rx_fifo, svm_fifo_t *); + rx_fifo->client_session_index = sid; + tx_fifo = uword_to_pointer (mp->tx_fifo, svm_fifo_t *); + tx_fifo->client_session_index = sid; + session->rx_fifo = rx_fifo; + session->tx_fifo = tx_fifo; + } + + VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!", + getpid (), mp->handle, sid); + return sid; +} + +static int +vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) { session_accepted_msg_t *accepted_msg; session_disconnected_msg_t *disconnected_msg; @@ -455,14 +491,15 @@ vcl_handle_mq_ctrl_event (session_event_t * e) switch (e->event_type) { case FIFO_EVENT_APP_RX: - clib_warning ("unhandled rx: sid %u (0x%x)", - e->fifo->client_session_index, - e->fifo->client_session_index); + 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 = vppcom_session_table_lookup_listener (handle); + session = vcl_session_table_lookup_listener (wrk, handle); if (!session) { clib_warning ("VCL<%d>: ERROR: couldn't find listen session:" @@ -474,14 +511,28 @@ vcl_handle_mq_ctrl_event (session_event_t * e) vcl_msg->accepted_msg = *accepted_msg; break; case SESSION_CTRL_EVT_CONNECTED: - vcl_session_connected_handler ((session_connected_msg_t *) e->data); + 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_get_index_from_handle (disconnected_msg->handle); - session = vcl_session_get (sid); + 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 %u", sid); + 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); @@ -494,40 +545,35 @@ vppcom_wait_for_session_state_change (u32 session_index, session_state_t state, f64 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; vcl_session_t *volatile session; svm_msg_q_msg_t msg; session_event_t *e; - int rv; do { - VCL_SESSION_LOCK (); - rv = vppcom_session_at_index (session_index, &session); - if (PREDICT_FALSE (rv)) + session = vcl_session_get (wrk, session_index); + if (PREDICT_FALSE (!session)) { - VCL_SESSION_UNLOCK (); - return rv; + return VPPCOM_EBADFD; } if (session->session_state & state) { - VCL_SESSION_UNLOCK (); return VPPCOM_OK; } if (session->session_state & STATE_FAILED) { - VCL_SESSION_UNLOCK (); return VPPCOM_ECONNREFUSED; } - VCL_SESSION_UNLOCK (); - if (svm_msg_q_sub (vcm->app_event_queue, &msg, SVM_Q_NOWAIT, 0)) + if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_NOWAIT, 0)) continue; - e = svm_msg_q_msg_data (vcm->app_event_queue, &msg); - vcl_handle_mq_ctrl_event (e); - svm_msg_q_free_msg (vcm->app_event_queue, &msg); + e = svm_msg_q_msg_data (wrk->app_event_queue, &msg); + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); } - while (clib_time_now (&vcm->clib_time) < timeout); + while (clib_time_now (&wrk->clib_time) < timeout); VDBG (0, "VCL<%d>: timeout waiting for state 0x%x (%s)", getpid (), state, vppcom_session_state_str (state)); @@ -544,7 +590,7 @@ vppcom_app_session_enable (void) if (vcm->app_state != STATE_APP_ENABLED) { vppcom_send_session_enable_disable (1 /* is_enabled == TRUE */ ); - rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); + rv = vcl_wait_for_app_state_change (STATE_APP_ENABLED); if (PREDICT_FALSE (rv)) { VDBG (0, "VCL<%d>: application session enable timed out! " @@ -561,7 +607,7 @@ vppcom_app_attach (void) int rv; vppcom_app_send_attach (); - rv = vppcom_wait_for_app_state_change (STATE_APP_ATTACHED); + 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)", @@ -573,84 +619,119 @@ vppcom_app_attach (void) } static int -vppcom_session_unbind (u32 session_index) +vppcom_session_unbind (u32 session_handle) { + vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *session = 0; - int rv; u64 vpp_handle; - VCL_SESSION_LOCK_AND_GET (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->session_state = STATE_DISCONNECT; - VCL_SESSION_UNLOCK (); - VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending unbind msg! new state" - " 0x%x (%s)", getpid (), vpp_handle, session_index, STATE_DISCONNECT, + " 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; -} - -static svm_msg_q_t * -vcl_session_vpp_evt_q (vcl_session_t * s) -{ - if (vcl_session_is_ct (s)) - return vcm->vpp_event_queues[0]; - else - return vcm->vpp_event_queues[s->tx_fifo->master_thread_index]; + return VPPCOM_OK; } static int -vppcom_session_disconnect (u32 session_index) +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; - int rv; - VCL_SESSION_LOCK_AND_GET (session_index, &session); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; vpp_handle = session->vpp_handle; state = session->session_state; - VCL_SESSION_UNLOCK (); VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u state 0x%x (%s)", getpid (), - vpp_handle, session_index, state, vppcom_session_state_str (state)); + 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; } if (state & STATE_CLOSE_ON_EMPTY) { - vpp_evt_q = vcl_session_vpp_evt_q (session); + 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_index); + "REPLY...", getpid (), vpp_handle, session_handle); } else { VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: sending disconnect...", - getpid (), vpp_handle, session_index); - vppcom_send_disconnect_session (vpp_handle, session_index); + getpid (), vpp_handle, session_handle); + vppcom_send_disconnect_session (vpp_handle); } -done: - return rv; + return VPPCOM_OK; +} + +static void +vcl_cleanup_bapi (void) +{ + api_main_t *am = &api_main; + + 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 (); +} + +void +vcl_app_fork_child_handler (void) +{ + u8 *child_name; + int rv; + + vcm->current_pid = getpid (); + vcl_set_worker_index (0); + + VDBG (0, "initializing forked child"); + child_name = format (0, "%v-child-%u%c", vcm->app_name, getpid (), 0); + + vcl_cleanup_bapi (); + vppcom_api_hookup (); + vcm->app_state = STATE_APP_START; + rv = vppcom_connect_to_vpp ((char *) child_name); + vec_free (child_name); + if (rv) + { + VERR ("couldn't connect to VPP!"); + return; + } + + 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)) + { + VERR ("failed to add worker to vpp"); + return; + } + VDBG (0, "forked child main worker initialized"); } /* @@ -662,35 +743,22 @@ vppcom_app_create (char *app_name) vppcom_cfg_t *vcl_cfg = &vcm->cfg; int rv; - if (!vcm->init) + if (!vcm->is_init) { - vcm->init = 1; + vcm->is_init = 1; vppcom_cfg (&vcm->cfg); vcl_cfg = &vcm->cfg; - vcm->mqs_epfd = -1; - if (vcl_cfg->use_mq_eventfd) - vcm->mqs_epfd = epoll_create (1); - - clib_spinlock_init (&vcm->session_fifo_lockp); - clib_fifo_validate (vcm->client_session_index_fifo, - vcm->cfg.listen_queue_size); - clib_spinlock_init (&vcm->sessions_lockp); - - - vcm->main_cpu = os_get_thread_index (); - - vcm->session_index_by_vpp_handles = hash_create (0, sizeof (uword)); - vcm->ct_registration_by_mq = hash_create (0, sizeof (uword)); - clib_spinlock_init (&vcm->ct_registration_lock); - - 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 */ ); - vec_validate (vcm->mq_events, 64); - vec_validate (vcm->mq_msg_vector, 128); - vec_reset_length (vcm->mq_msg_vector); + 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) @@ -702,37 +770,27 @@ vppcom_app_create (char *app_name) 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); - - VDBG (0, "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; } - VDBG (0, "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; } - VDBG (0, "VCL<%d>: app_name '%s', my_client_index %d (0x%x)", - getpid (), app_name, vcm->my_client_index, vcm->my_client_index); + VDBG (0, "app_name '%s', my_client_index %d (0x%x)", + app_name, vcm->my_client_index, vcm->my_client_index); } return VPPCOM_OK; @@ -747,21 +805,22 @@ vppcom_app_destroy (void) if (vcm->my_client_index == ~0) return; - VDBG (0, "VCL<%d>: detaching from VPP, my_client_index %d (0x%x)", - getpid (), vcm->my_client_index, vcm->my_client_index); + VDBG (0, "detaching from VPP, my_client_index %d (0x%x)", + vcm->my_client_index, vcm->my_client_index); vcl_evt (VCL_EVT_DETACH, vcm); vppcom_app_send_detach (); orig_app_timeout = vcm->cfg.app_timeout; vcm->cfg.app_timeout = 2.0; - rv = vppcom_wait_for_app_state_change (STATE_APP_ENABLED); + rv = vcl_wait_for_app_state_change (STATE_APP_ENABLED); vcm->cfg.app_timeout = orig_app_timeout; if (PREDICT_FALSE (rv)) - VDBG (0, "VCL<%d>: application detach timed out! returning %d (%s)", - getpid (), rv, vppcom_retval_str (rv)); + 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; } @@ -769,13 +828,10 @@ vppcom_app_destroy (void) int vppcom_session_create (u8 proto, u8 is_nonblocking) { + vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *session; - u32 session_index; - VCL_SESSION_LOCK (); - pool_get (vcm->sessions, session); - memset (session, 0, sizeof (*session)); - session_index = session - vcm->sessions; + session = vcl_session_alloc (wrk); session->session_type = proto; session->session_state = STATE_START; @@ -788,133 +844,123 @@ vppcom_session_create (u8 proto, u8 is_nonblocking) vcl_evt (VCL_EVT_CREATE, session, session_type, session->session_state, is_nonblocking, session_index); - VCL_SESSION_UNLOCK (); + VDBG (0, "created sid %u", session->session_index); - VDBG (0, "VCL<%d>: sid %u", getpid (), 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) { + vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *session = 0; - int rv; - u8 is_vep; - u8 is_vep_session; - u32 next_sid; - u32 vep_idx; - u64 vpp_handle; - uword *p; + u8 is_vep, is_vep_session; session_state_t state; + u32 next_sh, vep_sh; + int rv = VPPCOM_OK; + u64 vpp_handle; + + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; - VCL_SESSION_LOCK_AND_GET (session_index, &session); is_vep = session->is_vep; is_vep_session = session->is_vep_session; - next_sid = session->vep.next_sid; - vep_idx = session->vep.vep_idx; + next_sh = session->vep.next_sh; + vep_sh = session->vep.vep_sh; state = session->session_state; vpp_handle = session->vpp_handle; - VCL_SESSION_UNLOCK (); 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); + 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_sid, vep_idx, + getpid (), vpp_handle, next_sh, vep_sh, rv, vppcom_retval_str (rv)); - VCL_SESSION_LOCK_AND_GET (session_index, &session); - next_sid = session->vep.next_sid; - VCL_SESSION_UNLOCK (); + next_sh = session->vep.next_sh; } } else { if (is_vep_session) { - rv = vppcom_epoll_ctl (vep_idx, EPOLL_CTL_DEL, session_index, 0); + 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_index, - vep_idx, rv, vppcom_retval_str (rv)); + 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)) VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: listener unbind " "failed! rv %d (%s)", - getpid (), vpp_handle, session_index, + 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_SESSION_LOCK_AND_GET (session_index, &session); if (vcl_session_is_ct (session)) { 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 (mq_addr); + ctr = vcl_ct_registration_lock_and_lookup (wrk, mq_addr); ASSERT (ctr); if (ctr->epoll_evt_conn_index != ~0) - vcl_mq_epoll_del_evfd (ctr->epoll_evt_conn_index); + vcl_mq_epoll_del_evfd (wrk, ctr->epoll_evt_conn_index); VDBG (0, "Removing ct registration %u", - vcl_ct_registration_index (ctr)); - vcl_ct_registration_del (ctr); - vcl_ct_registration_unlock (); + 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); } - vpp_handle = session->vpp_handle; if (vpp_handle != ~0) { - p = hash_get (vcm->session_index_by_vpp_handles, vpp_handle); - if (p) - hash_unset (vcm->session_index_by_vpp_handles, vpp_handle); + vcl_session_table_del_vpp_handle (wrk, vpp_handle); } - pool_put_index (vcm->sessions, session_index); - - VCL_SESSION_UNLOCK (); + 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: vcl_evt (VCL_EVT_CLOSE, session, rv); @@ -922,118 +968,112 @@ done: } int -vppcom_session_bind (uint32_t session_index, vppcom_endpt_t * ep) +vppcom_session_bind (uint32_t session_handle, vppcom_endpt_t * ep) { + vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *session = 0; - int rv; if (!ep || !ep->ip) return VPPCOM_EINVAL; - VCL_SESSION_LOCK_AND_GET (session_index, &session); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; if (session->is_vep) { - VCL_SESSION_UNLOCK (); 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->transport.is_ip4 = ep->is_ip4; if (ep->is_ip4) - clib_memcpy (&session->transport.lcl_ip.ip4, ep->ip, - sizeof (ip4_address_t)); + clib_memcpy_fast (&session->transport.lcl_ip.ip4, ep->ip, + sizeof (ip4_address_t)); else - clib_memcpy (&session->transport.lcl_ip.ip6, ep->ip, - sizeof (ip6_address_t)); + 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_index, + "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); - VCL_SESSION_UNLOCK (); if (session->session_type == VPPCOM_PROTO_UDP) - vppcom_session_listen (session_index, 10); + vppcom_session_listen (session_handle, 10); -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) { + 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_SESSION_LOCK_AND_GET (listen_session_index, &listen_session); - if (listen_session->is_vep) { - VCL_SESSION_UNLOCK (); clib_warning ("VCL<%d>: ERROR: sid %u: cannot listen on an " - "epoll session!", getpid (), listen_session_index); - rv = VPPCOM_EBADFD; - goto done; + "epoll session!", getpid (), listen_sh); + return VPPCOM_EBADFD; } listen_vpp_handle = listen_session->vpp_handle; if (listen_session->session_state & STATE_LISTEN) { - VCL_SESSION_UNLOCK (); VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: already in listen state!", - getpid (), listen_vpp_handle, listen_session_index); - rv = VPPCOM_OK; - goto done; + getpid (), listen_vpp_handle, listen_sh); + return VPPCOM_OK; } VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: sending VPP bind+listen " - "request...", getpid (), listen_vpp_handle, listen_session_index); + "request...", getpid (), listen_vpp_handle, listen_sh); - vppcom_send_bind_sock (listen_session, listen_session_index); - VCL_SESSION_UNLOCK (); - retval = vppcom_wait_for_session_state_change (listen_session_index, - STATE_LISTEN, - vcm->cfg.session_timeout); + /* + * Send listen request to vpp and wait for reply + */ + vppcom_send_bind_sock (listen_session); + rv = vppcom_wait_for_session_state_change (listen_session->session_index, + STATE_LISTEN, + vcm->cfg.session_timeout); - VCL_SESSION_LOCK_AND_GET (listen_session_index, &listen_session); - if (PREDICT_FALSE (retval)) + if (PREDICT_FALSE (rv)) { + listen_session = vcl_session_get_w_handle (wrk, listen_sh); VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: bind+listen failed! " "returning %d (%s)", getpid (), listen_session->vpp_handle, - listen_session_index, retval, vppcom_retval_str (retval)); - VCL_SESSION_UNLOCK (); - rv = retval; - goto done; + listen_sh, rv, vppcom_retval_str (rv)); + return rv; } - VCL_SESSION_UNLOCK (); - -done: - return rv; + return VPPCOM_OK; } -int -validate_args_session_accept_ (vcl_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; } @@ -1041,7 +1081,7 @@ validate_args_session_accept_ (vcl_session_t * listen_session) { 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->vpp_handle, listen_session->session_index, listen_session->session_state, vppcom_session_state_str (listen_session->session_state)); return VPPCOM_EBADFD; @@ -1050,13 +1090,14 @@ validate_args_session_accept_ (vcl_session_t * listen_session) } 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) { + 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; - u32 client_session_index = ~0; svm_msg_q_t *vpp_evt_q; vcl_session_msg_t *evt; u64 listen_vpp_handle; @@ -1065,15 +1106,13 @@ vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, u8 is_nonblocking; int rv; - VCL_SESSION_LOCK_AND_GET (listen_session_index, &listen_session); - - if (validate_args_session_accept_ (listen_session)) - { - VCL_SESSION_UNLOCK (); - goto done; - } + listen_session = vcl_session_get_w_handle (wrk, listen_session_handle); + if (!listen_session) + return VPPCOM_EBADFD; - VCL_SESSION_UNLOCK (); + listen_session_index = listen_session->session_index; + if ((rv = validate_args_session_accept_ (wrk, listen_session))) + return rv; if (clib_fifo_elts (listen_session->accept_evts_fifo)) { @@ -1084,32 +1123,31 @@ vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, is_nonblocking = VCL_SESS_ATTR_TEST (listen_session->attr, VCL_SESS_ATTR_NONBLOCK); - if (svm_msg_q_is_empty (vcm->app_event_queue) && is_nonblocking) + if (svm_msg_q_is_empty (wrk->app_event_queue) && is_nonblocking) return VPPCOM_EAGAIN; while (1) { - if (svm_msg_q_sub (vcm->app_event_queue, &msg, SVM_Q_WAIT, 0)) + if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_WAIT, 0)) return VPPCOM_EAGAIN; - e = svm_msg_q_msg_data (vcm->app_event_queue, &msg); + 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 (vcm->app_event_queue, &msg); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); continue; } - clib_memcpy (&accepted_msg, e->data, sizeof (accepted_msg)); - svm_msg_q_free_msg (vcm->app_event_queue, &msg); + 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 (&accepted_msg); - listen_session = vcl_session_get (listen_session_index); - VCL_SESSION_LOCK_AND_GET (client_session_index, &client_session); - rv = client_session_index; + 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); @@ -1117,7 +1155,7 @@ handle: 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_index, + 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)); @@ -1127,11 +1165,11 @@ handle: ep->is_ip4 = client_session->transport.is_ip4; ep->port = client_session->transport.rmt_port; if (client_session->transport.is_ip4) - clib_memcpy (ep->ip, &client_session->transport.rmt_ip.ip4, - sizeof (ip4_address_t)); + clib_memcpy_fast (ep->ip, &client_session->transport.rmt_ip.ip4, + sizeof (ip4_address_t)); else - clib_memcpy (ep->ip, &client_session->transport.rmt_ip.ip6, - sizeof (ip6_address_t)); + clib_memcpy_fast (ep->ip, &client_session->transport.rmt_ip.ip6, + sizeof (ip6_address_t)); } if (accepted_msg.server_event_queue_address) @@ -1146,7 +1184,7 @@ handle: VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: accepted vpp handle 0x%llx, " "sid %u connection from peer %s address %U port %u to local %s " "address %U port %u", getpid (), listen_vpp_handle, - listen_session_index, client_session->vpp_handle, + 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, @@ -1158,35 +1196,36 @@ handle: clib_net_to_host_u16 (client_session->transport.lcl_port)); vcl_evt (VCL_EVT_ACCEPT, client_session, listen_session, client_session_index); - VCL_SESSION_UNLOCK (); -done: - return rv; + return vcl_session_handle (client_session); } int -vppcom_session_connect (uint32_t session_index, vppcom_endpt_t * server_ep) +vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) { + vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *session = 0; - u64 vpp_handle = 0; - int rv, retval = VPPCOM_OK; + u32 session_index; + int rv; - VCL_SESSION_LOCK_AND_GET (session_index, &session); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + session_index = session->session_index; if (PREDICT_FALSE (session->is_vep)) { - VCL_SESSION_UNLOCK (); 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->session_state & CLIENT_STATE_OPEN)) { VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: session already " "connected to %s %U port %d proto %s, state 0x%x (%s)", - getpid (), session->vpp_handle, session_index, + getpid (), session->vpp_handle, session_handle, session->transport.is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &session->transport.rmt_ip, session->transport.is_ip4 ? @@ -1194,23 +1233,21 @@ vppcom_session_connect (uint32_t session_index, vppcom_endpt_t * server_ep) clib_net_to_host_u16 (session->transport.rmt_port), session->session_type ? "UDP" : "TCP", session->session_state, vppcom_session_state_str (session->session_state)); - - VCL_SESSION_UNLOCK (); - goto done; + return VPPCOM_OK; } session->transport.is_ip4 = server_ep->is_ip4; if (session->transport.is_ip4) - clib_memcpy (&session->transport.rmt_ip.ip4, server_ep->ip, - sizeof (ip4_address_t)); + clib_memcpy_fast (&session->transport.rmt_ip.ip4, server_ep->ip, + sizeof (ip4_address_t)); else - clib_memcpy (&session->transport.rmt_ip.ip6, server_ep->ip, - sizeof (ip6_address_t)); + 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_index, + getpid (), session->vpp_handle, session_handle, session->transport.is_ip4 ? "IPv4" : "IPv6", format_ip46_address, &session->transport.rmt_ip, session->transport.is_ip4 ? @@ -1218,35 +1255,33 @@ vppcom_session_connect (uint32_t session_index, vppcom_endpt_t * server_ep) clib_net_to_host_u16 (session->transport.rmt_port), session->session_type ? "UDP" : "TCP"); - vppcom_send_connect_sock (session, session_index); - VCL_SESSION_UNLOCK (); - - retval = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT, - vcm->cfg.session_timeout); + /* + * 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); - VCL_SESSION_LOCK_AND_GET (session_index, &session); - vpp_handle = session->vpp_handle; - VCL_SESSION_UNLOCK (); + session = vcl_session_get (wrk, session_index); -done: - if (PREDICT_FALSE (retval)) + 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)); + "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 VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: connected!", - getpid (), vpp_handle, session_index); + getpid (), session->vpp_handle, session_handle); return rv; } @@ -1270,60 +1305,53 @@ vcl_session_is_readable (vcl_session_t * s) } 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) { + 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_full; - - ASSERT (buf); + u8 is_ct; - VCL_SESSION_LOCK_AND_GET (session_index, &s); - - if (PREDICT_FALSE (s->is_vep)) - { - VCL_SESSION_UNLOCK (); - clib_warning ("VCL<%d>: ERROR: sid %u: cannot " - "read from an epoll session!", getpid (), session_index); - rv = VPPCOM_EBADFD; - goto done; - } + if (PREDICT_FALSE (!buf)) + return VPPCOM_EINVAL; - is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); - rx_fifo = s->rx_fifo; + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || s->is_vep)) + return VPPCOM_EBADFD; if (PREDICT_FALSE (!vcl_session_is_readable (s))) { session_state_t state = s->session_state; - VCL_SESSION_UNLOCK (); rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: %s session is not open! " "state 0x%x (%s), returning %d (%s)", - getpid (), s->vpp_handle, session_index, state, + getpid (), s->vpp_handle, session_handle, state, vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); - goto done; + return rv; } - VCL_SESSION_UNLOCK (); - mq = vcl_session_is_ct (s) ? s->our_evt_q : vcm->app_event_queue; - svm_fifo_unset_event (rx_fifo); - is_full = svm_fifo_is_full (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 (svm_fifo_is_empty (rx_fifo)) { if (is_nonblocking) { - rv = VPPCOM_OK; - goto done; + svm_fifo_unset_event (rx_fifo); + return VPPCOM_EWOULDBLOCK; } - while (1) + 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); @@ -1331,20 +1359,16 @@ vppcom_session_read_internal (uint32_t session_index, void *buf, int n, 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, session_index, - s->our_evt_q != 0)) + if (!vcl_is_rx_evt_for_session (e, s->session_index, is_ct)) { - vcl_handle_mq_ctrl_event (e); + vcl_handle_mq_event (wrk, e); svm_msg_q_free_msg (mq, &msg); continue; } - svm_fifo_unset_event (rx_fifo); svm_msg_q_free_msg (mq, &msg); + if (PREDICT_FALSE (s->session_state == STATE_CLOSE_ON_EMPTY)) return 0; - if (svm_fifo_is_empty (rx_fifo)) - continue; - break; } } @@ -1353,41 +1377,120 @@ vppcom_session_read_internal (uint32_t session_index, void *buf, int n, else n_read = app_recv_stream_raw (rx_fifo, buf, n, 0, peek); - if (vcl_session_is_ct (s) && is_full) - { - /* 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); - } + 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 (n_read > 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: read %d bytes " - "from (%p)", getpid (), s->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 (), s->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); } - return n_read; -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_handle, buf, n, 1)); +} + +int +vppcom_session_read_segments (uint32_t session_handle, + vppcom_data_segments_t ds) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + int n_read = 0, rv, is_nonblocking; + 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; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || s->is_vep)) + return VPPCOM_EBADFD; + + if (PREDICT_FALSE (!vcl_session_is_readable (s))) + { + session_state_t state = s->session_state; + rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); + return rv; + } + + is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + is_ct = vcl_session_is_ct (s); + mq = is_ct ? s->our_evt_q : wrk->app_event_queue; + rx_fifo = s->rx_fifo; + s->has_rx_evt = 0; + + if (svm_fifo_is_empty (rx_fifo)) + { + if (is_nonblocking) + { + svm_fifo_unset_event (rx_fifo); + return VPPCOM_EWOULDBLOCK; + } + while (svm_fifo_is_empty (rx_fifo)) + { + svm_fifo_unset_event (rx_fifo); + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq)) + svm_msg_q_wait (mq); + + svm_msg_q_sub_w_lock (mq, &msg); + e = svm_msg_q_msg_data (mq, &msg); + svm_msg_q_unlock (mq); + if (!vcl_is_rx_evt_for_session (e, s->session_index, is_ct)) + { + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (mq, &msg); + continue; + } + svm_msg_q_free_msg (mq, &msg); + + if (PREDICT_FALSE (s->session_state == STATE_CLOSE_ON_EMPTY)) + return 0; + } + } + + n_read = svm_fifo_segments (rx_fifo, (svm_fifo_segment_t *) ds); + svm_fifo_unset_event (rx_fifo); + + if (is_ct && n_read + svm_fifo_max_dequeue (rx_fifo) == rx_fifo->nitems) + { + /* If the peer is not polling send notification */ + if (!svm_fifo_has_event (s->rx_fifo)) + app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo, + SESSION_IO_EVT_CT_RX, SVM_Q_WAIT); + } + + return n_read; +} + +void +vppcom_session_free_segments (uint32_t session_handle, + vppcom_data_segments_t ds) { - return (vppcom_session_read_internal (session_index, buf, n, 1)); + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *s; + + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s || s->is_vep)) + return; + + svm_fifo_segments_free (s->rx_fifo, (svm_fifo_segment_t *) ds); } static inline int @@ -1397,7 +1500,7 @@ vppcom_session_read_ready (vcl_session_t * session) if (PREDICT_FALSE (session->is_vep)) { clib_warning ("VCL<%d>: ERROR: sid %u: cannot read from an " - "epoll session!", getpid (), vcl_session_index (session)); + "epoll session!", getpid (), session->session_index); return VPPCOM_EBADFD; } @@ -1410,7 +1513,7 @@ vppcom_session_read_ready (vcl_session_t * session) 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, vcl_session_index (session), state, + session->vpp_handle, session->session_index, state, vppcom_session_state_str (state), rv, vppcom_retval_str (rv)); return rv; } @@ -1421,6 +1524,19 @@ vppcom_session_read_ready (vcl_session_t * session) 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) + { + 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) { @@ -1432,8 +1548,9 @@ vcl_is_tx_evt_for_session (session_event_t * e, u32 sid, u8 is_ct) } int -vppcom_session_write (uint32_t session_index, void *buf, size_t n) +vppcom_session_write (uint32_t session_handle, void *buf, size_t n) { + 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; @@ -1441,59 +1558,57 @@ vppcom_session_write (uint32_t session_index, void *buf, size_t n) svm_msg_q_msg_t msg; session_event_t *e; svm_msg_q_t *mq; + u8 is_ct; - ASSERT (buf); - - VCL_SESSION_LOCK_AND_GET (session_index, &s); + if (PREDICT_FALSE (!buf)) + return VPPCOM_EINVAL; - tx_fifo = s->tx_fifo; - is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + s = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!s)) + return VPPCOM_EBADFD; if (PREDICT_FALSE (s->is_vep)) { - VCL_SESSION_UNLOCK (); clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " "cannot write to an epoll session!", - getpid (), s->vpp_handle, session_index); + getpid (), s->vpp_handle, session_handle); - rv = VPPCOM_EBADFD; - goto done; + return VPPCOM_EBADFD; } - if (!(s->session_state & STATE_OPEN)) + if (PREDICT_FALSE (!(s->session_state & STATE_OPEN))) { session_state_t state = s->session_state; rv = ((state & STATE_DISCONNECT) ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN); - VCL_SESSION_UNLOCK (); VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: session is not open! " - "state 0x%x (%s)", - getpid (), s->vpp_handle, session_index, + "state 0x%x (%s)", getpid (), s->vpp_handle, session_handle, state, vppcom_session_state_str (state)); - goto done; + return rv; } - VCL_SESSION_UNLOCK (); - - mq = vcl_session_is_ct (s) ? s->our_evt_q : vcm->app_event_queue; + tx_fifo = s->tx_fifo; + is_ct = vcl_session_is_ct (s); + is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + mq = is_ct ? s->our_evt_q : wrk->app_event_queue; if (svm_fifo_is_full (tx_fifo)) { if (is_nonblocking) { - rv = VPPCOM_EWOULDBLOCK; - goto done; + return VPPCOM_EWOULDBLOCK; } while (svm_fifo_is_full (tx_fifo)) { + svm_fifo_set_want_tx_evt (tx_fifo, 1); svm_msg_q_lock (mq); - while (svm_msg_q_is_empty (mq) && svm_msg_q_timedwait (mq, 10e-6)) - ; + if (svm_msg_q_is_empty (mq)) + svm_msg_q_wait (mq); + svm_msg_q_sub_w_lock (mq, &msg); e = svm_msg_q_msg_data (mq, &msg); svm_msg_q_unlock (mq); - if (!vcl_is_tx_evt_for_session (e, session_index, - s->our_evt_q != 0)) - vcl_handle_mq_ctrl_event (e); + 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); } } @@ -1509,28 +1624,17 @@ vppcom_session_write (uint32_t session_index, void *buf, size_t n) ASSERT (n_write > 0); - if (VPPCOM_DEBUG > 2) - { - if (n_write <= 0) - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "FIFO-FULL (%p)", getpid (), s->vpp_handle, - session_index, tx_fifo); - else - clib_warning ("VCL<%d>: vpp handle 0x%llx, sid %u: " - "wrote %d bytes tx-fifo: (%p)", getpid (), - s->vpp_handle, session_index, n_write, tx_fifo); - } - return n_write; + VDBG (2, "VCL<%d>: vpp handle 0x%llx, sid %u: wrote %d bytes", getpid (), + s->vpp_handle, session_handle, n_write); -done: - return rv; + return n_write; } static vcl_session_t * -vcl_ct_session_get_from_fifo (svm_fifo_t * f, u8 type) +vcl_ct_session_get_from_fifo (vcl_worker_t * wrk, svm_fifo_t * f, u8 type) { vcl_session_t *s; - s = vcl_session_get (f->client_session_index); + s = vcl_session_get (wrk, f->client_session_index); if (s) { /* rx fifo */ @@ -1540,7 +1644,7 @@ vcl_ct_session_get_from_fifo (svm_fifo_t * f, u8 type) if (type == 1 && s->tx_fifo == f) return s; } - s = vcl_session_get (f->master_session_index); + s = vcl_session_get (wrk, f->master_session_index); if (s) { if (type == 0 && s->rx_fifo == f) @@ -1552,14 +1656,14 @@ vcl_ct_session_get_from_fifo (svm_fifo_t * f, u8 type) } static inline int -vppcom_session_write_ready (vcl_session_t * session, u32 session_index) +vppcom_session_write_ready (vcl_session_t * 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); + getpid (), session->vpp_handle, session->session_index); return VPPCOM_EBADFD; } @@ -1567,7 +1671,7 @@ vppcom_session_write_ready (vcl_session_t * session, u32 session_index) { clib_warning ("VCL<%d>: ERROR: vpp handle 0x%llx, sid %u: " "cannot write to a listen session!", - getpid (), session->vpp_handle, session_index); + getpid (), session->vpp_handle, session->session_index); return VPPCOM_EBADFD; } @@ -1580,21 +1684,21 @@ vppcom_session_write_ready (vcl_session_t * session, u32 session_index) 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)); return rv; } VDBG (3, "VCL<%d>: vpp handle 0x%llx, sid %u: peek %s (%p), ready = %d", - getpid (), session->vpp_handle, session_index, session->tx_fifo, - svm_fifo_max_enqueue (session->tx_fifo)); + getpid (), session->vpp_handle, session->session_index, + session->tx_fifo, svm_fifo_max_enqueue (session->tx_fifo)); return svm_fifo_max_enqueue (session->tx_fifo); } static inline int -vcl_mq_dequeue_batch (svm_msg_q_t * mq) +vcl_mq_dequeue_batch (vcl_worker_t * wrk, svm_msg_q_t * mq) { svm_msg_q_msg_t *msg; u32 n_msgs; @@ -1603,27 +1707,138 @@ vcl_mq_dequeue_batch (svm_msg_q_t * mq) n_msgs = svm_msg_q_size (mq); for (i = 0; i < n_msgs; i++) { - vec_add2 (vcm->mq_msg_vector, msg, 1); + vec_add2 (wrk->mq_msg_vector, msg, 1); svm_msg_q_sub_w_lock (mq, msg); } return n_msgs; } -static int -vcl_select_handle_mq (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) +#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; + } + + 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) + { + 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, sid; - u64 handle; + u32 i; svm_msg_q_lock (mq); if (svm_msg_q_is_empty (mq)) @@ -1652,121 +1867,45 @@ vcl_select_handle_mq (svm_msg_q_t * mq, unsigned long n_bits, } } } - vcl_mq_dequeue_batch (mq); + vcl_mq_dequeue_batch (wrk, mq); svm_msg_q_unlock (mq); - for (i = 0; i < vec_len (vcm->mq_msg_vector); i++) + for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { - msg = vec_elt_at_index (vcm->mq_msg_vector, i); + msg = vec_elt_at_index (wrk->mq_msg_vector, i); e = svm_msg_q_msg_data (mq, msg); - switch (e->event_type) - { - case FIFO_EVENT_APP_RX: - sid = e->fifo->client_session_index; - session = vcl_session_get (sid); - 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 (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: - session = vcl_ct_session_get_from_fifo (e->fifo, 0); - sid = vcl_session_index (session); - if (sid < n_bits && read_map) - { - clib_bitmap_set_no_check (read_map, sid, 1); - *bits_set += 1; - } - break; - break; - case SESSION_IO_EVT_CT_RX: - session = vcl_ct_session_get_from_fifo (e->fifo, 1); - sid = vcl_session_index (session); - if (!session) - break; - 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 = vppcom_session_table_lookup_listener (handle); - if (!session) - { - clib_warning ("VCL<%d>: ERROR: couldn't find listen session:" - "listener handle %llx", getpid (), handle); - break; - } - - clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); - vcl_msg->accepted_msg = *accepted_msg; - sid = session - vcm->sessions; - if (sid < n_bits && read_map) - { - 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 (connected_msg); - break; - case SESSION_CTRL_EVT_DISCONNECTED: - disconnected_msg = (session_disconnected_msg_t *) e->data; - sid = vcl_session_get_index_from_handle (disconnected_msg->handle); - 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; - } + 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 (vcm->mq_msg_vector); + vec_reset_length (wrk->mq_msg_vector); return *bits_set; } static int -vppcom_select_condvar (unsigned long n_bits, unsigned long *read_map, - unsigned long *write_map, unsigned long *except_map, - double time_to_wait, u32 * bits_set) +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 = vcm->cut_through_registrations ? 10e-6 : 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, vcm->cut_through_registrations, ({ - vcl_select_handle_mq (cr->mq, n_bits, read_map, write_map, except_map, + 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 (vcm->app_event_queue, n_bits, read_map, write_map, - except_map, time_to_wait, bits_set); + 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; @@ -1777,23 +1916,24 @@ vppcom_select_condvar (unsigned long n_bits, unsigned long *read_map, } static int -vppcom_select_eventfd (unsigned long n_bits, unsigned long *read_map, - unsigned long *write_map, unsigned long *except_map, - double time_to_wait, u32 * bits_set) +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 (vcm->mq_events, pool_elts (vcm->mq_evt_conns)); - n_mq_evts = epoll_wait (vcm->mqs_epfd, vcm->mq_events, - vec_len (vcm->mq_events), time_to_wait); + 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 (vcm->mq_events[i].data.u32); + 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 (mqc->mq, n_bits, read_map, write_map, + vcl_select_handle_mq (wrk, mqc->mq, n_bits, read_map, write_map, except_map, 0, bits_set); } @@ -1806,33 +1946,34 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map, double time_to_wait) { 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; + 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)); } if (!n_bits) @@ -1842,8 +1983,8 @@ vppcom_select (unsigned long n_bits, unsigned long *read_map, goto check_rd; /* *INDENT-OFF* */ - clib_bitmap_foreach (sid, vcm->wr_bitmap, ({ - if (!(session = vcl_session_get (sid))) + 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); @@ -1862,8 +2003,8 @@ check_rd: if (!read_map) goto check_mq; - clib_bitmap_foreach (sid, vcm->rd_bitmap, ({ - if (!(session = vcl_session_get (sid))) + 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); @@ -1881,30 +2022,36 @@ check_rd: check_mq: + for (i = 0; i < vec_len (wrk->unhandled_evts_vector); i++) + { + vcl_select_handle_mq_event (wrk, &wrk->unhandled_evts_vector[i], n_bits, + read_map, write_map, except_map, &bits_set); + } + vec_reset_length (wrk->unhandled_evts_vector); + if (vcm->cfg.use_mq_eventfd) - vppcom_select_eventfd (n_bits, read_map, write_map, except_map, + vppcom_select_eventfd (wrk, n_bits, read_map, write_map, except_map, time_to_wait, &bits_set); else - vppcom_select_condvar (n_bits, read_map, write_map, except_map, + vppcom_select_condvar (wrk, n_bits, read_map, write_map, except_map, time_to_wait, &bits_set); return (bits_set); } static inline void -vep_verify_epoll_chain (u32 vep_idx) +vep_verify_epoll_chain (vcl_worker_t * wrk, u32 vep_idx) { 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); @@ -1925,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; @@ -1946,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" @@ -1962,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); } } @@ -1977,76 +2124,68 @@ done: int vppcom_epoll_create (void) { + vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *vep_session; - u32 vep_idx; - VCL_SESSION_LOCK (); - pool_get (vcm->sessions, vep_session); - memset (vep_session, 0, sizeof (*vep_session)); - vep_idx = vep_session - vcm->sessions; + vep_session = 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; - - vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_idx); - VCL_SESSION_UNLOCK (); + vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_sh); VDBG (0, "VCL<%d>: Created vep_idx %u / sid %u!", - getpid (), vep_idx, vep_idx); + 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) { + vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *vep_session; vcl_session_t *session; - int rv; + 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; } - VCL_SESSION_LOCK (); - rv = vppcom_session_at_index (vep_idx, &vep_session); - if (PREDICT_FALSE (rv)) + vep_session = vcl_session_get_w_handle (wrk, vep_handle); + if (PREDICT_FALSE (!vep_session)) { - clib_warning ("VCL<%d>: ERROR: Invalid vep_idx (%u)!", vep_idx); - goto done; + 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)) { - VDBG (0, "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) @@ -2056,48 +2195,34 @@ 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) { vcl_session_t *next_session; - rv = vppcom_session_at_index (vep_session->vep.next_sid, - &next_session); - if (PREDICT_FALSE (rv)) + 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; - - /* VCL Event Register handler */ - if (session->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 */ ); - } - VDBG (1, "VCL<%d>: EPOLL_CTL_ADD: vep_idx %u, " - "sid %u, events 0x%x, data 0x%llx!", - getpid (), vep_idx, session_index, + vep_session->vep.next_sh = session_handle; + + 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; @@ -2113,94 +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; VDBG (1, "VCL<%d>: EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x," - " data 0x%llx!", getpid (), vep_idx, session_index, event->events, - event->data.u64); + " 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->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 { vcl_session_t *prev_session; - rv = vppcom_session_at_index (session->vep.prev_sid, &prev_session); - if (PREDICT_FALSE (rv)) + 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) { vcl_session_t *next_session; - rv = vppcom_session_at_index (session->vep.next_sid, &next_session); - if (PREDICT_FALSE (rv)) + 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; VDBG (1, "VCL<%d>: EPOLL_CTL_DEL: vep_idx %u, sid %u!", - getpid (), vep_idx, session_index); - vcl_evt (VCL_EVT_EPOLL_CTLDEL, session, vep_idx); + getpid (), vep_handle, session_handle); + vcl_evt (VCL_EVT_EPOLL_CTLDEL, session, vep_sh); break; default: @@ -2208,16 +2326,15 @@ 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: - VCL_SESSION_UNLOCK (); return rv; } -static int -vcl_epoll_wait_handle_mq (svm_msg_q_t * mq, struct epoll_event *events, - u32 maxevents, double wait_for_time, u32 * num_ev) +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; @@ -2226,11 +2343,138 @@ vcl_epoll_wait_handle_mq (svm_msg_q_t * mq, struct epoll_event *events, 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; + } + + 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; + + 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 (add_event) + { + 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; + } +} + +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; - u8 add_event; 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)) { @@ -2252,190 +2496,91 @@ vcl_epoll_wait_handle_mq (svm_msg_q_t * mq, struct epoll_event *events, } } } - vcl_mq_dequeue_batch (mq); + vcl_mq_dequeue_batch (wrk, mq); svm_msg_q_unlock (mq); - for (i = 0; i < vec_len (vcm->mq_msg_vector); i++) +handle_dequeued: + for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { - msg = vec_elt_at_index (vcm->mq_msg_vector, i); + msg = vec_elt_at_index (wrk->mq_msg_vector, i); e = svm_msg_q_msg_data (mq, msg); - add_event = 0; - switch (e->event_type) - { - case FIFO_EVENT_APP_RX: - sid = e->fifo->client_session_index; - session = vcl_session_get (sid); - session_events = session->vep.ev.events; - if (!(EPOLLIN & session->vep.ev.events)) - break; - add_event = 1; - events[*num_ev].events |= EPOLLIN; - session_evt_data = session->vep.ev.data.u64; - break; - case FIFO_EVENT_APP_TX: - sid = e->fifo->client_session_index; - session = vcl_session_get (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: - session = vcl_ct_session_get_from_fifo (e->fifo, 0); - sid = vcl_session_index (session); - session_events = session->vep.ev.events; - if (!(EPOLLIN & session->vep.ev.events)) - break; - add_event = 1; - events[*num_ev].events |= EPOLLIN; - session_evt_data = session->vep.ev.data.u64; - break; - case SESSION_IO_EVT_CT_RX: - session = vcl_ct_session_get_from_fifo (e->fifo, 1); - sid = vcl_session_index (session); - 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 = vppcom_session_table_lookup_listener (handle); - if (!session) - { - clib_warning ("VCL<%d>: ERROR: couldn't find listen session:" - "listener handle %llx", getpid (), handle); - break; - } - - clib_fifo_add2 (session->accept_evts_fifo, vcl_msg); - vcl_msg->accepted_msg = *accepted_msg; - session_events = session->vep.ev.events; - if (!(EPOLLIN & session_events)) - break; - - 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 (connected_msg); - /* Generate EPOLLOUT because there's no connected event */ - sid = vcl_session_get_index_from_handle (connected_msg->handle); - clib_spinlock_lock (&vcm->sessions_lockp); - session = vcl_session_get (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; - } - clib_spinlock_unlock (&vcm->sessions_lockp); - break; - case SESSION_CTRL_EVT_DISCONNECTED: - disconnected_msg = (session_disconnected_msg_t *) e->data; - sid = vcl_session_get_index_from_handle (disconnected_msg->handle); - clib_spinlock_lock (&vcm->sessions_lockp); - session = vcl_session_get (sid); - add_event = 1; - events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; - session_evt_data = session->vep.ev.data.u64; - session_events = session->vep.ev.events; - clib_spinlock_unlock (&vcm->sessions_lockp); - break; - default: - clib_warning ("unhandled: %u", e->event_type); - svm_msg_q_free_msg (mq, msg); - continue; - } + 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); - - if (add_event) - { - events[*num_ev].data.u64 = session_evt_data; - if (EPOLLONESHOT & session_events) - { - clib_spinlock_lock (&vcm->sessions_lockp); - session = vcl_session_get (sid); - session->vep.ev.events = 0; - clib_spinlock_unlock (&vcm->sessions_lockp); - } - *num_ev += 1; - if (*num_ev == maxevents) - break; - } } + vec_reset_length (wrk->mq_msg_vector); - vec_reset_length (vcm->mq_msg_vector); return *num_ev; } static int -vppcom_epoll_wait_condvar (struct epoll_event *events, int maxevents, - double wait_for_time) +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; - u32 num_ev = 0; int rv; wait_for_time = (wait_for_time == -1) ? (double) 10e9 : wait_for_time; - wait_slice = vcm->cut_through_registrations ? 10e-6 : 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, vcm->cut_through_registrations, ({ - vcl_epoll_wait_handle_mq (cr->mq, events, maxevents, 0, &num_ev); + pool_foreach (cr, wrk->cut_through_registrations, ({ + vcl_epoll_wait_handle_mq (wrk, cr->mq, events, maxevents, 0, &n_evts); })); /* *INDENT-ON* */ + vcl_ct_registration_unlock (wrk); - rv = vcl_epoll_wait_handle_mq (vcm->app_event_queue, events, maxevents, - num_ev ? 0 : wait_slice, &num_ev); + 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 (num_ev) - return num_ev; + if (n_evts) + return n_evts; } while (total_wait < wait_for_time); - return (int) num_ev; + return n_evts; } static int -vppcom_epoll_wait_eventfd (struct epoll_event *events, int maxevents, - double wait_for_time) +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; - u32 n_evts = 0; u64 buf; - vec_validate (vcm->mq_events, pool_elts (vcm->mq_evt_conns)); - n_mq_evts = epoll_wait (vcm->mqs_epfd, vcm->mq_events, - vec_len (vcm->mq_events), wait_for_time); + 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 (vcm->mq_events[i].data.u32); + 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 (mqc->mq, events, maxevents, 0, &n_evts); + vcl_epoll_wait_handle_mq (wrk, mqc->mq, events, maxevents, 0, &n_evts); } + if (!n_evts && n_mq_evts > 0) + goto again; return (int) n_evts; } int -vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, +vppcom_epoll_wait (uint32_t vep_handle, struct epoll_event *events, int maxevents, double wait_for_time) { + vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *vep_session; + u32 n_evts = 0; + int i; if (PREDICT_FALSE (maxevents <= 0)) { @@ -2444,37 +2589,56 @@ vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events, return VPPCOM_EINVAL; } - clib_spinlock_lock (&vcm->sessions_lockp); - vep_session = vcl_session_get (vep_idx); + vep_session = vcl_session_get_w_handle (wrk, vep_handle); + if (!vep_session) + 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); - clib_spinlock_unlock (&vcm->sessions_lockp); + getpid (), vep_handle); return VPPCOM_EINVAL; } - clib_spinlock_unlock (&vcm->sessions_lockp); memset (events, 0, sizeof (*events) * maxevents); + 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) + { + i += 1; + break; + } + } + + vec_delete (wrk->unhandled_evts_vector, i, 0); + } + if (vcm->cfg.use_mq_eventfd) - return vppcom_epoll_wait_eventfd (events, maxevents, wait_for_time); + return vppcom_epoll_wait_eventfd (wrk, events, maxevents, n_evts, + wait_for_time); - return vppcom_epoll_wait_condvar (events, maxevents, 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) { + 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_SESSION_LOCK_AND_GET (session_index, &session); - - ASSERT (session); + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; switch (op) { @@ -2485,9 +2649,9 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, break; case VPPCOM_ATTR_GET_NWRITE: - rv = vppcom_session_write_ready (session, session_index); + rv = vppcom_session_write_ready (session); VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_NWRITE: sid %u, nwrite = %d", - getpid (), session_index, rv); + getpid (), session_handle, rv); break; case VPPCOM_ATTR_GET_FLAGS: @@ -2498,7 +2662,7 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, *buflen = sizeof (*flags); VDBG (2, "VCL<%d>: VPPCOM_ATTR_GET_FLAGS: sid %u, flags = 0x%08x, " "is_nonblocking = %u", getpid (), - session_index, *flags, + session_handle, *flags, VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); } else @@ -2515,7 +2679,7 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, VDBG (2, "VCL<%d>: VPPCOM_ATTR_SET_FLAGS: sid %u, flags = 0x%08x," " is_nonblocking = %u", - getpid (), session_index, *flags, + getpid (), session_handle, *flags, VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); } else @@ -2529,15 +2693,15 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, ep->is_ip4 = session->transport.is_ip4; ep->port = session->transport.rmt_port; if (session->transport.is_ip4) - clib_memcpy (ep->ip, &session->transport.rmt_ip.ip4, - sizeof (ip4_address_t)); + clib_memcpy_fast (ep->ip, &session->transport.rmt_ip.ip4, + sizeof (ip4_address_t)); else - clib_memcpy (ep->ip, &session->transport.rmt_ip.ip6, - sizeof (ip6_address_t)); + clib_memcpy_fast (ep->ip, &session->transport.rmt_ip.ip6, + sizeof (ip6_address_t)); *buflen = sizeof (*ep); VDBG (1, "VCL<%d>: VPPCOM_ATTR_GET_PEER_ADDR: sid %u, is_ip4 = %u, " "addr = %U, port %u", getpid (), - session_index, ep->is_ip4, format_ip46_address, + session_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)); @@ -2553,15 +2717,15 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, ep->is_ip4 = session->transport.is_ip4; ep->port = session->transport.lcl_port; if (session->transport.is_ip4) - clib_memcpy (ep->ip, &session->transport.lcl_ip.ip4, - sizeof (ip4_address_t)); + clib_memcpy_fast (ep->ip, &session->transport.lcl_ip.ip4, + sizeof (ip4_address_t)); else - clib_memcpy (ep->ip, &session->transport.lcl_ip.ip6, - sizeof (ip6_address_t)); + clib_memcpy_fast (ep->ip, &session->transport.lcl_ip.ip6, + sizeof (ip6_address_t)); *buflen = sizeof (*ep); VDBG (1, "VCL<%d>: VPPCOM_ATTR_GET_LCL_ADDR: sid %u, is_ip4 = %u," " addr = %U port %d", getpid (), - session_index, ep->is_ip4, format_ip46_address, + 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)); @@ -2991,39 +3155,34 @@ vppcom_session_attr (uint32_t session_index, uint32_t op, break; } -done: - VCL_SESSION_UNLOCK (); return rv; } int -vppcom_session_recvfrom (uint32_t session_index, void *buffer, +vppcom_session_recvfrom (uint32_t session_handle, void *buffer, uint32_t buflen, int flags, vppcom_endpt_t * ep) { + vcl_worker_t *wrk = vcl_worker_get_current (); int rv = VPPCOM_OK; vcl_session_t *session = 0; if (ep) { - VCL_SESSION_LOCK (); - 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)) { - VCL_SESSION_UNLOCK (); VDBG (0, "VCL<%d>: invalid session, sid (%u) has been closed!", - getpid (), session_index); - VCL_SESSION_UNLOCK (); + getpid (), session_handle); return VPPCOM_EBADFD; } ep->is_ip4 = session->transport.is_ip4; ep->port = session->transport.rmt_port; - VCL_SESSION_UNLOCK (); } if (flags == 0) - rv = vppcom_session_read (session_index, buffer, buflen); + rv = vppcom_session_read (session_handle, buffer, buflen); else if (flags & MSG_PEEK) - rv = vppcom_session_peek (session_index, buffer, buflen); + rv = vppcom_session_peek (session_handle, buffer, buflen); else { clib_warning ("VCL<%d>: Unsupport flags for recvfrom %d", @@ -3034,18 +3193,18 @@ vppcom_session_recvfrom (uint32_t session_index, void *buffer, if (ep) { if (session->transport.is_ip4) - clib_memcpy (ep->ip, &session->transport.rmt_ip.ip4, - sizeof (ip4_address_t)); + clib_memcpy_fast (ep->ip, &session->transport.rmt_ip.ip4, + sizeof (ip4_address_t)); else - clib_memcpy (ep->ip, &session->transport.rmt_ip.ip6, - sizeof (ip6_address_t)); + clib_memcpy_fast (ep->ip, &session->transport.rmt_ip.ip6, + sizeof (ip6_address_t)); } 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) @@ -3064,14 +3223,17 @@ vppcom_session_sendto (uint32_t session_index, void *buffer, 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; VDBG (3, "VCL<%d>: vp %p, nsids %u, wait_for_time %f", @@ -3084,24 +3246,33 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) { vcl_session_t *session; - for (i = 0; i < n_sids; i++) + /* Dequeue all events and drop all unhandled io events */ + while (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_NOWAIT, 0) == 0) { - ASSERT (vp[i].revents); + e = svm_msg_q_msg_data (wrk->app_event_queue, &msg); + vcl_handle_mq_event (wrk, e); + svm_msg_q_free_msg (wrk->app_event_queue, &msg); + } + vec_reset_length (wrk->unhandled_evts_vector); - VCL_SESSION_LOCK_AND_GET (vp[i].sid, &session); - VCL_SESSION_UNLOCK (); + for (i = 0; i < n_sids; i++) + { + session = vcl_session_get (wrk, vp[i].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_SESSION_LOCK_AND_GET (vp[i].sid, &session); rv = vppcom_session_read_ready (session); - VCL_SESSION_UNLOCK (); if (rv > 0) { - *vp[i].revents |= POLLIN; + vp[i].revents |= POLLIN; num_ev++; } else if (rv < 0) @@ -3109,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++; @@ -3122,12 +3293,10 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) if (POLLOUT & vp[i].events) { - VCL_SESSION_LOCK_AND_GET (vp[i].sid, &session); - rv = vppcom_session_write_ready (session, vp[i].sid); - VCL_SESSION_UNLOCK (); + rv = vppcom_session_write_ready (session); if (rv > 0) { - *vp[i].revents |= POLLOUT; + vp[i].revents |= POLLOUT; num_ev++; } else if (rv < 0) @@ -3135,11 +3304,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++; @@ -3148,13 +3317,12 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) if (0) // Note "done:" label used by VCL_SESSION_LOCK_AND_GET() { - done: - *vp[i].revents = POLLNVAL; + vp[i].revents = POLLNVAL; num_ev++; } } if (wait_for_time != -1) - keep_trying = (clib_time_now (&vcm->clib_time) <= timeout) ? 1 : 0; + keep_trying = (clib_time_now (&wrk->clib_time) <= timeout) ? 1 : 0; } while ((num_ev == 0) && keep_trying); @@ -3165,7 +3333,7 @@ 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; @@ -3174,7 +3342,22 @@ vppcom_poll (vcl_poll_t * vp, uint32_t n_sids, double wait_for_time) int vppcom_mq_epoll_fd (void) { - return vcm->mqs_epfd; + 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; } /*