X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=107b109dc752913e6916aa1b65e996c417663d48;hb=2f09bfc8b;hp=99e3feacdfbf5e2083eebdb9fcd08b9517f67fe6;hpb=1bc919e9f3cc97662ed8ff1034b485b87c706358;p=vpp.git diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index 99e3feacdfb..107b109dc75 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -22,33 +22,17 @@ __thread uword __vcl_worker_index = ~0; -static int -vcl_segment_is_not_mounted (vcl_worker_t * wrk, u64 segment_handle) -{ - u32 segment_index; - - if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) - return 0; - - segment_index = vcl_segment_table_lookup (segment_handle); - if (segment_index != VCL_INVALID_SEGMENT_INDEX) - return 0; - - return 1; -} - static inline int vcl_mq_dequeue_batch (vcl_worker_t * wrk, svm_msg_q_t * mq, u32 n_max_msg) { - svm_msg_q_msg_t *msg; - u32 n_msgs; - int i; + u32 n_msgs = 0, sz, len; - n_msgs = clib_min (svm_msg_q_size (mq), n_max_msg); - for (i = 0; i < n_msgs; i++) + while ((sz = svm_msg_q_size (mq))) { - vec_add2 (wrk->mq_msg_vector, msg, 1); - svm_msg_q_sub_w_lock (mq, msg); + len = vec_len (wrk->mq_msg_vector); + vec_validate (wrk->mq_msg_vector, len + sz - 1); + svm_msg_q_sub_raw_batch (mq, wrk->mq_msg_vector + len, sz); + n_msgs += sz; } return n_msgs; } @@ -179,6 +163,18 @@ format_ip46_address (u8 * s, va_list * args) * VPPCOM Utility Functions */ +static void +vcl_msg_add_ext_config (vcl_session_t *s, uword *offset) +{ + svm_fifo_chunk_t *c; + + c = vcl_segment_alloc_chunk (vcl_vpp_worker_segment_handle (0), + 0 /* one slice only */, s->ext_config->len, + offset); + if (c) + clib_memcpy_fast (c->data, s->ext_config, s->ext_config->len); +} + static void vcl_send_session_listen (vcl_worker_t * wrk, vcl_session_t * s) { @@ -197,9 +193,17 @@ vcl_send_session_listen (vcl_worker_t * wrk, vcl_session_t * s) clib_memcpy_fast (&mp->ip, &s->transport.lcl_ip, sizeof (mp->ip)); mp->port = s->transport.lcl_port; mp->proto = s->session_type; + mp->vrf = s->vrf; if (s->flags & VCL_SESSION_F_CONNECTED) mp->flags = TRANSPORT_CFG_F_CONNECTED; + if (s->ext_config) + vcl_msg_add_ext_config (s, &mp->ext_config); app_send_ctrl_evt_to_vpp (mq, app_evt); + if (s->ext_config) + { + clib_mem_free (s->ext_config); + s->ext_config = 0; + } } static void @@ -215,6 +219,7 @@ vcl_send_session_connect (vcl_worker_t * wrk, vcl_session_t * s) memset (mp, 0, sizeof (*mp)); mp->client_index = wrk->api_client_handle; mp->context = s->session_index; + mp->dscp = s->dscp; mp->wrk_index = wrk->vpp_wrk_index; mp->is_ip4 = s->transport.is_ip4; mp->parent_handle = s->parent_handle; @@ -223,9 +228,18 @@ vcl_send_session_connect (vcl_worker_t * wrk, vcl_session_t * s) mp->port = s->transport.rmt_port; mp->lcl_port = s->transport.lcl_port; mp->proto = s->session_type; + mp->vrf = s->vrf; if (s->flags & VCL_SESSION_F_CONNECTED) mp->flags |= TRANSPORT_CFG_F_CONNECTED; + if (s->ext_config) + vcl_msg_add_ext_config (s, &mp->ext_config); app_send_ctrl_evt_to_vpp (mq, app_evt); + + if (s->ext_config) + { + clib_mem_free (s->ext_config); + s->ext_config = 0; + } } void @@ -246,6 +260,23 @@ vcl_send_session_unlisten (vcl_worker_t * wrk, vcl_session_t * s) app_send_ctrl_evt_to_vpp (mq, app_evt); } +static void +vcl_send_session_shutdown (vcl_worker_t *wrk, vcl_session_t *s) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_shutdown_msg_t *mp; + svm_msg_q_t *mq; + + /* Send to thread that owns the session */ + mq = s->vpp_evt_q; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_SHUTDOWN); + mp = (session_shutdown_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->api_client_handle; + mp->handle = s->vpp_handle; + app_send_ctrl_evt_to_vpp (mq, app_evt); +} + static void vcl_send_session_disconnect (vcl_worker_t * wrk, vcl_session_t * s) { @@ -293,32 +324,33 @@ vcl_send_session_accepted_reply (svm_msg_q_t * mq, u32 context, } static void -vcl_send_session_disconnected_reply (svm_msg_q_t * mq, u32 context, - session_handle_t handle, int retval) +vcl_send_session_disconnected_reply (vcl_worker_t * wrk, vcl_session_t * s, + int retval) { app_session_evt_t _app_evt, *app_evt = &_app_evt; session_disconnected_reply_msg_t *rmp; - app_alloc_ctrl_evt_to_vpp (mq, app_evt, + app_alloc_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt, SESSION_CTRL_EVT_DISCONNECTED_REPLY); rmp = (session_disconnected_reply_msg_t *) app_evt->evt->data; - rmp->handle = handle; - rmp->context = context; + rmp->handle = s->vpp_handle; + rmp->context = wrk->api_client_handle; rmp->retval = retval; - app_send_ctrl_evt_to_vpp (mq, app_evt); + app_send_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt); } static void -vcl_send_session_reset_reply (svm_msg_q_t * mq, u32 context, - session_handle_t handle, int retval) +vcl_send_session_reset_reply (vcl_worker_t * wrk, vcl_session_t * s, + int retval) { app_session_evt_t _app_evt, *app_evt = &_app_evt; session_reset_reply_msg_t *rmp; - app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_RESET_REPLY); + app_alloc_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt, + SESSION_CTRL_EVT_RESET_REPLY); rmp = (session_reset_reply_msg_t *) app_evt->evt->data; - rmp->handle = handle; - rmp->context = context; + rmp->handle = s->vpp_handle; + rmp->context = wrk->api_client_handle; rmp->retval = retval; - app_send_ctrl_evt_to_vpp (mq, app_evt); + app_send_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt); } void @@ -327,16 +359,15 @@ vcl_send_session_worker_update (vcl_worker_t * wrk, vcl_session_t * s, { app_session_evt_t _app_evt, *app_evt = &_app_evt; session_worker_update_msg_t *mp; - svm_msg_q_t *mq; - mq = vcl_session_vpp_evt_q (wrk, s); - app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_WORKER_UPDATE); + app_alloc_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt, + SESSION_CTRL_EVT_WORKER_UPDATE); mp = (session_worker_update_msg_t *) app_evt->evt->data; mp->client_index = wrk->api_client_handle; mp->handle = s->vpp_handle; mp->req_wrk_index = wrk->vpp_wrk_index; mp->wrk_index = wrk_index; - app_send_ctrl_evt_to_vpp (mq, app_evt); + app_send_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt); } int @@ -372,13 +403,47 @@ done: return ret; } +int +vcl_session_transport_attr (vcl_worker_t *wrk, vcl_session_t *s, u8 is_get, + transport_endpt_attr_t *attr) +{ + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_transport_attr_msg_t *mp; + svm_msg_q_t *mq; + f64 timeout; + + ASSERT (!wrk->session_attr_op); + wrk->session_attr_op = 1; + wrk->session_attr_op_rv = -1; + + mq = s->vpp_evt_q; + app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_TRANSPORT_ATTR); + mp = (session_transport_attr_msg_t *) app_evt->evt->data; + memset (mp, 0, sizeof (*mp)); + mp->client_index = wrk->api_client_handle; + mp->handle = s->vpp_handle; + mp->is_get = is_get; + mp->attr = *attr; + app_send_ctrl_evt_to_vpp (mq, app_evt); + + timeout = clib_time_now (&wrk->clib_time) + 1; + + while (wrk->session_attr_op && clib_time_now (&wrk->clib_time) < timeout) + vcl_flush_mq_events (); + + if (!wrk->session_attr_op_rv && is_get) + *attr = wrk->session_attr_rv; + + wrk->session_attr_op = 0; + + return wrk->session_attr_op_rv; +} + static u32 vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp, u32 ls_index) { vcl_session_t *session, *listen_session; - svm_fifo_t *rx_fifo, *tx_fifo; - u32 vpp_wrk_index; svm_msg_q_t *evt_q; session = vcl_session_alloc (wrk); @@ -391,30 +456,15 @@ vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp, goto error; } - if (vcl_segment_is_not_mounted (wrk, mp->segment_handle)) + if (vcl_segment_attach_session ( + mp->segment_handle, mp->server_rx_fifo, mp->server_tx_fifo, + mp->vpp_event_queue_address, mp->mq_index, 0, session)) { - VDBG (0, "ERROR: segment for session %u is not mounted!", - session->session_index); + VDBG (0, "failed to attach fifos for %u", session->session_index); goto error; } - rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); - tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); - session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, - svm_msg_q_t *); - rx_fifo->client_session_index = session->session_index; - tx_fifo->client_session_index = session->session_index; - rx_fifo->client_thread_index = vcl_get_worker_index (); - tx_fifo->client_thread_index = vcl_get_worker_index (); - vpp_wrk_index = tx_fifo->master_thread_index; - vec_validate (wrk->vpp_event_queues, vpp_wrk_index); - wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; - session->vpp_handle = mp->handle; - session->vpp_thread_index = rx_fifo->master_thread_index; - session->rx_fifo = rx_fifo; - session->tx_fifo = tx_fifo; - session->session_state = VCL_STATE_READY; session->transport.rmt_port = mp->rmt.port; session->transport.is_ip4 = mp->rmt.is_ip4; @@ -422,8 +472,8 @@ vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp, sizeof (ip46_address_t)); vcl_session_table_add_vpp_handle (wrk, mp->handle, session->session_index); - session->transport.lcl_port = listen_session->transport.lcl_port; - session->transport.lcl_ip = listen_session->transport.lcl_ip; + session->transport.lcl_port = mp->lcl.port; + session->transport.lcl_ip = mp->lcl.ip; session->session_type = listen_session->session_type; session->is_dgram = vcl_proto_is_dgram (session->session_type); session->listener_index = listen_session->session_index; @@ -442,7 +492,8 @@ vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp, return session->session_index; error: - evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); + vcl_segment_attach_mq (vcl_vpp_worker_segment_handle (0), + mp->vpp_event_queue_address, mp->mq_index, &evt_q); vcl_send_session_accepted_reply (evt_q, mp->context, mp->handle, VNET_API_ERROR_INVALID_ARGUMENT); vcl_session_free (wrk, session); @@ -453,16 +504,25 @@ static u32 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; + u32 session_index; session_index = mp->context; session = vcl_session_get (wrk, session_index); - if (!session) + if (PREDICT_FALSE (!session)) { VDBG (0, "ERROR: vpp handle 0x%llx has no session index (%u)!", mp->handle, session_index); + /* Should not happen but if it does, force vpp session cleanup */ + vcl_session_t tmp_session = { + .vpp_handle = mp->handle, + .vpp_evt_q = 0, + }; + vcl_segment_attach_session ( + mp->segment_handle, mp->server_rx_fifo, mp->server_tx_fifo, + mp->vpp_event_queue_address, mp->mq_index, 0, session); + if (tmp_session.vpp_evt_q) + vcl_send_session_disconnect (wrk, &tmp_session); return VCL_INVALID_SESSION_INDEX; } if (mp->retval) @@ -475,52 +535,37 @@ vcl_session_connected_handler (vcl_worker_t * wrk, } session->vpp_handle = mp->handle; - session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, - svm_msg_q_t *); - rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); - tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); - if (vcl_segment_is_not_mounted (wrk, mp->segment_handle)) + + if (vcl_segment_attach_session ( + mp->segment_handle, mp->server_rx_fifo, mp->server_tx_fifo, + mp->vpp_event_queue_address, mp->mq_index, 0, session)) { - VDBG (0, "segment for session %u is not mounted!", - session->session_index); + VDBG (0, "failed to attach fifos for %u", session->session_index); session->session_state = VCL_STATE_DETACHED; vcl_send_session_disconnect (wrk, session); return session_index; } - 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 (); - - vpp_wrk_index = tx_fifo->master_thread_index; - vec_validate (wrk->vpp_event_queues, vpp_wrk_index); - wrk->vpp_event_queues[vpp_wrk_index] = session->vpp_evt_q; - if (mp->ct_rx_fifo) { - session->ct_rx_fifo = uword_to_pointer (mp->ct_rx_fifo, svm_fifo_t *); - session->ct_tx_fifo = uword_to_pointer (mp->ct_tx_fifo, svm_fifo_t *); - if (vcl_segment_is_not_mounted (wrk, mp->ct_segment_handle)) + if (vcl_segment_attach_session (mp->ct_segment_handle, mp->ct_rx_fifo, + mp->ct_tx_fifo, (uword) ~0, ~0, 1, + session)) { - VDBG (0, "ct segment for session %u is not mounted!", - session->session_index); + VDBG (0, "failed to attach ct fifos for %u", session->session_index); session->session_state = VCL_STATE_DETACHED; vcl_send_session_disconnect (wrk, session); return session_index; } } - session->rx_fifo = rx_fifo; - session->tx_fifo = tx_fifo; - session->vpp_thread_index = rx_fifo->master_thread_index; session->transport.is_ip4 = mp->lcl.is_ip4; clib_memcpy_fast (&session->transport.lcl_ip, &mp->lcl.ip, sizeof (session->transport.lcl_ip)); session->transport.lcl_port = mp->lcl.port; /* Application closed session before connect reply */ - if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK) + if (vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK) && session->session_state == VCL_STATE_CLOSED) vcl_send_session_disconnect (wrk, session); else @@ -618,20 +663,16 @@ vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) vcl_session_table_add_listener (wrk, mp->handle, sid); session->session_state = VCL_STATE_LISTEN; - session->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); - vec_validate (wrk->vpp_event_queues, 0); - wrk->vpp_event_queues[0] = session->vpp_evt_q; - if (vcl_session_is_cl (session)) { - svm_fifo_t *rx_fifo, *tx_fifo; - session->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); - 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; + if (vcl_segment_attach_session (mp->segment_handle, mp->rx_fifo, + mp->tx_fifo, mp->vpp_evt_q, mp->mq_index, + 0, session)) + { + VDBG (0, "failed to attach fifos for %u", session->session_index); + session->session_state = VCL_STATE_DETACHED; + return VCL_INVALID_SESSION_INDEX; + } } VDBG (0, "session %u [0x%llx]: listen succeeded!", sid, mp->handle); @@ -677,6 +718,7 @@ vcl_session_migrated_handler (vcl_worker_t * wrk, void *data) { session_migrated_msg_t *mp = (session_migrated_msg_t *) data; vcl_session_t *s; + u32 fs_index; s = vcl_session_get_w_vpp_handle (wrk, mp->handle); if (!s) @@ -685,23 +727,35 @@ vcl_session_migrated_handler (vcl_worker_t * wrk, void *data) return; } - s->vpp_thread_index = mp->vpp_thread_index; + /* Only validate if a value is provided */ + if (mp->segment_handle != SESSION_INVALID_HANDLE) + { + fs_index = vcl_segment_table_lookup (mp->segment_handle); + if (fs_index == VCL_INVALID_SEGMENT_INDEX) + { + VDBG (0, "segment %lx for session %u is not mounted!", + mp->segment_handle, s->session_index); + s->session_state = VCL_STATE_DETACHED; + return; + } + } + s->vpp_handle = mp->new_handle; - s->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *); - vec_validate (wrk->vpp_event_queues, s->vpp_thread_index); - wrk->vpp_event_queues[s->vpp_thread_index] = s->vpp_evt_q; + vcl_segment_attach_mq (vcl_vpp_worker_segment_handle (0), mp->vpp_evt_q, + mp->vpp_thread_index, &s->vpp_evt_q); vcl_session_table_del_vpp_handle (wrk, mp->handle); vcl_session_table_add_vpp_handle (wrk, mp->new_handle, s->session_index); /* Generate new tx event if we have outstanding data */ if (svm_fifo_has_event (s->tx_fifo)) - app_send_io_evt_to_vpp (s->vpp_evt_q, s->tx_fifo->master_session_index, + app_send_io_evt_to_vpp (s->vpp_evt_q, + s->tx_fifo->shr->master_session_index, SESSION_IO_EVT_TX, SVM_Q_WAIT); VDBG (0, "Migrated 0x%lx to thread %u 0x%lx", mp->handle, - s->vpp_thread_index, mp->new_handle); + mp->vpp_thread_index, mp->new_handle); } static vcl_session_t * @@ -765,6 +819,100 @@ vcl_session_disconnected_handler (vcl_worker_t * wrk, return session; } +int +vppcom_session_shutdown (uint32_t session_handle, int how) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session; + vcl_session_state_t state; + u64 vpp_handle; + + session = vcl_session_get_w_handle (wrk, session_handle); + if (PREDICT_FALSE (!session)) + return VPPCOM_EBADFD; + + vpp_handle = session->vpp_handle; + state = session->session_state; + + VDBG (1, "session %u [0x%llx] state 0x%x (%s)", session->session_index, + vpp_handle, state, vppcom_session_state_str (state)); + + if (PREDICT_FALSE (state == VCL_STATE_LISTEN)) + { + VDBG (0, "ERROR: Cannot shutdown a listen socket!"); + return VPPCOM_EBADFD; + } + + if (how == SHUT_RD || how == SHUT_RDWR) + { + session->flags |= VCL_SESSION_F_RD_SHUTDOWN; + if (how == SHUT_RD) + return VPPCOM_OK; + } + session->flags |= VCL_SESSION_F_WR_SHUTDOWN; + + if (PREDICT_TRUE (state == VCL_STATE_READY)) + { + VDBG (1, "session %u [0x%llx]: sending shutdown...", + session->session_index, vpp_handle); + + vcl_send_session_shutdown (wrk, session); + } + + return VPPCOM_OK; +} + +static int +vppcom_session_disconnect (u32 session_handle) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session, *listen_session; + vcl_session_state_t state; + u64 vpp_handle; + + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + + vpp_handle = session->vpp_handle; + state = session->session_state; + + VDBG (1, "session %u [0x%llx] state 0x%x (%s)", session->session_index, + vpp_handle, state, vppcom_session_state_str (state)); + + if (PREDICT_FALSE (state == VCL_STATE_LISTEN)) + { + VDBG (0, "ERROR: Cannot disconnect a listen socket!"); + return VPPCOM_EBADFD; + } + + if (state == VCL_STATE_VPP_CLOSING) + { + vcl_send_session_disconnected_reply (wrk, session, 0); + VDBG (1, "session %u [0x%llx]: sending disconnect REPLY...", + session->session_index, vpp_handle); + } + else + { + /* Session doesn't have an event queue yet. Probably a non-blocking + * connect. Wait for the reply */ + if (PREDICT_FALSE (!session->vpp_evt_q)) + return VPPCOM_OK; + + VDBG (1, "session %u [0x%llx]: sending disconnect...", + session->session_index, vpp_handle); + vcl_send_session_disconnect (wrk, session); + } + + if (session->listener_index != VCL_INVALID_SESSION_INDEX) + { + listen_session = vcl_session_get (wrk, session->listener_index); + listen_session->n_accepted_sessions--; + } + + return VPPCOM_OK; +} + static void vcl_session_cleanup_handler (vcl_worker_t * wrk, void *data) { @@ -783,10 +931,26 @@ vcl_session_cleanup_handler (vcl_worker_t * wrk, void *data) { /* Transport was cleaned up before we confirmed close. Probably the * app is still waiting for some data that cannot be delivered. - * Confirm close to make sure everything is cleaned up */ + * Confirm close to make sure everything is cleaned up. + * Move to undetermined state to ensure that the session is not + * removed before both vpp and the app cleanup. + * - If the app closes first, the session is moved to CLOSED state + * and the session cleanup notification from vpp removes the + * session. + * - If vpp cleans up the session first, the session is moved to + * DETACHED state lower and subsequently the close from the app + * frees the session + */ if (session->session_state == VCL_STATE_VPP_CLOSING) - vcl_session_cleanup (wrk, session, vcl_session_handle (session), - 1 /* do_disconnect */ ); + { + vppcom_session_disconnect (vcl_session_handle (session)); + session->session_state = VCL_STATE_UPDATED; + } + else if (session->session_state == VCL_STATE_DISCONNECT) + { + vcl_send_session_reset_reply (wrk, session, 0); + session->session_state = VCL_STATE_UPDATED; + } return; } @@ -829,21 +993,15 @@ vcl_session_worker_update_reply_handler (vcl_worker_t * wrk, void *data) VDBG (0, "unknown handle 0x%llx", msg->handle); return; } - if (vcl_segment_is_not_mounted (wrk, msg->segment_handle)) - { - clib_warning ("segment for session %u is not mounted!", - s->session_index); - return; - } if (s->rx_fifo) { - s->rx_fifo = uword_to_pointer (msg->rx_fifo, svm_fifo_t *); - s->tx_fifo = uword_to_pointer (msg->tx_fifo, svm_fifo_t *); - s->rx_fifo->client_session_index = s->session_index; - s->tx_fifo->client_session_index = s->session_index; - s->rx_fifo->client_thread_index = wrk->wrk_index; - s->tx_fifo->client_thread_index = wrk->wrk_index; + if (vcl_segment_attach_session (msg->segment_handle, msg->rx_fifo, + msg->tx_fifo, (uword) ~0, ~0, 0, s)) + { + VDBG (0, "failed to attach fifos for %u", s->session_index); + return; + } } s->session_state = VCL_STATE_UPDATED; @@ -912,11 +1070,30 @@ vcl_worker_rpc_handler (vcl_worker_t * wrk, void *data) (vcm->wrk_rpc_fn) (((session_app_wrk_rpc_msg_t *) data)->data); } +static void +vcl_session_transport_attr_reply_handler (vcl_worker_t *wrk, void *data) +{ + session_transport_attr_reply_msg_t *mp; + + if (!wrk->session_attr_op) + return; + + mp = (session_transport_attr_reply_msg_t *) data; + + wrk->session_attr_op_rv = mp->retval; + wrk->session_attr_op = 0; + wrk->session_attr_rv = mp->attr; +} + static int vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) { session_disconnected_msg_t *disconnected_msg; + session_connected_msg_t *connected_msg; + session_reset_msg_t *reset_msg; + session_event_t *ecpy; vcl_session_t *s; + u32 sid; switch (e->event_type) { @@ -927,27 +1104,58 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) break; vec_add1 (wrk->unhandled_evts_vector, *e); break; + case SESSION_CTRL_EVT_BOUND: + /* We can only wait for only one listen so not postponed */ + vcl_session_bound_handler (wrk, (session_bound_msg_t *) e->data); + break; case SESSION_CTRL_EVT_ACCEPTED: - vcl_session_accepted (wrk, (session_accepted_msg_t *) e->data); + s = vcl_session_accepted (wrk, (session_accepted_msg_t *) e->data); + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + { + vec_add2 (wrk->unhandled_evts_vector, ecpy, 1); + *ecpy = *e; + ecpy->postponed = 1; + ecpy->session_index = s->session_index; + } break; case SESSION_CTRL_EVT_CONNECTED: - vcl_session_connected_handler (wrk, - (session_connected_msg_t *) e->data); + connected_msg = (session_connected_msg_t *) e->data; + sid = vcl_session_connected_handler (wrk, connected_msg); + if (!(s = vcl_session_get (wrk, sid))) + break; + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + { + vec_add2 (wrk->unhandled_evts_vector, ecpy, 1); + *ecpy = *e; + ecpy->postponed = 1; + ecpy->session_index = s->session_index; + } break; case SESSION_CTRL_EVT_DISCONNECTED: disconnected_msg = (session_disconnected_msg_t *) e->data; - s = vcl_session_disconnected_handler (wrk, disconnected_msg); - if (!s) + if (!(s = vcl_session_get_w_vpp_handle (wrk, disconnected_msg->handle))) + break; + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + { + vec_add1 (wrk->unhandled_evts_vector, *e); + break; + } + if (!(s = vcl_session_disconnected_handler (wrk, disconnected_msg))) break; VDBG (0, "disconnected session %u [0x%llx]", s->session_index, s->vpp_handle); break; case SESSION_CTRL_EVT_RESET: + reset_msg = (session_reset_msg_t *) e->data; + if (!(s = vcl_session_get_w_vpp_handle (wrk, reset_msg->handle))) + break; + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + { + vec_add1 (wrk->unhandled_evts_vector, *e); + break; + } vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); break; - case SESSION_CTRL_EVT_BOUND: - vcl_session_bound_handler (wrk, (session_bound_msg_t *) e->data); - break; case SESSION_CTRL_EVT_UNLISTEN_REPLY: vcl_session_unlisten_reply_handler (wrk, e->data); break; @@ -972,6 +1180,9 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) case SESSION_CTRL_EVT_APP_WRK_RPC: vcl_worker_rpc_handler (wrk, e->data); break; + case SESSION_CTRL_EVT_TRANSPORT_ATTR_REPLY: + vcl_session_transport_attr_reply_handler (wrk, e->data); + break; default: clib_warning ("unhandled %u", e->event_type); } @@ -1046,18 +1257,15 @@ vcl_handle_pending_wrk_updates (vcl_worker_t * wrk) } void -vcl_flush_mq_events (void) +vcl_worker_flush_mq_events (vcl_worker_t *wrk) { - vcl_worker_t *wrk = vcl_worker_get_current (); svm_msg_q_msg_t *msg; session_event_t *e; svm_msg_q_t *mq; int i; mq = wrk->app_event_queue; - svm_msg_q_lock (mq); vcl_mq_dequeue_batch (wrk, mq, ~0); - svm_msg_q_unlock (mq); for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { @@ -1070,6 +1278,12 @@ vcl_flush_mq_events (void) vcl_handle_pending_wrk_updates (wrk); } +void +vcl_flush_mq_events (void) +{ + vcl_worker_flush_mq_events (vcl_worker_get_current ()); +} + static int vppcom_session_unbind (u32 session_handle) { @@ -1090,7 +1304,7 @@ vppcom_session_unbind (u32 session_handle) vcl_session_table_del_vpp_handle (wrk, accepted_msg->handle); vcl_send_session_accepted_reply (session->vpp_evt_q, accepted_msg->context, - session->vpp_handle, -1); + accepted_msg->handle, -1); } clib_fifo_free (session->accept_evts_fifo); @@ -1106,60 +1320,6 @@ vppcom_session_unbind (u32 session_handle) return VPPCOM_OK; } -static int -vppcom_session_disconnect (u32 session_handle) -{ - vcl_worker_t *wrk = vcl_worker_get_current (); - svm_msg_q_t *vpp_evt_q; - vcl_session_t *session, *listen_session; - vcl_session_state_t state; - u64 vpp_handle; - - session = vcl_session_get_w_handle (wrk, session_handle); - if (!session) - return VPPCOM_EBADFD; - - vpp_handle = session->vpp_handle; - state = session->session_state; - - VDBG (1, "session %u [0x%llx] state 0x%x (%s)", session->session_index, - vpp_handle, state, vppcom_session_state_str (state)); - - if (PREDICT_FALSE (state == VCL_STATE_LISTEN)) - { - VDBG (0, "ERROR: Cannot disconnect a listen socket!"); - return VPPCOM_EBADFD; - } - - if (state == VCL_STATE_VPP_CLOSING) - { - vpp_evt_q = vcl_session_vpp_evt_q (wrk, session); - vcl_send_session_disconnected_reply (vpp_evt_q, wrk->api_client_handle, - vpp_handle, 0); - VDBG (1, "session %u [0x%llx]: sending disconnect REPLY...", - session->session_index, vpp_handle); - } - else - { - /* Session doesn't have an event queue yet. Probably a non-blocking - * connect. Wait for the reply */ - if (PREDICT_FALSE (!session->vpp_evt_q)) - return VPPCOM_OK; - - VDBG (1, "session %u [0x%llx]: sending disconnect...", - session->session_index, vpp_handle); - vcl_send_session_disconnect (wrk, session); - } - - if (session->listener_index != VCL_INVALID_SESSION_INDEX) - { - listen_session = vcl_session_get (wrk, session->listener_index); - listen_session->n_accepted_sessions--; - } - - return VPPCOM_OK; -} - /** * Handle app exit * @@ -1219,8 +1379,8 @@ vppcom_app_create (const char *app_name) vcm->main_cpu = pthread_self (); vcm->main_pid = getpid (); vcm->app_name = format (0, "%s", app_name); - fifo_segment_main_init (&vcm->segment_main, vcl_cfg->segment_baseva, - 20 /* timeout in secs */ ); + fifo_segment_main_init (&vcm->segment_main, (uword) ~0, + 20 /* timeout in secs */); pool_alloc (vcm->workers, vcl_cfg->max_workers); clib_spinlock_init (&vcm->workers_lock); clib_rwlock_init (&vcm->segment_table_lock); @@ -1253,10 +1413,10 @@ vppcom_app_destroy (void) current_wrk = vcl_worker_get_current (); /* *INDENT-OFF* */ - pool_foreach (wrk, vcm->workers, ({ + pool_foreach (wrk, vcm->workers) { if (current_wrk != wrk) vcl_worker_cleanup (wrk, 0 /* notify vpp */ ); - })); + } /* *INDENT-ON* */ vcl_api_detach (current_wrk); @@ -1288,7 +1448,7 @@ vppcom_session_create (u8 proto, u8 is_nonblocking) session->is_dgram = vcl_proto_is_dgram (proto); if (is_nonblocking) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK); + vcl_session_set_attr (session, VCL_SESS_ATTR_NONBLOCK); vcl_evt (VCL_EVT_CREATE, session, session_type, session->session_state, is_nonblocking, session_index); @@ -1298,61 +1458,98 @@ vppcom_session_create (u8 proto, u8 is_nonblocking) return vcl_session_handle (session); } +static void +vcl_epoll_lt_add (vcl_worker_t *wrk, vcl_session_t *s) +{ + vcl_session_t *cur, *prev; + + if (wrk->ep_lt_current == VCL_INVALID_SESSION_INDEX) + { + wrk->ep_lt_current = s->session_index; + s->vep.lt_next = s->session_index; + s->vep.lt_prev = s->session_index; + return; + } + + cur = vcl_session_get (wrk, wrk->ep_lt_current); + prev = vcl_session_get (wrk, cur->vep.lt_prev); + + prev->vep.lt_next = s->session_index; + s->vep.lt_prev = prev->session_index; + + s->vep.lt_next = cur->session_index; + cur->vep.lt_prev = s->session_index; +} + +static void +vcl_epoll_lt_del (vcl_worker_t *wrk, vcl_session_t *s) +{ + vcl_session_t *prev, *next; + + if (s->vep.lt_next == s->session_index) + { + wrk->ep_lt_current = VCL_INVALID_SESSION_INDEX; + s->vep.lt_next = VCL_INVALID_SESSION_INDEX; + return; + } + + prev = vcl_session_get (wrk, s->vep.lt_prev); + next = vcl_session_get (wrk, s->vep.lt_next); + + prev->vep.lt_next = next->session_index; + next->vep.lt_prev = prev->session_index; + + if (s->session_index == wrk->ep_lt_current) + wrk->ep_lt_current = s->vep.lt_next; + + s->vep.lt_next = VCL_INVALID_SESSION_INDEX; +} + int vcl_session_cleanup (vcl_worker_t * wrk, vcl_session_t * s, vcl_session_handle_t sh, u8 do_disconnect) { - vcl_session_state_t state; - u32 next_sh, vep_sh; int rv = VPPCOM_OK; - u64 vpp_handle; - u8 is_vep; - is_vep = s->is_vep; - next_sh = s->vep.next_sh; - vep_sh = s->vep.vep_sh; - state = s->session_state; - vpp_handle = s->vpp_handle; + VDBG (1, "session %u [0x%llx] closing", s->session_index, s->vpp_handle); - VDBG (1, "session %u [0x%llx] closing", s->session_index, vpp_handle); - - if (is_vep) + if (s->flags & VCL_SESSION_F_IS_VEP) { + u32 next_sh = s->vep.next_sh; while (next_sh != ~0) { rv = vppcom_epoll_ctl (sh, EPOLL_CTL_DEL, next_sh, 0); if (PREDICT_FALSE (rv < 0)) VDBG (0, "vpp handle 0x%llx, sh %u: EPOLL_CTL_DEL vep_idx %u" - " failed! rv %d (%s)", vpp_handle, next_sh, vep_sh, rv, - vppcom_retval_str (rv)); - + " failed! rv %d (%s)", s->vpp_handle, next_sh, + s->vep.vep_sh, rv, vppcom_retval_str (rv)); next_sh = s->vep.next_sh; } - goto cleanup; + goto free_session; } - if (s->is_vep_session) + if (s->flags & VCL_SESSION_F_IS_VEP_SESSION) { - rv = vppcom_epoll_ctl (vep_sh, EPOLL_CTL_DEL, sh, 0); + rv = vppcom_epoll_ctl (s->vep.vep_sh, EPOLL_CTL_DEL, sh, 0); if (rv < 0) VDBG (0, "session %u [0x%llx]: EPOLL_CTL_DEL vep_idx %u " - "failed! rv %d (%s)", s->session_index, vpp_handle, - vep_sh, rv, vppcom_retval_str (rv)); + "failed! rv %d (%s)", s->session_index, s->vpp_handle, + s->vep.vep_sh, rv, vppcom_retval_str (rv)); } if (!do_disconnect) { VDBG (1, "session %u [0x%llx] disconnect skipped", - s->session_index, vpp_handle); + s->session_index, s->vpp_handle); goto cleanup; } - if (state == VCL_STATE_LISTEN) + if (s->session_state == VCL_STATE_LISTEN) { rv = vppcom_session_unbind (sh); if (PREDICT_FALSE (rv < 0)) VDBG (0, "session %u [0x%llx]: listener unbind failed! " - "rv %d (%s)", s->session_index, vpp_handle, rv, + "rv %d (%s)", s->session_index, s->vpp_handle, rv, vppcom_retval_str (rv)); return rv; } @@ -1362,16 +1559,14 @@ vcl_session_cleanup (vcl_worker_t * wrk, vcl_session_t * s, rv = vppcom_session_disconnect (sh); if (PREDICT_FALSE (rv < 0)) VDBG (0, "ERROR: session %u [0x%llx]: disconnect failed!" - " rv %d (%s)", s->session_index, vpp_handle, + " rv %d (%s)", s->session_index, s->vpp_handle, rv, vppcom_retval_str (rv)); } - else if (state == VCL_STATE_DISCONNECT) + else if (s->session_state == VCL_STATE_DISCONNECT) { - svm_msg_q_t *mq = vcl_session_vpp_evt_q (wrk, s); - vcl_send_session_reset_reply (mq, wrk->api_client_handle, - s->vpp_handle, 0); + vcl_send_session_reset_reply (wrk, s, 0); } - else if (state == VCL_STATE_DETACHED) + else if (s->session_state == VCL_STATE_DETACHED) { /* Should not happen. VPP cleaned up before app confirmed close */ VDBG (0, "vpp freed session %d before close", s->session_index); @@ -1384,7 +1579,7 @@ vcl_session_cleanup (vcl_worker_t * wrk, vcl_session_t * s, return rv; cleanup: - vcl_session_table_del_vpp_handle (wrk, vpp_handle); + vcl_session_table_del_vpp_handle (wrk, s->vpp_handle); free_session: vcl_session_free (wrk, s); vcl_evt (VCL_EVT_CLOSE, s, rv); @@ -1418,7 +1613,7 @@ vppcom_session_bind (uint32_t session_handle, vppcom_endpt_t * ep) if (!session) return VPPCOM_EBADFD; - if (session->is_vep) + if (session->flags & VCL_SESSION_F_IS_VEP) { VDBG (0, "ERROR: cannot bind to epoll session %u!", session->session_index); @@ -1458,12 +1653,9 @@ vppcom_session_listen (uint32_t listen_sh, uint32_t q_len) int rv; listen_session = vcl_session_get_w_handle (wrk, listen_sh); - if (!listen_session || listen_session->is_vep) + if (!listen_session || (listen_session->flags & VCL_SESSION_F_IS_VEP)) return VPPCOM_EBADFD; - if (q_len == 0 || q_len == ~0) - q_len = vcm->cfg.listen_queue_size; - listen_vpp_handle = listen_session->vpp_handle; if (listen_session->session_state == VCL_STATE_LISTEN) { @@ -1497,7 +1689,7 @@ vppcom_session_listen (uint32_t listen_sh, uint32_t q_len) static int validate_args_session_accept_ (vcl_worker_t * wrk, vcl_session_t * ls) { - if (ls->is_vep) + if (ls->flags & VCL_SESSION_F_IS_VEP) { VDBG (0, "ERROR: cannot accept on epoll session %u!", ls->session_index); @@ -1507,8 +1699,7 @@ validate_args_session_accept_ (vcl_worker_t * wrk, vcl_session_t * ls) if ((ls->session_state != VCL_STATE_LISTEN) && (!vcl_session_is_connectable_listener (wrk, ls))) { - VDBG (0, - "ERROR: session [0x%llx]: not in listen state! state 0x%x" + VDBG (0, "ERROR: session [0x%llx]: not in listen state! state 0x%x" " (%s)", ls->vpp_handle, ls->session_state, vppcom_session_state_str (ls->session_state)); return VPPCOM_EBADFD; @@ -1535,6 +1726,14 @@ vppcom_unformat_proto (uint8_t * proto, char *proto_str) *proto = VPPCOM_PROTO_QUIC; else if (!strcmp (proto_str, "quic")) *proto = VPPCOM_PROTO_QUIC; + else if (!strcmp (proto_str, "DTLS")) + *proto = VPPCOM_PROTO_DTLS; + else if (!strcmp (proto_str, "dtls")) + *proto = VPPCOM_PROTO_DTLS; + else if (!strcmp (proto_str, "SRTP")) + *proto = VPPCOM_PROTO_SRTP; + else if (!strcmp (proto_str, "srtp")) + *proto = VPPCOM_PROTO_SRTP; else return 1; return 0; @@ -1550,11 +1749,11 @@ vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, vcl_session_t *listen_session = 0; vcl_session_t *client_session = 0; vcl_session_msg_t *evt; - svm_msg_q_msg_t msg; - session_event_t *e; u8 is_nonblocking; int rv; +again: + listen_session = vcl_session_get_w_handle (wrk, listen_session_handle); if (!listen_session) return VPPCOM_EBADFD; @@ -1571,26 +1770,16 @@ vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, goto handle; } - is_nonblocking = VCL_SESS_ATTR_TEST (listen_session->attr, - VCL_SESS_ATTR_NONBLOCK); + is_nonblocking = vcl_session_has_attr (listen_session, + VCL_SESS_ATTR_NONBLOCK); while (1) { if (svm_msg_q_is_empty (wrk->app_event_queue) && is_nonblocking) return VPPCOM_EAGAIN; - if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_WAIT, 0)) - return VPPCOM_EAGAIN; - - e = svm_msg_q_msg_data (wrk->app_event_queue, &msg); - if (e->event_type != SESSION_CTRL_EVT_ACCEPTED) - { - vcl_handle_mq_event (wrk, e); - svm_msg_q_free_msg (wrk->app_event_queue, &msg); - continue; - } - clib_memcpy_fast (&accepted_msg, e->data, sizeof (accepted_msg)); - svm_msg_q_free_msg (wrk->app_event_queue, &msg); - break; + svm_msg_q_wait (wrk->app_event_queue, SVM_MQ_WAIT_EMPTY); + vcl_worker_flush_mq_events (wrk); + goto again; } handle: @@ -1604,13 +1793,13 @@ handle: client_session = vcl_session_get (wrk, client_session_index); if (flags & O_NONBLOCK) - VCL_SESS_ATTR_SET (client_session->attr, VCL_SESS_ATTR_NONBLOCK); + vcl_session_set_attr (client_session, VCL_SESS_ATTR_NONBLOCK); VDBG (1, "listener %u [0x%llx]: Got a connect request! session %u [0x%llx]," " flags %d, is_nonblocking %u", listen_session->session_index, listen_session->vpp_handle, client_session_index, client_session->vpp_handle, flags, - VCL_SESS_ATTR_TEST (client_session->attr, VCL_SESS_ATTR_NONBLOCK)); + vcl_session_has_attr (client_session, VCL_SESS_ATTR_NONBLOCK)); if (ep) { @@ -1662,7 +1851,7 @@ vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) return VPPCOM_EBADFD; session_index = session->session_index; - if (PREDICT_FALSE (session->is_vep)) + if (PREDICT_FALSE (session->flags & VCL_SESSION_F_IS_VEP)) { VDBG (0, "ERROR: cannot connect epoll session %u!", session->session_index); @@ -1710,7 +1899,7 @@ vppcom_session_connect (uint32_t session_handle, vppcom_endpt_t * server_ep) vcl_send_session_connect (wrk, session); - if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)) + if (vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK)) { /* State set to STATE_UPDATED to ensure the session is not assumed * to be ready and to also allow the app to close it prior to vpp's @@ -1750,7 +1939,7 @@ vppcom_session_stream_connect (uint32_t session_handle, session_index = session->session_index; parent_session_index = parent_session->session_index; - if (PREDICT_FALSE (session->is_vep)) + if (PREDICT_FALSE (session->flags & VCL_SESSION_F_IS_VEP)) { VDBG (0, "ERROR: cannot connect epoll session %u!", session->session_index); @@ -1796,12 +1985,6 @@ vppcom_session_stream_connect (uint32_t session_handle, return rv; } -static u8 -vcl_is_rx_evt_for_session (session_event_t * e, u32 sid, u8 is_ct) -{ - return (e->event_type == SESSION_IO_EVT_RX && e->session_index == sid); -} - static inline int vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, u8 peek) @@ -1810,16 +1993,15 @@ vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, int rv, n_read = 0, is_nonblocking; vcl_session_t *s = 0; svm_fifo_t *rx_fifo; - svm_msg_q_msg_t msg; session_event_t *e; svm_msg_q_t *mq; u8 is_ct; if (PREDICT_FALSE (!buf)) - return VPPCOM_EINVAL; + return VPPCOM_EFAULT; s = vcl_session_get_w_handle (wrk, session_handle); - if (PREDICT_FALSE (!s || s->is_vep)) + if (PREDICT_FALSE (!s || (s->flags & VCL_SESSION_F_IS_VEP))) return VPPCOM_EBADFD; if (PREDICT_FALSE (!vcl_session_is_open (s))) @@ -1830,11 +2012,23 @@ vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, return vcl_session_closed_error (s); } - is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_RD_SHUTDOWN)) + { + /* Vpp would ack the incoming data and enqueue it for reading. + * So even if SHUT_RD is set, we can still read() the data if + * the session is ready. + */ + if (!vcl_session_read_ready (s)) + { + return 0; + } + } + + is_nonblocking = vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK); is_ct = vcl_session_is_ct (s); mq = wrk->app_event_queue; rx_fifo = is_ct ? s->ct_rx_fifo : s->rx_fifo; - s->has_rx_evt = 0; + s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; if (svm_fifo_is_empty_cons (rx_fifo)) { @@ -1842,7 +2036,9 @@ vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, { if (vcl_session_is_closing (s)) return vcl_session_closing_error (s); - svm_fifo_unset_event (s->rx_fifo); + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); return VPPCOM_EWOULDBLOCK; } while (svm_fifo_is_empty_cons (rx_fifo)) @@ -1850,17 +2046,12 @@ vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, if (vcl_session_is_closing (s)) return vcl_session_closing_error (s); - svm_fifo_unset_event (s->rx_fifo); - svm_msg_q_lock (mq); - if (svm_msg_q_is_empty (mq)) - svm_msg_q_wait (mq); + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); - 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); + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); + vcl_worker_flush_mq_events (wrk); } } @@ -1872,23 +2063,29 @@ read_again: rv = app_recv_stream_raw (rx_fifo, buf, n, 0, peek); ASSERT (rv >= 0); + + if (peek) + return rv; + n_read += rv; if (svm_fifo_is_empty_cons (rx_fifo)) { - svm_fifo_unset_event (s->rx_fifo); + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); if (!svm_fifo_is_empty_cons (rx_fifo) - && svm_fifo_set_event (s->rx_fifo) && is_nonblocking) + && svm_fifo_set_event (rx_fifo) && is_nonblocking) { vec_add2 (wrk->unhandled_evts_vector, e, 1); e->event_type = SESSION_IO_EVT_RX; e->session_index = s->session_index; } } - else if (PREDICT_FALSE (rv < n)) + else if (PREDICT_FALSE (rv < n && !s->is_dgram)) { /* More data enqueued while reading. Try to drain it - * or fill the buffer */ + * or fill the buffer. Avoid doing that for dgrams */ buf += rv; n -= rv; goto read_again; @@ -1897,7 +2094,8 @@ read_again: if (PREDICT_FALSE (svm_fifo_needs_deq_ntf (rx_fifo, n_read))) { svm_fifo_clear_deq_ntf (rx_fifo); - app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo->master_session_index, + app_send_io_evt_to_vpp (s->vpp_evt_q, + s->rx_fifo->shr->master_session_index, SESSION_IO_EVT_RX, SVM_Q_WAIT); } @@ -1928,31 +2126,28 @@ vppcom_session_read_segments (uint32_t session_handle, int n_read = 0, 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)) + if (PREDICT_FALSE (!s || (s->flags & VCL_SESSION_F_IS_VEP))) return VPPCOM_EBADFD; if (PREDICT_FALSE (!vcl_session_is_open (s))) return vcl_session_closed_error (s); - is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + is_nonblocking = vcl_session_has_attr (s, 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 (is_ct) - svm_fifo_unset_event (s->rx_fifo); + mq = wrk->app_event_queue; + rx_fifo = is_ct ? s->ct_rx_fifo : s->rx_fifo; + s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; if (svm_fifo_is_empty_cons (rx_fifo)) { if (is_nonblocking) { + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); svm_fifo_unset_event (rx_fifo); return VPPCOM_EWOULDBLOCK; } @@ -1961,17 +2156,12 @@ vppcom_session_read_segments (uint32_t session_handle, if (vcl_session_is_closing (s)) return vcl_session_closing_error (s); + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); svm_fifo_unset_event (rx_fifo); - svm_msg_q_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); + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); + vcl_worker_flush_mq_events (wrk); } } @@ -1982,10 +2172,12 @@ vppcom_session_read_segments (uint32_t session_handle, if (svm_fifo_max_dequeue_cons (rx_fifo) == n_read) { - svm_fifo_unset_event (s->rx_fifo); + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); if (svm_fifo_max_dequeue_cons (rx_fifo) != n_read - && svm_fifo_set_event (s->rx_fifo) - && VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK)) + && svm_fifo_set_event (rx_fifo) + && vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) { session_event_t *e; vec_add2 (wrk->unhandled_evts_vector, e, 1); @@ -2003,23 +2195,19 @@ vppcom_session_free_segments (uint32_t session_handle, uint32_t n_bytes) { vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *s; + u8 is_ct; s = vcl_session_get_w_handle (wrk, session_handle); - if (PREDICT_FALSE (!s || s->is_vep)) + if (PREDICT_FALSE (!s || (s->flags & VCL_SESSION_F_IS_VEP))) return; - svm_fifo_dequeue_drop (s->rx_fifo, n_bytes); + is_ct = vcl_session_is_ct (s); + svm_fifo_dequeue_drop (is_ct ? s->ct_rx_fifo : s->rx_fifo, n_bytes); - ASSERT (s->rx_bytes_pending < n_bytes); + ASSERT (s->rx_bytes_pending >= n_bytes); s->rx_bytes_pending -= n_bytes; } -static u8 -vcl_is_tx_evt_for_session (session_event_t * e, u32 sid, u8 is_ct) -{ - return (e->event_type == SESSION_IO_EVT_TX && e->session_index == sid); -} - always_inline u8 vcl_fifo_is_writeable (svm_fifo_t * f, u32 len, u8 is_dgram) { @@ -2036,16 +2224,18 @@ vppcom_session_write_inline (vcl_worker_t * wrk, vcl_session_t * s, void *buf, { int n_write, is_nonblocking; session_evt_type_t et; - svm_msg_q_msg_t msg; svm_fifo_t *tx_fifo; - session_event_t *e; svm_msg_q_t *mq; u8 is_ct; - if (PREDICT_FALSE (!buf || n == 0)) - return VPPCOM_EINVAL; + /* Accept zero length writes but just return */ + if (PREDICT_FALSE (!n)) + return VPPCOM_OK; - if (PREDICT_FALSE (s->is_vep)) + if (PREDICT_FALSE (!buf)) + return VPPCOM_EFAULT; + + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_IS_VEP)) { VDBG (0, "ERROR: session %u [0x%llx]: cannot write to an epoll" " session!", s->session_index, s->vpp_handle); @@ -2060,9 +2250,17 @@ vppcom_session_write_inline (vcl_worker_t * wrk, vcl_session_t * s, void *buf, return vcl_session_closed_error (s);; } + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_WR_SHUTDOWN)) + { + VDBG (1, "session %u [0x%llx]: is shutdown! state 0x%x (%s)", + s->session_index, s->vpp_handle, s->session_state, + vppcom_session_state_str (s->session_state)); + return VPPCOM_EPIPE; + } + is_ct = vcl_session_is_ct (s); tx_fifo = is_ct ? s->ct_tx_fifo : s->tx_fifo; - is_nonblocking = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + is_nonblocking = vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK); mq = wrk->app_event_queue; if (!vcl_fifo_is_writeable (tx_fifo, n, is_dgram)) @@ -2076,17 +2274,9 @@ vppcom_session_write_inline (vcl_worker_t * wrk, vcl_session_t * s, void *buf, svm_fifo_add_want_deq_ntf (tx_fifo, SVM_FIFO_WANT_DEQ_NOTIF); if (vcl_session_is_closing (s)) return vcl_session_closing_error (s); - svm_msg_q_lock (mq); - if (svm_msg_q_is_empty (mq)) - svm_msg_q_wait (mq); - svm_msg_q_sub_w_lock (mq, &msg); - e = svm_msg_q_msg_data (mq, &msg); - svm_msg_q_unlock (mq); - - if (!vcl_is_tx_evt_for_session (e, s->session_index, is_ct)) - vcl_handle_mq_event (wrk, e); - svm_msg_q_free_msg (mq, &msg); + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); + vcl_worker_flush_mq_events (wrk); } } @@ -2103,8 +2293,8 @@ vppcom_session_write_inline (vcl_worker_t * wrk, vcl_session_t * s, void *buf, 0 /* do_evt */ , SVM_Q_WAIT); if (svm_fifo_set_event (s->tx_fifo)) - app_send_io_evt_to_vpp (s->vpp_evt_q, s->tx_fifo->master_session_index, - et, SVM_Q_WAIT); + app_send_io_evt_to_vpp ( + s->vpp_evt_q, s->tx_fifo->shr->master_session_index, et, SVM_Q_WAIT); /* The underlying fifo segment can run out of memory */ if (PREDICT_FALSE (n_write < 0)) @@ -2171,17 +2361,17 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, { session_disconnected_msg_t *disconnected_msg; session_connected_msg_t *connected_msg; - vcl_session_t *session; + vcl_session_t *s; u32 sid; switch (e->event_type) { case SESSION_IO_EVT_RX: sid = e->session_index; - session = vcl_session_get (wrk, sid); - if (!session || !vcl_session_is_open (session)) + s = vcl_session_get (wrk, sid); + if (!s || !vcl_session_is_open (s)) break; - vcl_fifo_rx_evt_valid_or_break (session); + vcl_fifo_rx_evt_valid_or_break (s); if (sid < n_bits && read_map) { clib_bitmap_set_no_check ((uword *) read_map, sid, 1); @@ -2190,8 +2380,8 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, break; case SESSION_IO_EVT_TX: sid = e->session_index; - session = vcl_session_get (wrk, sid); - if (!session || !vcl_session_is_open (session)) + s = vcl_session_get (wrk, sid); + if (!s || !vcl_session_is_open (s)) break; if (sid < n_bits && write_map) { @@ -2200,11 +2390,13 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, } break; case SESSION_CTRL_EVT_ACCEPTED: - session = vcl_session_accepted (wrk, - (session_accepted_msg_t *) e->data); - if (!session) + if (!e->postponed) + s = vcl_session_accepted (wrk, (session_accepted_msg_t *) e->data); + else + s = vcl_session_get (wrk, e->session_index); + if (!s) break; - sid = session->session_index; + sid = s->session_index; if (sid < n_bits && read_map) { clib_bitmap_set_no_check ((uword *) read_map, sid, 1); @@ -2212,8 +2404,13 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, } break; case SESSION_CTRL_EVT_CONNECTED: - connected_msg = (session_connected_msg_t *) e->data; - sid = vcl_session_connected_handler (wrk, connected_msg); + if (!e->postponed) + { + connected_msg = (session_connected_msg_t *) e->data; + sid = vcl_session_connected_handler (wrk, connected_msg); + } + else + sid = e->session_index; if (sid == VCL_INVALID_SESSION_INDEX) break; if (sid < n_bits && write_map) @@ -2224,10 +2421,10 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, break; case SESSION_CTRL_EVT_DISCONNECTED: disconnected_msg = (session_disconnected_msg_t *) e->data; - session = vcl_session_disconnected_handler (wrk, disconnected_msg); - if (!session) + s = vcl_session_disconnected_handler (wrk, disconnected_msg); + if (!s) break; - sid = session->session_index; + sid = s->session_index; if (sid < n_bits && except_map) { clib_bitmap_set_no_check ((uword *) except_map, sid, 1); @@ -2282,35 +2479,22 @@ vcl_select_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, session_event_t *e; u32 i; - svm_msg_q_lock (mq); if (svm_msg_q_is_empty (mq)) - { - if (*bits_set) - { - svm_msg_q_unlock (mq); - return 0; - } + { + if (*bits_set) + return 0; if (!time_to_wait) - { - svm_msg_q_unlock (mq); - return 0; - } + return 0; else if (time_to_wait < 0) - { - svm_msg_q_wait (mq); - } + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); else { if (svm_msg_q_timedwait (mq, time_to_wait)) - { - svm_msg_q_unlock (mq); - return 0; - } + return 0; } } vcl_mq_dequeue_batch (wrk, mq, ~0); - svm_msg_q_unlock (mq); for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) { @@ -2386,7 +2570,7 @@ vppcom_select (int n_bits, vcl_si_set * read_map, vcl_si_set * write_map, { u32 sid, minbits = clib_max (n_bits, BITS (uword)), bits_set = 0; vcl_worker_t *wrk = vcl_worker_get_current (); - vcl_session_t *session = 0; + vcl_session_t *s = 0; int i; if (n_bits && read_map) @@ -2417,43 +2601,46 @@ vppcom_select (int n_bits, vcl_si_set * read_map, vcl_si_set * write_map, if (!write_map) goto check_rd; - /* *INDENT-OFF* */ - clib_bitmap_foreach (sid, wrk->wr_bitmap, ({ - if (!(session = vcl_session_get (wrk, sid))) - { - clib_bitmap_set_no_check ((uword*)write_map, sid, 1); - bits_set++; - continue; - } + clib_bitmap_foreach (sid, wrk->wr_bitmap) + { + if (!(s = vcl_session_get (wrk, sid))) + { + clib_bitmap_set_no_check ((uword *) write_map, sid, 1); + bits_set++; + continue; + } - if (vcl_session_write_ready (session)) - { - clib_bitmap_set_no_check ((uword*)write_map, sid, 1); - bits_set++; - } - else - svm_fifo_add_want_deq_ntf (session->tx_fifo, SVM_FIFO_WANT_DEQ_NOTIF); - })); + if (vcl_session_write_ready (s)) + { + clib_bitmap_set_no_check ((uword *) write_map, sid, 1); + bits_set++; + } + else + { + svm_fifo_t *txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF); + } + } check_rd: if (!read_map) goto check_mq; - clib_bitmap_foreach (sid, wrk->rd_bitmap, ({ - if (!(session = vcl_session_get (wrk, sid))) - { - clib_bitmap_set_no_check ((uword*)read_map, sid, 1); - bits_set++; - continue; - } - - if (vcl_session_read_ready (session)) - { - clib_bitmap_set_no_check ((uword*)read_map, sid, 1); - bits_set++; - } - })); - /* *INDENT-ON* */ + clib_bitmap_foreach (sid, wrk->rd_bitmap) + { + if (!(s = vcl_session_get (wrk, sid))) + { + clib_bitmap_set_no_check ((uword *) read_map, sid, 1); + bits_set++; + continue; + } + + if (vcl_session_read_ready (s)) + { + clib_bitmap_set_no_check ((uword *) read_map, sid, 1); + bits_set++; + } + } check_mq: @@ -2477,55 +2664,55 @@ check_mq: static inline void vep_verify_epoll_chain (vcl_worker_t * wrk, u32 vep_handle) { - vcl_session_t *session; vppcom_epoll_t *vep; u32 sh = vep_handle; + vcl_session_t *s; if (VPPCOM_DEBUG <= 2) return; - session = vcl_session_get_w_handle (wrk, vep_handle); - if (PREDICT_FALSE (!session)) + s = vcl_session_get_w_handle (wrk, vep_handle); + if (PREDICT_FALSE (!s)) { VDBG (0, "ERROR: Invalid vep_sh (%u)!", vep_handle); goto done; } - if (PREDICT_FALSE (!session->is_vep)) + if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP))) { VDBG (0, "ERROR: vep_sh (%u) is not a vep!", vep_handle); goto done; } - vep = &session->vep; + vep = &s->vep; VDBG (0, "vep_sh (%u): Dumping epoll chain\n" "{\n" " is_vep = %u\n" " is_vep_session = %u\n" " next_sh = 0x%x (%u)\n" - "}\n", vep_handle, session->is_vep, session->is_vep_session, - vep->next_sh, vep->next_sh); + "}\n", vep_handle, s->flags & VCL_SESSION_F_IS_VEP, + s->flags & VCL_SESSION_F_IS_VEP_SESSION, vep->next_sh, vep->next_sh); for (sh = vep->next_sh; sh != ~0; sh = vep->next_sh) { - session = vcl_session_get_w_handle (wrk, sh); - if (PREDICT_FALSE (!session)) + s = vcl_session_get_w_handle (wrk, sh); + if (PREDICT_FALSE (!s)) { VDBG (0, "ERROR: Invalid sh (%u)!", sh); goto done; } - if (PREDICT_FALSE (session->is_vep)) + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_IS_VEP)) { VDBG (0, "ERROR: sh (%u) is a vep!", vep_handle); } - else if (PREDICT_FALSE (!session->is_vep_session)) + else if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION))) { VDBG (0, "ERROR: sh (%u) is not a vep session handle!", sh); goto done; } - vep = &session->vep; + vep = &s->vep; if (PREDICT_FALSE (vep->vep_sh != vep_handle)) VDBG (0, "ERROR: session (%u) vep_sh (%u) != vep_sh (%u)!", - sh, session->vep.vep_sh, vep_handle); - if (session->is_vep_session) + sh, s->vep.vep_sh, vep_handle); + if (s->flags & VCL_SESSION_F_IS_VEP_SESSION) { VDBG (0, "vep_sh[%u]: sh 0x%x (%u)\n" "{\n" @@ -2554,7 +2741,7 @@ vppcom_epoll_create (void) vep_session = vcl_session_alloc (wrk); - vep_session->is_vep = 1; + vep_session->flags |= VCL_SESSION_F_IS_VEP; vep_session->vep.vep_sh = ~0; vep_session->vep.next_sh = ~0; vep_session->vep.prev_sh = ~0; @@ -2571,8 +2758,8 @@ 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 (); + int rv = VPPCOM_OK, add_evt = 0; vcl_session_t *vep_session; - int rv = VPPCOM_OK; vcl_session_t *s; svm_fifo_t *txf; @@ -2588,7 +2775,7 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, VDBG (0, "Invalid vep_sh (%u)!", vep_handle); return VPPCOM_EBADFD; } - if (PREDICT_FALSE (!vep_session->is_vep)) + if (PREDICT_FALSE (!(vep_session->flags & VCL_SESSION_F_IS_VEP))) { VDBG (0, "vep_sh (%u) is not a vep!", vep_handle); return VPPCOM_EINVAL; @@ -2603,7 +2790,7 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, VDBG (0, "Invalid session_handle (%u)!", session_handle); return VPPCOM_EBADFD; } - if (PREDICT_FALSE (s->is_vep)) + if (PREDICT_FALSE (s->flags & VCL_SESSION_F_IS_VEP)) { VDBG (0, "session_handle (%u) is a vep!", vep_handle); return VPPCOM_EINVAL; @@ -2617,6 +2804,12 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, VDBG (0, "EPOLL_CTL_ADD: NULL pointer to epoll_event structure!"); return VPPCOM_EINVAL; } + if (s->flags & VCL_SESSION_F_IS_VEP_SESSION) + { + VDBG (0, "EPOLL_CTL_ADD: %u already epolled!", s->session_index); + rv = VPPCOM_EEXIST; + goto done; + } if (vep_session->vep.next_sh != ~0) { vcl_session_t *next_session; @@ -2635,9 +2828,10 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, s->vep.prev_sh = vep_handle; s->vep.vep_sh = vep_handle; s->vep.et_mask = VEP_DEFAULT_ET_MASK; + s->vep.lt_next = VCL_INVALID_SESSION_INDEX; s->vep.ev = *event; - s->is_vep = 0; - s->is_vep_session = 1; + s->flags &= ~VCL_SESSION_F_IS_VEP; + s->flags |= VCL_SESSION_F_IS_VEP_SESSION; vep_session->vep.next_sh = session_handle; txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; @@ -2651,6 +2845,7 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, e.event_type = SESSION_IO_EVT_TX; e.session_index = s->session_index; vec_add1 (wrk->unhandled_evts_vector, e); + add_evt = 1; } /* Generate EPOLLIN if rx fifo has data */ if ((event->events & EPOLLIN) && (vcl_session_read_ready (s) > 0)) @@ -2659,6 +2854,19 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, e.event_type = SESSION_IO_EVT_RX; e.session_index = s->session_index; vec_add1 (wrk->unhandled_evts_vector, e); + s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; + add_evt = 1; + } + if (!add_evt && vcl_session_is_closing (s)) + { + session_event_t e = { 0 }; + if (s->session_state == VCL_STATE_VPP_CLOSING) + e.event_type = SESSION_CTRL_EVT_DISCONNECTED; + else + e.event_type = SESSION_CTRL_EVT_RESET; + e.session_index = s->session_index; + e.postponed = 1; + vec_add1 (wrk->unhandled_evts_vector, e); } VDBG (1, "EPOLL_CTL_ADD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!", vep_handle, session_handle, event->events, event->data.u64); @@ -2672,10 +2880,10 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, rv = VPPCOM_EINVAL; goto done; } - else if (PREDICT_FALSE (!s->is_vep_session)) + else if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION))) { VDBG (0, "sh %u EPOLL_CTL_MOD: not a vep session!", session_handle); - rv = VPPCOM_EINVAL; + rv = VPPCOM_ENOENT; goto done; } else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle)) @@ -2686,31 +2894,44 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, goto done; } - /* Generate EPOLLOUT when tx_fifo/ct_tx_fifo not full */ - if ((event->events & EPOLLOUT) && - !(s->vep.ev.events & EPOLLOUT) && (vcl_session_write_ready (s) > 0)) + /* Generate EPOLLOUT if session write ready nd event was not on */ + if ((event->events & EPOLLOUT) && !(s->vep.ev.events & EPOLLOUT) && + (vcl_session_write_ready (s) > 0)) { session_event_t e = { 0 }; e.event_type = SESSION_IO_EVT_TX; e.session_index = s->session_index; vec_add1 (wrk->unhandled_evts_vector, e); } + /* Generate EPOLLIN if session read ready and event was not on */ + if ((event->events & EPOLLIN) && !(s->vep.ev.events & EPOLLIN) && + (vcl_session_read_ready (s) > 0)) + { + session_event_t e = { 0 }; + e.event_type = SESSION_IO_EVT_RX; + e.session_index = s->session_index; + vec_add1 (wrk->unhandled_evts_vector, e); + s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; + } s->vep.et_mask = VEP_DEFAULT_ET_MASK; s->vep.ev = *event; txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; - if (event->events & EPOLLOUT) - svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); - else - svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + if (txf) + { + if (event->events & EPOLLOUT) + svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + else + svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + } VDBG (1, "EPOLL_CTL_MOD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!", vep_handle, session_handle, event->events, event->data.u64); break; case EPOLL_CTL_DEL: - if (PREDICT_FALSE (!s->is_vep_session)) + if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION))) { VDBG (0, "EPOLL_CTL_DEL: %u not a vep session!", session_handle); - rv = VPPCOM_EINVAL; + rv = VPPCOM_ENOENT; goto done; } else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle)) @@ -2750,15 +2971,22 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, next_session->vep.prev_sh = s->vep.prev_sh; } + if (s->vep.lt_next != VCL_INVALID_SESSION_INDEX) + vcl_epoll_lt_del (wrk, s); + memset (&s->vep, 0, sizeof (s->vep)); s->vep.next_sh = ~0; s->vep.prev_sh = ~0; s->vep.vep_sh = ~0; - s->is_vep_session = 0; + s->vep.lt_next = VCL_INVALID_SESSION_INDEX; + s->flags &= ~VCL_SESSION_F_IS_VEP_SESSION; - txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; - if (txf) - svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + if (vcl_session_is_open (s)) + { + txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + if (txf) + svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + } VDBG (1, "EPOLL_CTL_DEL: vep_idx %u, sh %u!", vep_handle, session_handle); @@ -2784,88 +3012,124 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, session_connected_msg_t *connected_msg; u32 sid = ~0, session_events; u64 session_evt_data = ~0; - vcl_session_t *session; + vcl_session_t *s; u8 add_event = 0; switch (e->event_type) { case SESSION_IO_EVT_RX: sid = e->session_index; - session = vcl_session_get (wrk, sid); - if (vcl_session_is_closed (session)) + s = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (s)) break; - vcl_fifo_rx_evt_valid_or_break (session); - session_events = session->vep.ev.events; - if (!(EPOLLIN & session->vep.ev.events) || session->has_rx_evt) + vcl_fifo_rx_evt_valid_or_break (s); + session_events = s->vep.ev.events; + if (!(EPOLLIN & s->vep.ev.events) || + (s->flags & VCL_SESSION_F_HAS_RX_EVT) || + (s->vep.lt_next != VCL_INVALID_SESSION_INDEX)) break; add_event = 1; - events[*num_ev].events |= EPOLLIN; - session_evt_data = session->vep.ev.data.u64; - session->has_rx_evt = 1; + events[*num_ev].events = EPOLLIN; + session_evt_data = s->vep.ev.data.u64; + s->flags |= VCL_SESSION_F_HAS_RX_EVT; break; case SESSION_IO_EVT_TX: sid = e->session_index; - session = vcl_session_get (wrk, sid); - if (vcl_session_is_closed (session)) + s = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (s)) break; - session_events = session->vep.ev.events; + session_events = s->vep.ev.events; if (!(EPOLLOUT & session_events)) break; add_event = 1; - events[*num_ev].events |= EPOLLOUT; - session_evt_data = session->vep.ev.data.u64; - svm_fifo_reset_has_deq_ntf (vcl_session_is_ct (session) ? - session->ct_tx_fifo : session->tx_fifo); + events[*num_ev].events = EPOLLOUT; + session_evt_data = s->vep.ev.data.u64; + svm_fifo_reset_has_deq_ntf (vcl_session_is_ct (s) ? + s->ct_tx_fifo : s->tx_fifo); break; case SESSION_CTRL_EVT_ACCEPTED: - session = vcl_session_accepted (wrk, - (session_accepted_msg_t *) e->data); - if (!session) + if (!e->postponed) + s = vcl_session_accepted (wrk, (session_accepted_msg_t *) e->data); + else + s = vcl_session_get (wrk, e->session_index); + if (!s) break; - - session_events = session->vep.ev.events; - if (!(EPOLLIN & session_events)) + session_events = s->vep.ev.events; + sid = s->session_index; + if (!(EPOLLIN & session_events) || + (s->vep.lt_next != VCL_INVALID_SESSION_INDEX)) break; - add_event = 1; - events[*num_ev].events |= EPOLLIN; - session_evt_data = session->vep.ev.data.u64; + events[*num_ev].events = EPOLLIN; + session_evt_data = s->vep.ev.data.u64; break; case SESSION_CTRL_EVT_CONNECTED: - connected_msg = (session_connected_msg_t *) e->data; - sid = vcl_session_connected_handler (wrk, connected_msg); - /* Generate EPOLLOUT because there's no connected event */ - session = vcl_session_get (wrk, sid); - if (vcl_session_is_closed (session)) + if (!e->postponed) + { + connected_msg = (session_connected_msg_t *) e->data; + sid = vcl_session_connected_handler (wrk, connected_msg); + } + else + sid = e->session_index; + s = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (s)) break; - session_events = session->vep.ev.events; + session_events = s->vep.ev.events; + /* Generate EPOLLOUT because there's no connected event */ if (!(EPOLLOUT & session_events)) break; add_event = 1; - events[*num_ev].events |= EPOLLOUT; - session_evt_data = session->vep.ev.data.u64; - if (session->session_state == VCL_STATE_DETACHED) + events[*num_ev].events = EPOLLOUT; + session_evt_data = s->vep.ev.data.u64; + if (s->session_state == VCL_STATE_DETACHED) events[*num_ev].events |= EPOLLHUP; break; case SESSION_CTRL_EVT_DISCONNECTED: - disconnected_msg = (session_disconnected_msg_t *) e->data; - session = vcl_session_disconnected_handler (wrk, disconnected_msg); - if (vcl_session_is_closed (session)) + if (!e->postponed) + { + disconnected_msg = (session_disconnected_msg_t *) e->data; + s = vcl_session_disconnected_handler (wrk, disconnected_msg); + } + else + { + s = vcl_session_get (wrk, e->session_index); + } + if (vcl_session_is_closed (s) || + !(s->flags & VCL_SESSION_F_IS_VEP_SESSION)) break; - session_events = session->vep.ev.events; + sid = s->session_index; + session_events = s->vep.ev.events; add_event = 1; - events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; - session_evt_data = session->vep.ev.data.u64; + if (EPOLLRDHUP & session_events) + { + /* If app can distinguish between RDHUP and HUP, + * we make finer control */ + events[*num_ev].events = EPOLLRDHUP; + if (s->flags & VCL_SESSION_F_WR_SHUTDOWN) + { + events[*num_ev].events |= EPOLLHUP; + } + } + else + { + events[*num_ev].events = EPOLLHUP; + } + session_evt_data = s->vep.ev.data.u64; + break; case SESSION_CTRL_EVT_RESET: - sid = vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); - session = vcl_session_get (wrk, sid); - if (vcl_session_is_closed (session)) + if (!e->postponed) + sid = vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + else + sid = e->session_index; + s = vcl_session_get (wrk, sid); + if (vcl_session_is_closed (s) || + !(s->flags & VCL_SESSION_F_IS_VEP_SESSION)) break; - session_events = session->vep.ev.events; + session_events = s->vep.ev.events; add_event = 1; - events[*num_ev].events |= EPOLLHUP | EPOLLRDHUP; - session_evt_data = session->vep.ev.data.u64; + events[*num_ev].events = EPOLLHUP | EPOLLRDHUP; + session_evt_data = s->vep.ev.data.u64; break; case SESSION_CTRL_EVT_UNLISTEN_REPLY: vcl_session_unlisten_reply_handler (wrk, e->data); @@ -2901,8 +3165,14 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, events[*num_ev].data.u64 = session_evt_data; if (EPOLLONESHOT & session_events) { - session = vcl_session_get (wrk, sid); - session->vep.ev.events = 0; + s = vcl_session_get (wrk, sid); + s->vep.ev.events = 0; + } + else if (!(EPOLLET & session_events)) + { + s = vcl_session_get (wrk, sid); + if (s->vep.lt_next == VCL_INVALID_SESSION_INDEX) + vcl_epoll_lt_add (wrk, s); } *num_ev += 1; } @@ -2920,30 +3190,20 @@ vcl_epoll_wait_handle_mq (vcl_worker_t * wrk, svm_msg_q_t * mq, if (vec_len (wrk->mq_msg_vector) && svm_msg_q_is_empty (mq)) goto handle_dequeued; - svm_msg_q_lock (mq); if (svm_msg_q_is_empty (mq)) { if (!wait_for_time) - { - svm_msg_q_unlock (mq); - return 0; - } + return 0; else if (wait_for_time < 0) - { - svm_msg_q_wait (mq); - } + svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY); else { if (svm_msg_q_timedwait (mq, wait_for_time / 1e3)) - { - svm_msg_q_unlock (mq); - return 0; - } + return 0; } } ASSERT (maxevents > *num_ev); vcl_mq_dequeue_batch (wrk, mq, ~0); - svm_msg_q_unlock (mq); handle_dequeued: for (i = 0; i < vec_len (wrk->mq_msg_vector); i++) @@ -2962,58 +3222,130 @@ handle_dequeued: } static int -vppcom_epoll_wait_condvar (vcl_worker_t * wrk, struct epoll_event *events, - int maxevents, u32 n_evts, double wait_for_time) +vppcom_epoll_wait_condvar (vcl_worker_t *wrk, struct epoll_event *events, + int maxevents, u32 n_evts, double timeout_ms) { - double wait = 0, start = 0, now; + double end = -1; if (!n_evts) { - wait = wait_for_time; - start = clib_time_now (&wrk->clib_time); + if (timeout_ms > 0) + end = clib_time_now (&wrk->clib_time) + (timeout_ms / 1e3); } do { vcl_epoll_wait_handle_mq (wrk, wrk->app_event_queue, events, maxevents, - wait, &n_evts); - if (n_evts) + timeout_ms, &n_evts); + if (n_evts || !timeout_ms) return n_evts; - if (wait == -1) - continue; - - now = clib_time_now (&wrk->clib_time); - wait -= (now - start) * 1e3; - start = now; } - while (wait > 0); + while (end == -1 || clib_time_now (&wrk->clib_time) < end); return 0; } static int -vppcom_epoll_wait_eventfd (vcl_worker_t * wrk, struct epoll_event *events, - int maxevents, u32 n_evts, double wait_for_time) +vppcom_epoll_wait_eventfd (vcl_worker_t *wrk, struct epoll_event *events, + int maxevents, u32 n_evts, double timeout_ms) { - vcl_mq_evt_conn_t *mqc; int __clib_unused n_read; + vcl_mq_evt_conn_t *mqc; int n_mq_evts, i; + double end = -1; u64 buf; vec_validate (wrk->mq_events, pool_elts (wrk->mq_evt_conns)); -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++) + if (!n_evts) { - mqc = vcl_mq_evt_conn_get (wrk, wrk->mq_events[i].data.u32); - n_read = read (mqc->mq_fd, &buf, sizeof (buf)); - vcl_epoll_wait_handle_mq (wrk, mqc->mq, events, maxevents, 0, &n_evts); + if (timeout_ms > 0) + end = clib_time_now (&wrk->clib_time) + (timeout_ms / 1e3); + } + + do + { + n_mq_evts = epoll_wait (wrk->mqs_epfd, wrk->mq_events, + vec_len (wrk->mq_events), timeout_ms); + if (n_mq_evts < 0) + { + VDBG (0, "epoll_wait error %u", errno); + return n_evts; + } + + for (i = 0; i < n_mq_evts; i++) + { + mqc = vcl_mq_evt_conn_get (wrk, wrk->mq_events[i].data.u32); + n_read = read (mqc->mq_fd, &buf, sizeof (buf)); + vcl_epoll_wait_handle_mq (wrk, mqc->mq, events, maxevents, 0, + &n_evts); + } + + if (n_evts || !timeout_ms) + return n_evts; } - if (!n_evts && n_mq_evts > 0) - goto again; + while (end == -1 || clib_time_now (&wrk->clib_time) < end); + + return 0; +} + +static void +vcl_epoll_wait_handle_lt (vcl_worker_t *wrk, struct epoll_event *events, + int maxevents, u32 *n_evts) +{ + u32 add_event = 0, next; + vcl_session_t *s; + u64 evt_data; + int rv; + + ASSERT (wrk->ep_lt_current != VCL_INVALID_SESSION_INDEX); + if (*n_evts >= maxevents) + return; - return (int) n_evts; + next = wrk->ep_lt_current; + do + { + s = vcl_session_get (wrk, next); + next = s->vep.lt_next; + + if ((s->vep.ev.events & EPOLLIN) && (rv = vcl_session_read_ready (s))) + { + add_event = 1; + events[*n_evts].events |= rv > 0 ? EPOLLIN : EPOLLHUP | EPOLLRDHUP; + evt_data = s->vep.ev.data.u64; + } + if ((s->vep.ev.events & EPOLLOUT) && (rv = vcl_session_write_ready (s))) + { + add_event = 1; + events[*n_evts].events |= rv > 0 ? EPOLLOUT : EPOLLHUP | EPOLLRDHUP; + evt_data = s->vep.ev.data.u64; + } + if (!add_event && s->session_state > VCL_STATE_READY) + { + add_event = 1; + events[*n_evts].events |= EPOLLHUP | EPOLLRDHUP; + evt_data = s->vep.ev.data.u64; + } + if (add_event) + { + events[*n_evts].data.u64 = evt_data; + *n_evts += 1; + add_event = 0; + if (EPOLLONESHOT & s->vep.ev.events) + s->vep.ev.events = 0; + if (*n_evts == maxevents) + { + wrk->ep_lt_current = next; + break; + } + } + else + { + vcl_epoll_lt_del (wrk, s); + if (wrk->ep_lt_current == VCL_INVALID_SESSION_INDEX) + break; + } + } + while (next != wrk->ep_lt_current); } int @@ -3035,14 +3367,12 @@ vppcom_epoll_wait (uint32_t vep_handle, struct epoll_event *events, if (!vep_session) return VPPCOM_EBADFD; - if (PREDICT_FALSE (!vep_session->is_vep)) + if (PREDICT_FALSE (!(vep_session->flags & VCL_SESSION_F_IS_VEP))) { VDBG (0, "ERROR: vep_idx (%u) is not a vep!", vep_handle); return VPPCOM_EINVAL; } - memset (events, 0, sizeof (*events) * maxevents); - if (vec_len (wrk->unhandled_evts_vector)) { for (i = 0; i < vec_len (wrk->unhandled_evts_vector); i++) @@ -3058,12 +3388,22 @@ vppcom_epoll_wait (uint32_t vep_handle, struct epoll_event *events, vec_reset_length (wrk->unhandled_evts_vector); } + if (PREDICT_FALSE (wrk->ep_lt_current != VCL_INVALID_SESSION_INDEX)) + vcl_epoll_wait_handle_lt (wrk, events, maxevents, &n_evts); + + /* Request to only drain unhandled */ + if ((int) wait_for_time == -2) + return n_evts; + + if (vcm->cfg.use_mq_eventfd) - return vppcom_epoll_wait_eventfd (wrk, events, maxevents, n_evts, - wait_for_time); + n_evts = vppcom_epoll_wait_eventfd (wrk, events, maxevents, n_evts, + wait_for_time); + else + n_evts = vppcom_epoll_wait_condvar (wrk, events, maxevents, n_evts, + wait_for_time); - return vppcom_epoll_wait_condvar (wrk, events, maxevents, n_evts, - wait_for_time); + return n_evts; } int @@ -3071,10 +3411,11 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, void *buffer, uint32_t * buflen) { vcl_worker_t *wrk = vcl_worker_get_current (); + u32 *flags = buffer; + vppcom_endpt_t *ep = buffer; + transport_endpt_attr_t tea; vcl_session_t *session; int rv = VPPCOM_OK; - u32 *flags = buffer, tmp_flags = 0; - vppcom_endpt_t *ep = buffer; session = vcl_session_get_w_handle (wrk, session_handle); if (!session) @@ -3099,12 +3440,12 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, { *flags = O_RDWR | - (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK) ? + (vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK) ? O_NONBLOCK : 0); *buflen = sizeof (*flags); VDBG (2, "VPPCOM_ATTR_GET_FLAGS: sh %u, flags = 0x%08x, " "is_nonblocking = %u", session_handle, *flags, - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); + vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK)); } else rv = VPPCOM_EINVAL; @@ -3114,13 +3455,13 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, if (PREDICT_TRUE (buffer && buflen && (*buflen == sizeof (*flags)))) { if (*flags & O_NONBLOCK) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK); + vcl_session_set_attr (session, VCL_SESS_ATTR_NONBLOCK); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_NONBLOCK); + vcl_session_clear_attr (session, VCL_SESS_ATTR_NONBLOCK); VDBG (2, "VPPCOM_ATTR_SET_FLAGS: sh %u, flags = 0x%08x," " is_nonblocking = %u", session_handle, *flags, - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK)); + vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK)); } else rv = VPPCOM_EINVAL; @@ -3225,8 +3566,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, case VPPCOM_ATTR_GET_LISTEN: if (buffer && buflen && (*buflen >= sizeof (int))) { - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_LISTEN); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_LISTEN); *buflen = sizeof (int); VDBG (2, "VPPCOM_ATTR_GET_LISTEN: %d, buflen %d", *(int *) buffer, @@ -3268,6 +3609,18 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, rv = VPPCOM_EINVAL; break; + case VPPCOM_ATTR_SET_DSCP: + if (buffer && buflen && (*buflen >= sizeof (u8))) + { + session->dscp = *(u8 *) buffer; + + VDBG (2, "VPPCOM_ATTR_SET_DSCP: %u (0x%x), buflen %d,", + *(u8 *) buffer, *(u8 *) buffer, *buflen); + } + else + rv = VPPCOM_EINVAL; + break; + case VPPCOM_ATTR_SET_TX_FIFO_LEN: if (buffer && buflen && (*buflen == sizeof (u32))) { @@ -3316,8 +3669,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEADDR); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_REUSEADDR); *buflen = sizeof (int); VDBG (2, "VPPCOM_ATTR_GET_REUSEADDR: %d, buflen %d, #VPP-TBD#", @@ -3329,16 +3682,16 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, case VPPCOM_ATTR_SET_REUSEADDR: if (buffer && buflen && (*buflen == sizeof (int)) && - !VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_LISTEN)) + !vcl_session_has_attr (session, VCL_SESS_ATTR_LISTEN)) { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_REUSEADDR); + vcl_session_set_attr (session, VCL_SESS_ATTR_REUSEADDR); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEADDR); + vcl_session_clear_attr (session, VCL_SESS_ATTR_REUSEADDR); VDBG (2, "VPPCOM_ATTR_SET_REUSEADDR: %d, buflen %d, #VPP-TBD#", - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_REUSEADDR), + vcl_session_has_attr (session, VCL_SESS_ATTR_REUSEADDR), *buflen); } else @@ -3349,8 +3702,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_REUSEPORT); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_REUSEPORT); *buflen = sizeof (int); VDBG (2, "VPPCOM_ATTR_GET_REUSEPORT: %d, buflen %d, #VPP-TBD#", @@ -3362,16 +3715,16 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, case VPPCOM_ATTR_SET_REUSEPORT: if (buffer && buflen && (*buflen == sizeof (int)) && - !VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_LISTEN)) + !vcl_session_has_attr (session, VCL_SESS_ATTR_LISTEN)) { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_REUSEPORT); + vcl_session_set_attr (session, VCL_SESS_ATTR_REUSEPORT); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_REUSEPORT); + vcl_session_clear_attr (session, VCL_SESS_ATTR_REUSEPORT); VDBG (2, "VPPCOM_ATTR_SET_REUSEPORT: %d, buflen %d, #VPP-TBD#", - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_REUSEPORT), + vcl_session_has_attr (session, VCL_SESS_ATTR_REUSEPORT), *buflen); } else @@ -3382,8 +3735,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_BROADCAST); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_BROADCAST); *buflen = sizeof (int); VDBG (2, "VPPCOM_ATTR_GET_BROADCAST: %d, buflen %d, #VPP-TBD#", @@ -3398,12 +3751,12 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_BROADCAST); + vcl_session_set_attr (session, VCL_SESS_ATTR_BROADCAST); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_BROADCAST); + vcl_session_clear_attr (session, VCL_SESS_ATTR_BROADCAST); VDBG (2, "VPPCOM_ATTR_SET_BROADCAST: %d, buflen %d, #VPP-TBD#", - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_BROADCAST), + vcl_session_has_attr (session, VCL_SESS_ATTR_BROADCAST), *buflen); } else @@ -3414,8 +3767,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_V6ONLY); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_V6ONLY); *buflen = sizeof (int); VDBG (2, "VPPCOM_ATTR_GET_V6ONLY: %d, buflen %d, #VPP-TBD#", @@ -3430,12 +3783,12 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_V6ONLY); + vcl_session_set_attr (session, VCL_SESS_ATTR_V6ONLY); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_V6ONLY); + vcl_session_clear_attr (session, VCL_SESS_ATTR_V6ONLY); VDBG (2, "VPPCOM_ATTR_SET_V6ONLY: %d, buflen %d, #VPP-TBD#", - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_V6ONLY), + vcl_session_has_attr (session, VCL_SESS_ATTR_V6ONLY), *buflen); } else @@ -3446,8 +3799,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_KEEPALIVE); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_KEEPALIVE); *buflen = sizeof (int); VDBG (2, "VPPCOM_ATTR_GET_KEEPALIVE: %d, buflen %d, #VPP-TBD#", @@ -3462,12 +3815,12 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_KEEPALIVE); + vcl_session_set_attr (session, VCL_SESS_ATTR_KEEPALIVE); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_KEEPALIVE); + vcl_session_clear_attr (session, VCL_SESS_ATTR_KEEPALIVE); VDBG (2, "VPPCOM_ATTR_SET_KEEPALIVE: %d, buflen %d, #VPP-TBD#", - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_KEEPALIVE), + vcl_session_has_attr (session, VCL_SESS_ATTR_KEEPALIVE), *buflen); } else @@ -3478,8 +3831,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_NODELAY); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_NODELAY); *buflen = sizeof (int); VDBG (2, "VPPCOM_ATTR_GET_TCP_NODELAY: %d, buflen %d, #VPP-TBD#", @@ -3494,12 +3847,12 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_NODELAY); + vcl_session_set_attr (session, VCL_SESS_ATTR_TCP_NODELAY); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_NODELAY); + vcl_session_clear_attr (session, VCL_SESS_ATTR_TCP_NODELAY); VDBG (2, "VPPCOM_ATTR_SET_TCP_NODELAY: %d, buflen %d, #VPP-TBD#", - VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_TCP_NODELAY), + vcl_session_has_attr (session, VCL_SESS_ATTR_TCP_NODELAY), *buflen); } else @@ -3510,8 +3863,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPIDLE); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_KEEPIDLE); *buflen = sizeof (int); VDBG (2, "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, buflen %d, #VPP-TBD#", @@ -3526,13 +3879,13 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE); + vcl_session_set_attr (session, VCL_SESS_ATTR_TCP_KEEPIDLE); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPIDLE); + vcl_session_clear_attr (session, VCL_SESS_ATTR_TCP_KEEPIDLE); VDBG (2, "VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d, buflen %d, #VPP-TBD#", - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPIDLE), *buflen); + vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_KEEPIDLE), *buflen); } else rv = VPPCOM_EINVAL; @@ -3542,8 +3895,8 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, if (buffer && buflen && (*buflen >= sizeof (int))) { /* VPP-TBD */ - *(int *) buffer = VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPINTVL); + *(int *) buffer = vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_KEEPINTVL); *buflen = sizeof (int); VDBG (2, "VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, buflen %d, #VPP-TBD#", @@ -3558,68 +3911,132 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, { /* VPP-TBD */ if (*(int *) buffer) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL); + vcl_session_set_attr (session, VCL_SESS_ATTR_TCP_KEEPINTVL); else - VCL_SESS_ATTR_CLR (session->attr, VCL_SESS_ATTR_TCP_KEEPINTVL); + vcl_session_clear_attr (session, VCL_SESS_ATTR_TCP_KEEPINTVL); VDBG (2, "VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d, buflen %d, #VPP-TBD#", - VCL_SESS_ATTR_TEST (session->attr, - VCL_SESS_ATTR_TCP_KEEPINTVL), *buflen); + vcl_session_has_attr (session, + VCL_SESS_ATTR_TCP_KEEPINTVL), *buflen); } else rv = VPPCOM_EINVAL; break; case VPPCOM_ATTR_GET_TCP_USER_MSS: - if (buffer && buflen && (*buflen >= sizeof (u32))) + if (!(buffer && buflen && (*buflen >= sizeof (u32)))) { - /* VPP-TBD */ - *(u32 *) buffer = session->user_mss; - *buflen = sizeof (int); + rv = VPPCOM_EINVAL; + break; + } - VDBG (2, "VPPCOM_ATTR_GET_TCP_USER_MSS: %d, buflen %d, #VPP-TBD#", - *(int *) buffer, *buflen); + tea.type = TRANSPORT_ENDPT_ATTR_MSS; + tea.mss = *(u32 *) buffer; + if (vcl_session_transport_attr (wrk, session, 1 /* is_get */, &tea)) + rv = VPPCOM_ENOPROTOOPT; + + if (!rv) + { + *(u32 *) buffer = tea.mss; + *buflen = sizeof (int); } - else - rv = VPPCOM_EINVAL; + + VDBG (2, "VPPCOM_ATTR_GET_TCP_USER_MSS: %d, buflen %d", *(int *) buffer, + *buflen); break; case VPPCOM_ATTR_SET_TCP_USER_MSS: - if (buffer && buflen && (*buflen == sizeof (u32))) + if (!(buffer && buflen && (*buflen == sizeof (u32)))) { - /* VPP-TBD */ - session->user_mss = *(u32 *) buffer; + rv = VPPCOM_EINVAL; + break; + } + + tea.type = TRANSPORT_ENDPT_ATTR_MSS; + tea.mss = *(u32 *) buffer; + if (vcl_session_transport_attr (wrk, session, 0 /* is_get */, &tea)) + rv = VPPCOM_ENOPROTOOPT; - VDBG (2, "VPPCOM_ATTR_SET_TCP_USER_MSS: %u, buflen %d, #VPP-TBD#", - session->user_mss, *buflen); + VDBG (2, "VPPCOM_ATTR_SET_TCP_USER_MSS: %u, buflen %d", tea.mss, + *buflen); + break; + + case VPPCOM_ATTR_SET_CONNECTED: + session->flags |= VCL_SESSION_F_CONNECTED; + break; + + case VPPCOM_ATTR_SET_CKPAIR: + if (!(buffer && buflen && (*buflen == sizeof (int))) || + !vcl_session_has_crypto (session)) + { + rv = VPPCOM_EINVAL; + break; } - else - rv = VPPCOM_EINVAL; + if (!session->ext_config) + { + vcl_session_alloc_ext_cfg (session, TRANSPORT_ENDPT_EXT_CFG_CRYPTO, + sizeof (transport_endpt_ext_cfg_t)); + } + else if (session->ext_config->type != TRANSPORT_ENDPT_EXT_CFG_CRYPTO) + { + rv = VPPCOM_EINVAL; + break; + } + + session->ext_config->crypto.ckpair_index = *(uint32_t *) buffer; break; - case VPPCOM_ATTR_SET_SHUT: - if (*flags == SHUT_RD || *flags == SHUT_RDWR) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_SHUT_RD); - if (*flags == SHUT_WR || *flags == SHUT_RDWR) - VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_SHUT_WR); - break; - - case VPPCOM_ATTR_GET_SHUT: - if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_SHUT_RD)) - tmp_flags = 1; - if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_SHUT_WR)) - tmp_flags |= 2; - if (tmp_flags == 1) - *(int *) buffer = SHUT_RD; - else if (tmp_flags == 2) - *(int *) buffer = SHUT_WR; - else if (tmp_flags == 3) - *(int *) buffer = SHUT_RDWR; + case VPPCOM_ATTR_SET_VRF: + if (!(buffer && buflen && (*buflen == sizeof (u32)))) + { + rv = VPPCOM_EINVAL; + break; + } + session->vrf = *(u32 *) buffer; + break; + + case VPPCOM_ATTR_GET_VRF: + if (!(buffer && buflen && (*buflen >= sizeof (u32)))) + { + rv = VPPCOM_EINVAL; + break; + } + *(u32 *) buffer = session->vrf; + *buflen = sizeof (u32); + break; + + case VPPCOM_ATTR_GET_DOMAIN: + if (!(buffer && buflen && (*buflen >= sizeof (int)))) + { + rv = VPPCOM_EINVAL; + break; + } + + if (session->transport.is_ip4) + *(int *) buffer = AF_INET; + else + *(int *) buffer = AF_INET6; *buflen = sizeof (int); + + VDBG (2, "VPPCOM_ATTR_GET_DOMAIN: %d, buflen %u", *(int *) buffer, + *buflen); break; - case VPPCOM_ATTR_SET_CONNECTED: - session->flags |= VCL_SESSION_F_CONNECTED; + case VPPCOM_ATTR_SET_ENDPT_EXT_CFG: + if (!(buffer && buflen && (*buflen > 0))) + { + rv = VPPCOM_EINVAL; + break; + } + if (session->ext_config) + { + rv = VPPCOM_EINVAL; + break; + } + vcl_session_alloc_ext_cfg (session, TRANSPORT_ENDPT_EXT_CFG_NONE, + *buflen + sizeof (u32)); + clib_memcpy (session->ext_config->data, buffer, *buflen); + session->ext_config->len = *buflen; break; default: @@ -3672,28 +4089,32 @@ vppcom_session_sendto (uint32_t session_handle, void *buffer, vcl_session_t *s; s = vcl_session_get_w_handle (wrk, session_handle); - if (!s) + if (PREDICT_FALSE (!s)) return VPPCOM_EBADFD; - if (!buffer) - return VPPCOM_EINVAL; - if (ep) { - if (s->session_type != VPPCOM_PROTO_UDP - || (s->flags & VCL_SESSION_F_CONNECTED)) + if (!vcl_session_is_cl (s)) return VPPCOM_EINVAL; + s->transport.is_ip4 = ep->is_ip4; + s->transport.rmt_port = ep->port; + vcl_ip_copy_from_ep (&s->transport.rmt_ip, ep); + /* Session not connected/bound in vpp. Create it by 'connecting' it */ if (PREDICT_FALSE (s->session_state == VCL_STATE_CLOSED)) { + u32 session_index = s->session_index; + f64 timeout = vcm->cfg.session_timeout; + int rv; + vcl_send_session_connect (wrk, s); - } - else - { - s->transport.is_ip4 = ep->is_ip4; - s->transport.rmt_port = ep->port; - vcl_ip_copy_from_ep (&s->transport.rmt_ip, ep); + rv = vppcom_wait_for_session_state_change (session_index, + VCL_STATE_READY, + timeout); + if (rv < 0) + return rv; + s = vcl_session_get (wrk, session_index); } } @@ -3924,6 +4345,12 @@ vppcom_proto_str (vppcom_proto_t proto) case VPPCOM_PROTO_QUIC: proto_str = "QUIC"; break; + case VPPCOM_PROTO_DTLS: + proto_str = "DTLS"; + break; + case VPPCOM_PROTO_SRTP: + proto_str = "SRTP"; + break; default: proto_str = "UNKNOWN"; break; @@ -3994,6 +4421,24 @@ vppcom_retval_str (int retval) return st; } +int +vppcom_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair) +{ + if (vcm->cfg.vpp_app_socket_api) + return vcl_sapi_add_cert_key_pair (ckpair); + else + return vcl_bapi_add_cert_key_pair (ckpair); +} + +int +vppcom_del_cert_key_pair (uint32_t ckpair_index) +{ + if (vcm->cfg.vpp_app_socket_api) + return vcl_sapi_del_cert_key_pair (ckpair_index); + else + return vcl_bapi_del_cert_key_pair (ckpair_index); +} + /* * fd.io coding-style-patch-verification: ON *