__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;
}
switch (state)
{
- case STATE_CLOSED:
+ case VCL_STATE_CLOSED:
st = "STATE_CLOSED";
break;
-
- case STATE_CONNECT:
- st = "STATE_CONNECT";
- break;
-
- case STATE_LISTEN:
+ case VCL_STATE_LISTEN:
st = "STATE_LISTEN";
break;
-
- case STATE_ACCEPT:
- st = "STATE_ACCEPT";
+ case VCL_STATE_READY:
+ st = "STATE_READY";
break;
-
- case STATE_VPP_CLOSING:
+ case VCL_STATE_VPP_CLOSING:
st = "STATE_VPP_CLOSING";
break;
-
- case STATE_DISCONNECT:
+ case VCL_STATE_DISCONNECT:
st = "STATE_DISCONNECT";
break;
-
- case STATE_DETACHED:
+ case VCL_STATE_DETACHED:
st = "STATE_DETACHED";
break;
-
- case STATE_UPDATED:
+ case VCL_STATE_UPDATED:
st = "STATE_UPDATED";
break;
-
- case STATE_LISTEN_NO_MQ:
+ case VCL_STATE_LISTEN_NO_MQ:
st = "STATE_LISTEN_NO_MQ";
break;
-
default:
st = "UNKNOWN_STATE";
break;
* 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)
{
app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_LISTEN);
mp = (session_listen_msg_t *) app_evt->evt->data;
memset (mp, 0, sizeof (*mp));
- mp->client_index = wrk->my_client_index;
+ mp->client_index = wrk->api_client_handle;
mp->context = s->session_index;
mp->wrk_index = wrk->vpp_wrk_index;
mp->is_ip4 = s->transport.is_ip4;
clib_memcpy_fast (&mp->ip, &s->transport.lcl_ip, sizeof (mp->ip));
mp->port = s->transport.lcl_port;
mp->proto = s->session_type;
+ mp->vrf = s->vrf;
if (s->flags & VCL_SESSION_F_CONNECTED)
mp->flags = TRANSPORT_CFG_F_CONNECTED;
+ if (s->ext_config)
+ vcl_msg_add_ext_config (s, &mp->ext_config);
app_send_ctrl_evt_to_vpp (mq, app_evt);
+ if (s->ext_config)
+ {
+ clib_mem_free (s->ext_config);
+ s->ext_config = 0;
+ }
}
static void
app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_CONNECT);
mp = (session_connect_msg_t *) app_evt->evt->data;
memset (mp, 0, sizeof (*mp));
- mp->client_index = wrk->my_client_index;
+ 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;
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
app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_UNLISTEN);
mp = (session_unlisten_msg_t *) app_evt->evt->data;
memset (mp, 0, sizeof (*mp));
- mp->client_index = wrk->my_client_index;
+ mp->client_index = wrk->api_client_handle;
mp->wrk_index = wrk->vpp_wrk_index;
mp->handle = s->vpp_handle;
mp->context = wrk->wrk_index;
app_send_ctrl_evt_to_vpp (mq, app_evt);
}
+static 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)
{
app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_DISCONNECT);
mp = (session_disconnect_msg_t *) app_evt->evt->data;
memset (mp, 0, sizeof (*mp));
- mp->client_index = wrk->my_client_index;
+ mp->client_index = wrk->api_client_handle;
mp->handle = s->vpp_handle;
app_send_ctrl_evt_to_vpp (mq, app_evt);
}
app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_APP_DETACH);
mp = (session_app_detach_msg_t *) app_evt->evt->data;
memset (mp, 0, sizeof (*mp));
- mp->client_index = wrk->my_client_index;
+ mp->client_index = wrk->api_client_handle;
app_send_ctrl_evt_to_vpp (mq, app_evt);
}
}
static void
-vcl_send_session_disconnected_reply (svm_msg_q_t * mq, u32 context,
- session_handle_t handle, int retval)
+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
{
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->my_client_index;
+ mp->client_index = wrk->api_client_handle;
mp->handle = s->vpp_handle;
mp->req_wrk_index = wrk->vpp_wrk_index;
mp->wrk_index = wrk_index;
+ app_send_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt);
+}
+
+int
+vcl_send_worker_rpc (u32 dst_wrk_index, void *data, u32 data_len)
+{
+ app_session_evt_t _app_evt, *app_evt = &_app_evt;
+ session_app_wrk_rpc_msg_t *mp;
+ vcl_worker_t *dst_wrk, *wrk;
+ svm_msg_q_t *mq;
+ int ret = -1;
+
+ if (data_len > sizeof (mp->data))
+ goto done;
+
+ clib_spinlock_lock (&vcm->workers_lock);
+
+ dst_wrk = vcl_worker_get_if_valid (dst_wrk_index);
+ if (!dst_wrk)
+ goto done;
+
+ wrk = vcl_worker_get_current ();
+ mq = vcl_worker_ctrl_mq (wrk);
+ app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_APP_WRK_RPC);
+ mp = (session_app_wrk_rpc_msg_t *) app_evt->evt->data;
+ mp->client_index = wrk->api_client_handle;
+ mp->wrk_index = dst_wrk->vpp_wrk_index;
+ clib_memcpy (mp->data, data, data_len);
app_send_ctrl_evt_to_vpp (mq, app_evt);
+ ret = 0;
+
+done:
+ clib_spinlock_unlock (&vcm->workers_lock);
+ 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
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);
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 = STATE_ACCEPT;
+ session->session_state = VCL_STATE_READY;
session->transport.rmt_port = mp->rmt.port;
session->transport.is_ip4 = mp->rmt.is_ip4;
clib_memcpy_fast (&session->transport.rmt_ip, &mp->rmt.ip,
sizeof (ip46_address_t));
vcl_session_table_add_vpp_handle (wrk, mp->handle, session->session_index);
- session->transport.lcl_port = 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;
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);
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)
{
VDBG (0, "ERROR: session index %u: connect failed! %U",
session_index, format_session_error, mp->retval);
- session->session_state = STATE_DETACHED | STATE_DISCONNECT;
+ session->session_state = VCL_STATE_DETACHED;
session->vpp_handle = mp->handle;
return session_index;
}
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);
- session->session_state = STATE_DETACHED | STATE_DISCONNECT;
+ 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);
- session->session_state = STATE_DETACHED | STATE_DISCONNECT;
+ 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;
- session->session_state = STATE_CONNECT;
+
+ /* Application closed session before connect reply */
+ if (vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK)
+ && session->session_state == VCL_STATE_CLOSED)
+ vcl_send_session_disconnect (wrk, session);
+ else
+ session->session_state = VCL_STATE_READY;
/* Add it to lookup table */
vcl_session_table_add_vpp_handle (wrk, mp->handle, session_index);
}
/* Caught a reset before actually accepting the session */
- if (session->session_state == STATE_LISTEN)
+ if (session->session_state == VCL_STATE_LISTEN)
{
if (!vcl_flag_accepted_session (session, reset_msg->handle,
return VCL_INVALID_SESSION_INDEX;
}
- if (session->session_state != STATE_CLOSED)
- session->session_state = STATE_DISCONNECT;
+ if (session->session_state != VCL_STATE_CLOSED)
+ session->session_state = VCL_STATE_DISCONNECT;
VDBG (0, "reset session %u [0x%llx]", sid, reset_msg->handle);
return sid;
}
format_session_error, mp->retval);
if (session)
{
- session->session_state = STATE_DETACHED;
+ session->session_state = VCL_STATE_DETACHED;
session->vpp_handle = mp->handle;
return sid;
}
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;
-
- 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;
+ session->session_state = VCL_STATE_LISTEN;
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);
VDBG (0, "Unlisten reply with wrong handle %llx", mp->handle);
return;
}
- if (s->session_state != STATE_DISCONNECT)
+ if (s->session_state != VCL_STATE_DISCONNECT)
{
/* Connected udp listener */
if (s->session_type == VPPCOM_PROTO_UDP
- && s->session_state == STATE_CLOSED)
+ && s->session_state == VCL_STATE_CLOSED)
return;
VDBG (0, "Unlisten session in wrong state %llx", mp->handle);
{
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)
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 *
}
/* Late disconnect notification on a session that has been closed */
- if (session->session_state == STATE_CLOSED)
+ if (session->session_state == VCL_STATE_CLOSED)
return 0;
/* Caught a disconnect before actually accepting the session */
- if (session->session_state == STATE_LISTEN)
+ if (session->session_state == VCL_STATE_LISTEN)
{
if (!vcl_flag_accepted_session (session, msg->handle,
VCL_ACCEPTED_F_CLOSED))
}
/* If not already reset change state */
- if (session->session_state != STATE_DISCONNECT)
- session->session_state = STATE_VPP_CLOSING;
+ if (session->session_state != VCL_STATE_DISCONNECT)
+ session->session_state = VCL_STATE_VPP_CLOSING;
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)
{
{
/* 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 */
- if (session->session_state == STATE_VPP_CLOSING)
- vcl_session_cleanup (wrk, session, vcl_session_handle (session),
- 1 /* do_disconnect */ );
+ * 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)
+ {
+ 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;
}
vcl_session_table_del_vpp_handle (wrk, msg->handle);
/* Should not happen. App did not close the connection so don't free it. */
- if (session->session_state != STATE_CLOSED)
+ if (session->session_state != VCL_STATE_CLOSED)
{
VDBG (0, "app did not close session %d", session->session_index);
- session->session_state = STATE_DETACHED;
+ session->session_state = VCL_STATE_DETACHED;
session->vpp_handle = VCL_INVALID_SESSION_HANDLE;
return;
}
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 = STATE_UPDATED;
+ s->session_state = VCL_STATE_UPDATED;
VDBG (0, "session %u[0x%llx] moved to worker %u", s->session_index,
s->vpp_handle, wrk->wrk_index);
}
+static int
+vcl_api_recv_fd (vcl_worker_t * wrk, int *fds, int n_fds)
+{
+
+ if (vcm->cfg.vpp_app_socket_api)
+ return vcl_sapi_recv_fds (wrk, fds, n_fds);
+
+ return vcl_bapi_recv_fds (wrk, fds, n_fds);
+}
+
static void
vcl_session_app_add_segment_handler (vcl_worker_t * wrk, void *data)
{
if (msg->fd_flags)
{
- vl_socket_client_recv_fd_msg2 (&wrk->bapi_sock_ctx, &fd, 1, 5);
+ vcl_api_recv_fd (wrk, &fd, 1);
seg_type = SSVM_SEGMENT_MEMFD;
}
VDBG (1, "Unmapped segment: %d", msg->segment_handle);
}
+static void
+vcl_worker_rpc_handler (vcl_worker_t * wrk, void *data)
+{
+ if (!vcm->wrk_rpc_fn)
+ return;
+
+ (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;
- vcl_session_t *session;
+ 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)
{
case SESSION_IO_EVT_RX:
case SESSION_IO_EVT_TX:
- session = vcl_session_get (wrk, e->session_index);
- if (!session || !(session->session_state & STATE_OPEN))
+ s = vcl_session_get (wrk, e->session_index);
+ if (!s || !vcl_session_is_open (s))
break;
vec_add1 (wrk->unhandled_evts_vector, *e);
break;
+ case SESSION_CTRL_EVT_BOUND:
+ /* We can only wait for only one listen so not postponed */
+ vcl_session_bound_handler (wrk, (session_bound_msg_t *) e->data);
+ break;
case SESSION_CTRL_EVT_ACCEPTED:
- 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;
- session = vcl_session_disconnected_handler (wrk, disconnected_msg);
- if (!session)
+ 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]", session->session_index,
- session->vpp_handle);
+ 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;
case SESSION_CTRL_EVT_APP_DEL_SEGMENT:
vcl_session_app_del_segment_handler (wrk, e->data);
break;
+ case SESSION_CTRL_EVT_APP_WRK_RPC:
+ vcl_worker_rpc_handler (wrk, e->data);
+ break;
+ case SESSION_CTRL_EVT_TRANSPORT_ATTR_REPLY:
+ vcl_session_transport_attr_reply_handler (wrk, e->data);
+ break;
default:
clib_warning ("unhandled %u", e->event_type);
}
{
return VPPCOM_EBADFD;
}
- if (session->session_state & state)
+ if (session->session_state == state)
{
return VPPCOM_OK;
}
- if (session->session_state & STATE_DETACHED)
+ if (session->session_state == VCL_STATE_DETACHED)
{
return VPPCOM_ECONNREFUSED;
}
s = vcl_session_get (wrk, *sip);
vcl_send_session_worker_update (wrk, s, wrk->wrk_index);
state = s->session_state;
- vppcom_wait_for_session_state_change (s->session_index, STATE_UPDATED, 5);
+ vppcom_wait_for_session_state_change (s->session_index, VCL_STATE_UPDATED,
+ 5);
s->session_state = state;
}
vec_reset_length (wrk->pending_session_wrk_updates);
}
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++)
{
vcl_handle_pending_wrk_updates (wrk);
}
-static int
-vppcom_app_session_enable (void)
-{
- int rv;
-
- if (vcm->app_state != STATE_APP_ENABLED)
- {
- vppcom_send_session_enable_disable (1 /* is_enabled == TRUE */ );
- rv = vcl_wait_for_app_state_change (STATE_APP_ENABLED);
- if (PREDICT_FALSE (rv))
- {
- VDBG (0, "application session enable timed out! returning %d (%s)",
- rv, vppcom_retval_str (rv));
- return rv;
- }
- }
- return VPPCOM_OK;
-}
-
-static int
-vppcom_app_attach (void)
+void
+vcl_flush_mq_events (void)
{
- int rv;
-
- vppcom_app_send_attach ();
- rv = vcl_wait_for_app_state_change (STATE_APP_ATTACHED);
- if (PREDICT_FALSE (rv))
- {
- VDBG (0, "application attach timed out! returning %d (%s)", rv,
- vppcom_retval_str (rv));
- return rv;
- }
-
- return VPPCOM_OK;
+ vcl_worker_flush_mq_events (vcl_worker_get_current ());
}
static int
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);
vcl_evt (VCL_EVT_UNBIND, session);
session->vpp_handle = ~0;
- session->session_state = STATE_DISCONNECT;
-
- 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 & STATE_LISTEN))
- {
- VDBG (0, "ERROR: Cannot disconnect a listen socket!");
- return VPPCOM_EBADFD;
- }
-
- if (state & STATE_VPP_CLOSING)
- {
- vpp_evt_q = vcl_session_vpp_evt_q (wrk, session);
- vcl_send_session_disconnected_reply (vpp_evt_q, wrk->my_client_index,
- vpp_handle, 0);
- VDBG (1, "session %u [0x%llx]: sending disconnect REPLY...",
- session->session_index, vpp_handle);
- }
- else
- {
- 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--;
- }
+ session->session_state = VCL_STATE_DISCONNECT;
return VPPCOM_OK;
}
vcl_elog_stop (vcm);
}
+static int
+vcl_api_attach (void)
+{
+ if (vcm->cfg.vpp_app_socket_api)
+ return vcl_sapi_attach ();
+
+ return vcl_bapi_attach ();
+}
+
+static void
+vcl_api_detach (vcl_worker_t * wrk)
+{
+ vcl_send_app_detach (wrk);
+
+ if (vcm->cfg.vpp_app_socket_api)
+ return vcl_sapi_detach (wrk);
+
+ return vcl_bapi_disconnect_from_vpp ();
+}
+
/*
* VPPCOM Public API functions
*/
vcm->main_cpu = pthread_self ();
vcm->main_pid = getpid ();
vcm->app_name = format (0, "%s", app_name);
- vppcom_init_error_string_table ();
- 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);
atexit (vppcom_app_exit);
+ vcl_elog_init (vcm);
/* Allocate default worker */
vcl_worker_alloc_and_init ();
- /* API hookup and connect to VPP */
- vcl_elog_init (vcm);
- vcm->app_state = STATE_APP_START;
- rv = vppcom_connect_to_vpp (app_name);
- if (rv)
- {
- VERR ("couldn't connect to VPP!");
- return rv;
- }
- VDBG (0, "sending session enable");
- rv = vppcom_app_session_enable ();
- if (rv)
- {
- VERR ("vppcom_app_session_enable() failed!");
- return rv;
- }
-
- VDBG (0, "sending app attach");
- rv = vppcom_app_attach ();
- if (rv)
- {
- VERR ("vppcom_app_attach() failed!");
- return rv;
- }
+ if ((rv = vcl_api_attach ()))
+ return rv;
VDBG (0, "app_name '%s', my_client_index %d (0x%x)", app_name,
- vcm->workers[0].my_client_index, vcm->workers[0].my_client_index);
+ vcm->workers[0].api_client_handle, vcm->workers[0].api_client_handle);
return VPPCOM_OK;
}
vppcom_app_destroy (void)
{
vcl_worker_t *wrk, *current_wrk;
- struct dlmallinfo mi;
- mspace heap;
+ void *heap;
if (!pool_elts (vcm->workers))
return;
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_send_app_detach (current_wrk);
- vppcom_disconnect_from_vpp ();
+ vcl_api_detach (current_wrk);
vcl_worker_cleanup (current_wrk, 0 /* notify vpp */ );
vcl_elog_stop (vcm);
* Free the heap and fix vcm
*/
heap = clib_mem_get_heap ();
- mi = mspace_mallinfo (heap);
- munmap (mspace_least_addr (heap), mi.arena);
+ munmap (clib_mem_get_heap_base (heap), clib_mem_get_heap_size (heap));
vcm = &_vppcom_main;
vcm->is_init = 0;
session = vcl_session_alloc (wrk);
session->session_type = proto;
- session->session_state = STATE_CLOSED;
+ session->session_state = VCL_STATE_CLOSED;
session->vpp_handle = ~0;
session->is_dgram = vcl_proto_is_dgram (proto);
if (is_nonblocking)
- VCL_SESS_ATTR_SET (session->attr, VCL_SESS_ATTR_NONBLOCK);
+ vcl_session_set_attr (session, VCL_SESS_ATTR_NONBLOCK);
vcl_evt (VCL_EVT_CREATE, session, session_type, session->session_state,
is_nonblocking, session_index);
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 * session,
+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 = session->is_vep;
- next_sh = session->vep.next_sh;
- vep_sh = session->vep.vep_sh;
- state = session->session_state;
- vpp_handle = session->vpp_handle;
- VDBG (1, "session %u [0x%llx] closing", session->session_index, vpp_handle);
+ VDBG (1, "session %u [0x%llx] closing", s->session_index, s->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));
-
- next_sh = session->vep.next_sh;
+ " 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 (session->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)", session->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",
- session->session_index, vpp_handle);
+ s->session_index, s->vpp_handle);
goto cleanup;
}
- if (state & 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)", session->session_index, vpp_handle, rv,
+ "rv %d (%s)", s->session_index, s->vpp_handle, rv,
vppcom_retval_str (rv));
return rv;
}
- else if ((state & STATE_OPEN)
- || (vcl_session_is_connectable_listener (wrk, session)))
+ else if (vcl_session_is_ready (s)
+ || (vcl_session_is_connectable_listener (wrk, s)))
{
rv = vppcom_session_disconnect (sh);
if (PREDICT_FALSE (rv < 0))
VDBG (0, "ERROR: session %u [0x%llx]: disconnect failed!"
- " rv %d (%s)", session->session_index, vpp_handle,
+ " rv %d (%s)", s->session_index, s->vpp_handle,
rv, vppcom_retval_str (rv));
}
- else if (state == STATE_DISCONNECT)
+ else if (s->session_state == VCL_STATE_DISCONNECT)
{
- svm_msg_q_t *mq = vcl_session_vpp_evt_q (wrk, session);
- vcl_send_session_reset_reply (mq, wrk->my_client_index,
- session->vpp_handle, 0);
+ vcl_send_session_reset_reply (wrk, s, 0);
}
- else if (state == 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", session->session_index);
+ VDBG (0, "vpp freed session %d before close", s->session_index);
goto free_session;
}
- session->session_state = STATE_CLOSED;
+ s->session_state = VCL_STATE_CLOSED;
/* Session is removed only after vpp confirms the disconnect */
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, session);
- vcl_evt (VCL_EVT_CLOSE, session, rv);
+ vcl_session_free (wrk, s);
+ vcl_evt (VCL_EVT_CLOSE, s, rv);
return rv;
}
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);
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 & STATE_LISTEN)
+ if (listen_session->session_state == VCL_STATE_LISTEN)
{
VDBG (0, "session %u [0x%llx]: already in listen state!",
listen_sh, listen_vpp_handle);
*/
vcl_send_session_listen (wrk, listen_session);
rv = vppcom_wait_for_session_state_change (listen_session->session_index,
- STATE_LISTEN,
+ VCL_STATE_LISTEN,
vcm->cfg.session_timeout);
if (PREDICT_FALSE (rv))
return VPPCOM_OK;
}
-int
-vppcom_session_tls_add_cert (uint32_t session_handle, char *cert,
- uint32_t cert_len)
-{
-
- vcl_worker_t *wrk = vcl_worker_get_current ();
- vcl_session_t *session = 0;
-
- session = vcl_session_get_w_handle (wrk, session_handle);
- if (!session)
- return VPPCOM_EBADFD;
-
- if (cert_len == 0 || cert_len == ~0)
- return VPPCOM_EBADFD;
-
- /*
- * Send listen request to vpp and wait for reply
- */
- vppcom_send_application_tls_cert_add (session, cert, cert_len);
- vcm->app_state = STATE_APP_ADDING_TLS_DATA;
- vcl_wait_for_app_state_change (STATE_APP_READY);
- return VPPCOM_OK;
-
-}
-
-int
-vppcom_session_tls_add_key (uint32_t session_handle, char *key,
- uint32_t key_len)
-{
-
- vcl_worker_t *wrk = vcl_worker_get_current ();
- vcl_session_t *session = 0;
-
- session = vcl_session_get_w_handle (wrk, session_handle);
- if (!session)
- return VPPCOM_EBADFD;
-
- if (key_len == 0 || key_len == ~0)
- return VPPCOM_EBADFD;
-
- vppcom_send_application_tls_key_add (session, key, key_len);
- vcm->app_state = STATE_APP_ADDING_TLS_DATA;
- vcl_wait_for_app_state_change (STATE_APP_READY);
- return VPPCOM_OK;
-}
-
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);
return VPPCOM_EBADFD;
}
- if ((ls->session_state != STATE_LISTEN)
+ 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;
*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;
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;
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:
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)
{
if (accept_flags)
{
if (accept_flags & VCL_ACCEPTED_F_CLOSED)
- client_session->session_state = STATE_VPP_CLOSING;
+ client_session->session_state = VCL_STATE_VPP_CLOSING;
else if (accept_flags & VCL_ACCEPTED_F_RESET)
- client_session->session_state = STATE_DISCONNECT;
+ client_session->session_state = VCL_STATE_DISCONNECT;
}
return vcl_session_handle (client_session);
}
return VPPCOM_EBADFD;
session_index = session->session_index;
- if (PREDICT_FALSE (session->is_vep))
+ if (PREDICT_FALSE (session->flags & VCL_SESSION_F_IS_VEP))
{
VDBG (0, "ERROR: cannot connect epoll session %u!",
session->session_index);
return VPPCOM_EBADFD;
}
- if (PREDICT_FALSE (session->session_state & CLIENT_STATE_OPEN))
+ if (PREDICT_FALSE (vcl_session_is_ready (session)))
{
VDBG (0, "session handle %u [0x%llx]: session already "
"connected to %s %U port %d proto %s, state 0x%x (%s)",
}
/* Attempt to connect a connectionless listener */
- if (PREDICT_FALSE (session->session_state & STATE_LISTEN))
+ if (PREDICT_FALSE (session->session_state == VCL_STATE_LISTEN))
{
if (session->session_type != VPPCOM_PROTO_UDP)
return VPPCOM_EINVAL;
vcl_send_session_unlisten (wrk, session);
- session->session_state = STATE_CLOSED;
+ session->session_state = VCL_STATE_CLOSED;
}
session->transport.is_ip4 = server_ep->is_ip4;
vcl_send_session_connect (wrk, session);
- if (VCL_SESS_ATTR_TEST (session->attr, VCL_SESS_ATTR_NONBLOCK))
- return VPPCOM_EINPROGRESS;
+ if (vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK))
+ {
+ /* State set to STATE_UPDATED to ensure the session is not assumed
+ * to be ready and to also allow the app to close it prior to vpp's
+ * connected reply. */
+ session->session_state = VCL_STATE_UPDATED;
+ return VPPCOM_EINPROGRESS;
+ }
/*
* Wait for reply from vpp if blocking
*/
- rv = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT,
+ rv = vppcom_wait_for_session_state_change (session_index, VCL_STATE_READY,
vcm->cfg.session_timeout);
session = vcl_session_get (wrk, session_index);
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);
return VPPCOM_EBADFD;
}
- if (PREDICT_FALSE (session->session_state & CLIENT_STATE_OPEN))
+ if (PREDICT_FALSE (vcl_session_is_ready (session)))
{
VDBG (0, "session handle %u [0x%llx]: session already "
"connected to session %u [0x%llx] proto %s, state 0x%x (%s)",
* Send connect request and wait for reply from vpp
*/
vcl_send_session_connect (wrk, session);
- rv = vppcom_wait_for_session_state_change (session_index, STATE_CONNECT,
+ rv = vppcom_wait_for_session_state_change (session_index, VCL_STATE_READY,
vcm->cfg.session_timeout);
session->listener_index = parent_session_index;
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)
{
vcl_worker_t *wrk = vcl_worker_get_current ();
- int n_read = 0, is_nonblocking;
+ 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)))
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))
{
{
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))
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);
}
}
+read_again:
+
if (s->is_dgram)
- n_read = app_recv_dgram_raw (rx_fifo, buf, n, &s->transport, 0, peek);
+ rv = app_recv_dgram_raw (rx_fifo, buf, n, &s->transport, 0, peek);
else
- n_read = app_recv_stream_raw (rx_fifo, buf, n, 0, peek);
+ 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 (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 && !s->is_dgram))
+ {
+ /* More data enqueued while reading. Try to drain it
+ * or fill the buffer. Avoid doing that for dgrams */
+ buf += rv;
+ n -= rv;
+ goto read_again;
+ }
- /* Cut-through sessions might request tx notifications on rx fifos */
- if (PREDICT_FALSE (rx_fifo->want_deq_ntf))
+ if (PREDICT_FALSE (svm_fifo_needs_deq_ntf (rx_fifo, n_read)))
{
- app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo->master_session_index,
+ svm_fifo_clear_deq_ntf (rx_fifo);
+ app_send_io_evt_to_vpp (s->vpp_evt_q,
+ s->rx_fifo->shr->master_session_index,
SESSION_IO_EVT_RX, SVM_Q_WAIT);
- svm_fifo_reset_has_deq_ntf (s->rx_fifo);
}
VDBG (2, "session %u[0x%llx]: read %d bytes from (%p)", s->session_index,
int
vppcom_session_read_segments (uint32_t session_handle,
- vppcom_data_segments_t ds)
+ vppcom_data_segment_t * ds, uint32_t n_segments,
+ uint32_t max_bytes)
{
vcl_worker_t *wrk = vcl_worker_get_current ();
int n_read = 0, is_nonblocking;
vcl_session_t *s = 0;
svm_fifo_t *rx_fifo;
- svm_msg_q_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;
}
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);
}
}
- n_read = svm_fifo_segments (rx_fifo, (svm_fifo_seg_t *) ds);
- svm_fifo_unset_event (rx_fifo);
+ n_read = svm_fifo_segments (rx_fifo, s->rx_bytes_pending,
+ (svm_fifo_seg_t *) ds, n_segments, max_bytes);
+ if (n_read < 0)
+ return VPPCOM_EAGAIN;
+ if (svm_fifo_max_dequeue_cons (rx_fifo) == n_read)
+ {
+ if (is_ct)
+ svm_fifo_unset_event (s->rx_fifo);
+ svm_fifo_unset_event (rx_fifo);
+ if (svm_fifo_max_dequeue_cons (rx_fifo) != n_read
+ && svm_fifo_set_event (rx_fifo)
+ && vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK))
+ {
+ session_event_t *e;
+ vec_add2 (wrk->unhandled_evts_vector, e, 1);
+ e->event_type = SESSION_IO_EVT_RX;
+ e->session_index = s->session_index;
+ }
+ }
+
+ s->rx_bytes_pending += n_read;
return n_read;
}
void
-vppcom_session_free_segments (uint32_t session_handle,
- vppcom_data_segments_t ds)
+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_segments_free (s->rx_fifo, (svm_fifo_seg_t *) ds);
-}
+ is_ct = vcl_session_is_ct (s);
+ svm_fifo_dequeue_drop (is_ct ? s->ct_rx_fifo : s->rx_fifo, n_bytes);
-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)
-{
- return (e->event_type == SESSION_IO_EVT_TX && e->session_index == sid);
+ ASSERT (s->rx_bytes_pending >= n_bytes);
+ s->rx_bytes_pending -= n_bytes;
}
always_inline u8
{
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);
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))
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);
}
}
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);
- ASSERT (n_write > 0);
+ /* The underlying fifo segment can run out of memory */
+ if (PREDICT_FALSE (n_write < 0))
+ return VPPCOM_EAGAIN;
VDBG (2, "session %u [0x%llx]: wrote %d bytes", s->session_index,
s->vpp_handle, n_write);
} \
else if (svm_fifo_is_empty (_s->ct_rx_fifo)) \
{ \
- svm_fifo_unset_event (_s->ct_rx_fifo); \
+ svm_fifo_unset_event (_s->rx_fifo); /* rx evts on actual fifo*/ \
if (svm_fifo_is_empty (_s->ct_rx_fifo)) \
break; \
} \
{
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);
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)
{
}
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);
}
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)
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);
case SESSION_CTRL_EVT_APP_DEL_SEGMENT:
vcl_session_app_del_segment_handler (wrk, e->data);
break;
+ case SESSION_CTRL_EVT_APP_WRK_RPC:
+ vcl_worker_rpc_handler (wrk, e->data);
+ break;
default:
clib_warning ("unhandled: %u", e->event_type);
break;
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 (!time_to_wait)
- {
- svm_msg_q_unlock (mq);
- return 0;
- }
+ return 0;
+
+ if (!time_to_wait)
+ 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++)
{
{
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)
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:
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"
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;
struct epoll_event *event)
{
vcl_worker_t *wrk = vcl_worker_get_current ();
+ int rv = VPPCOM_OK, add_evt = 0;
vcl_session_t *vep_session;
- vcl_session_t *session;
- int rv = VPPCOM_OK;
+ vcl_session_t *s;
+ svm_fifo_t *txf;
if (vep_handle == 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;
ASSERT (vep_session->vep.vep_sh == ~0);
ASSERT (vep_session->vep.prev_sh == ~0);
- session = vcl_session_get_w_handle (wrk, session_handle);
- if (PREDICT_FALSE (!session))
+ s = vcl_session_get_w_handle (wrk, session_handle);
+ if (PREDICT_FALSE (!s))
{
VDBG (0, "Invalid session_handle (%u)!", session_handle);
return VPPCOM_EBADFD;
}
- if (PREDICT_FALSE (session->is_vep))
+ if (PREDICT_FALSE (s->flags & VCL_SESSION_F_IS_VEP))
{
VDBG (0, "session_handle (%u) is a vep!", vep_handle);
return VPPCOM_EINVAL;
VDBG (0, "EPOLL_CTL_ADD: NULL pointer to epoll_event structure!");
return VPPCOM_EINVAL;
}
+ if (s->flags & VCL_SESSION_F_IS_VEP_SESSION)
+ {
+ VDBG (0, "EPOLL_CTL_ADD: %u already epolled!", s->session_index);
+ rv = VPPCOM_EEXIST;
+ goto done;
+ }
if (vep_session->vep.next_sh != ~0)
{
vcl_session_t *next_session;
ASSERT (next_session->vep.prev_sh == vep_handle);
next_session->vep.prev_sh = session_handle;
}
- session->vep.next_sh = vep_session->vep.next_sh;
- session->vep.prev_sh = vep_handle;
- session->vep.vep_sh = vep_handle;
- session->vep.et_mask = VEP_DEFAULT_ET_MASK;
- session->vep.ev = *event;
- session->is_vep = 0;
- session->is_vep_session = 1;
+ s->vep.next_sh = vep_session->vep.next_sh;
+ s->vep.prev_sh = vep_handle;
+ s->vep.vep_sh = vep_handle;
+ s->vep.et_mask = VEP_DEFAULT_ET_MASK;
+ s->vep.lt_next = VCL_INVALID_SESSION_INDEX;
+ s->vep.ev = *event;
+ s->flags &= ~VCL_SESSION_F_IS_VEP;
+ s->flags |= VCL_SESSION_F_IS_VEP_SESSION;
vep_session->vep.next_sh = session_handle;
- if (session->tx_fifo)
- svm_fifo_add_want_deq_ntf (session->tx_fifo,
- SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL);
+ txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo;
+ if (txf && (event->events & EPOLLOUT))
+ svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL);
/* Generate EPOLLOUT if tx fifo not full */
- if ((event->events & EPOLLOUT) &&
- (vcl_session_write_ready (session) > 0))
+ if ((event->events & EPOLLOUT) && (vcl_session_write_ready (s) > 0))
{
session_event_t e = { 0 };
e.event_type = SESSION_IO_EVT_TX;
- e.session_index = session->session_index;
+ 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 (session) > 0))
+ if ((event->events & EPOLLIN) && (vcl_session_read_ready (s) > 0))
{
session_event_t e = { 0 };
e.event_type = SESSION_IO_EVT_RX;
- e.session_index = session->session_index;
+ 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);
- vcl_evt (VCL_EVT_EPOLL_CTLADD, session, event->events, event->data.u64);
+ vcl_evt (VCL_EVT_EPOLL_CTLADD, s, event->events, event->data.u64);
break;
case EPOLL_CTL_MOD:
rv = VPPCOM_EINVAL;
goto done;
}
- else if (PREDICT_FALSE (!session->is_vep_session))
+ else if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION)))
{
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 (session->vep.vep_sh != vep_handle))
+ else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle))
{
VDBG (0, "EPOLL_CTL_MOD: sh %u vep_sh (%u) != vep_sh (%u)!",
- session_handle, session->vep.vep_sh, vep_handle);
+ session_handle, s->vep.vep_sh, vep_handle);
rv = VPPCOM_EINVAL;
goto done;
}
- /* Generate EPOLLOUT when tx_fifo/ct_tx_fifo not full */
- if ((event->events & EPOLLOUT) &&
- !(session->vep.ev.events & EPOLLOUT) &&
- (vcl_session_write_ready (session) > 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 = session->session_index;
+ e.session_index = s->session_index;
+ vec_add1 (wrk->unhandled_evts_vector, e);
+ }
+ /* Generate EPOLLIN if session read ready and event was not on */
+ if ((event->events & EPOLLIN) && !(s->vep.ev.events & EPOLLIN) &&
+ (vcl_session_read_ready (s) > 0))
+ {
+ session_event_t e = { 0 };
+ e.event_type = SESSION_IO_EVT_RX;
+ e.session_index = s->session_index;
vec_add1 (wrk->unhandled_evts_vector, e);
+ s->flags &= ~VCL_SESSION_F_HAS_RX_EVT;
+ }
+ s->vep.et_mask = VEP_DEFAULT_ET_MASK;
+ s->vep.ev = *event;
+ txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo;
+ if (txf)
+ {
+ if (event->events & EPOLLOUT)
+ svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL);
+ else
+ svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL);
}
- session->vep.et_mask = VEP_DEFAULT_ET_MASK;
- session->vep.ev = *event;
VDBG (1, "EPOLL_CTL_MOD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!",
vep_handle, session_handle, event->events, event->data.u64);
break;
case EPOLL_CTL_DEL:
- if (PREDICT_FALSE (!session->is_vep_session))
+ if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION)))
{
VDBG (0, "EPOLL_CTL_DEL: %u not a vep session!", session_handle);
- rv = VPPCOM_EINVAL;
+ rv = VPPCOM_ENOENT;
goto done;
}
- else if (PREDICT_FALSE (session->vep.vep_sh != vep_handle))
+ else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle))
{
VDBG (0, "EPOLL_CTL_DEL: sh %u vep_sh (%u) != vep_sh (%u)!",
- session_handle, session->vep.vep_sh, vep_handle);
+ session_handle, s->vep.vep_sh, vep_handle);
rv = VPPCOM_EINVAL;
goto done;
}
- if (session->vep.prev_sh == vep_handle)
- vep_session->vep.next_sh = session->vep.next_sh;
+ if (s->vep.prev_sh == vep_handle)
+ vep_session->vep.next_sh = s->vep.next_sh;
else
{
vcl_session_t *prev_session;
- prev_session = vcl_session_get_w_handle (wrk, session->vep.prev_sh);
+ prev_session = vcl_session_get_w_handle (wrk, s->vep.prev_sh);
if (PREDICT_FALSE (!prev_session))
{
VDBG (0, "EPOLL_CTL_DEL: Invalid prev_sh (%u) on sh (%u)!",
- session->vep.prev_sh, session_handle);
+ s->vep.prev_sh, session_handle);
return VPPCOM_EBADFD;
}
ASSERT (prev_session->vep.next_sh == session_handle);
- prev_session->vep.next_sh = session->vep.next_sh;
+ prev_session->vep.next_sh = s->vep.next_sh;
}
- if (session->vep.next_sh != ~0)
+ if (s->vep.next_sh != ~0)
{
vcl_session_t *next_session;
- next_session = vcl_session_get_w_handle (wrk, session->vep.next_sh);
+ next_session = vcl_session_get_w_handle (wrk, s->vep.next_sh);
if (PREDICT_FALSE (!next_session))
{
VDBG (0, "EPOLL_CTL_DEL: Invalid next_sh (%u) on sh (%u)!",
- session->vep.next_sh, session_handle);
+ s->vep.next_sh, session_handle);
return VPPCOM_EBADFD;
}
ASSERT (next_session->vep.prev_sh == session_handle);
- next_session->vep.prev_sh = session->vep.prev_sh;
+ next_session->vep.prev_sh = s->vep.prev_sh;
}
- memset (&session->vep, 0, sizeof (session->vep));
- session->vep.next_sh = ~0;
- session->vep.prev_sh = ~0;
- session->vep.vep_sh = ~0;
- session->is_vep_session = 0;
+ if (s->vep.lt_next != VCL_INVALID_SESSION_INDEX)
+ vcl_epoll_lt_del (wrk, s);
- if (session->tx_fifo)
- svm_fifo_del_want_deq_ntf (session->tx_fifo, SVM_FIFO_NO_DEQ_NOTIF);
+ memset (&s->vep, 0, sizeof (s->vep));
+ s->vep.next_sh = ~0;
+ s->vep.prev_sh = ~0;
+ s->vep.vep_sh = ~0;
+ s->vep.lt_next = VCL_INVALID_SESSION_INDEX;
+ s->flags &= ~VCL_SESSION_F_IS_VEP_SESSION;
+
+ if (vcl_session_is_open (s))
+ {
+ txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo;
+ if (txf)
+ svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL);
+ }
VDBG (1, "EPOLL_CTL_DEL: vep_idx %u, sh %u!", vep_handle,
session_handle);
- vcl_evt (VCL_EVT_EPOLL_CTLDEL, session, vep_sh);
+ vcl_evt (VCL_EVT_EPOLL_CTLDEL, s, vep_sh);
break;
default:
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 (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 & 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);
case SESSION_CTRL_EVT_APP_DEL_SEGMENT:
vcl_session_app_del_segment_handler (wrk, e->data);
break;
+ case SESSION_CTRL_EVT_APP_WRK_RPC:
+ vcl_worker_rpc_handler (wrk, e->data);
+ break;
default:
VDBG (0, "unhandled: %u", e->event_type);
break;
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;
}
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++)
}
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;
- 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;
+
+ next = wrk->ep_lt_current;
+ do
+ {
+ s = vcl_session_get (wrk, next);
+ next = s->vep.lt_next;
- return (int) n_evts;
+ 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
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++)
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
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)
case VPPCOM_ATTR_GET_FLAGS:
if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*flags))))
{
- *flags = O_RDWR | (VCL_SESS_ATTR_TEST (session->attr,
- VCL_SESS_ATTR_NONBLOCK));
+ *flags =
+ O_RDWR |
+ (vcl_session_has_attr (session, VCL_SESS_ATTR_NONBLOCK) ?
+ O_NONBLOCK : 0);
*buflen = sizeof (*flags);
VDBG (2, "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;
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;
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,
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)))
{
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#",
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
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#",
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
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#",
{
/* 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
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#",
{
/* 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
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#",
{
/* 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
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#",
{
/* 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
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#",
{
/* 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;
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#",
{
/* 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", tea.mss,
+ *buflen);
+ break;
+
+ case VPPCOM_ATTR_SET_CONNECTED:
+ session->flags |= VCL_SESSION_F_CONNECTED;
+ break;
- VDBG (2, "VPPCOM_ATTR_SET_TCP_USER_MSS: %u, buflen %d, #VPP-TBD#",
- session->user_mss, *buflen);
+ 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_VRF:
+ if (!(buffer && buflen && (*buflen == sizeof (u32))))
+ {
+ rv = VPPCOM_EINVAL;
+ break;
+ }
+ session->vrf = *(u32 *) 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_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:
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 == STATE_CLOSED))
+ 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);
}
}
int
vppcom_worker_register (void)
{
- vcl_worker_t *wrk;
- u8 *wrk_name = 0;
- int rv;
-
if (!vcl_worker_alloc_and_init ())
return VPPCOM_EEXIST;
- wrk = vcl_worker_get_current ();
- wrk_name = format (0, "%s-wrk-%u", vcm->app_name, wrk->wrk_index);
-
- rv = vppcom_connect_to_vpp ((char *) wrk_name);
- vec_free (wrk_name);
-
- if (rv)
- return VPPCOM_EFAULT;
-
if (vcl_worker_register_with_vpp ())
return VPPCOM_EEXIST;
case VPPCOM_PROTO_QUIC:
proto_str = "QUIC";
break;
+ case VPPCOM_PROTO_DTLS:
+ proto_str = "DTLS";
+ break;
+ case VPPCOM_PROTO_SRTP:
+ proto_str = "SRTP";
+ break;
default:
proto_str = "UNKNOWN";
break;
return 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
*
Code Review / vpp.git / blobdiff