STATE_FAILED
} session_state_t;
+typedef struct epoll_event vppcom_epoll_event_t;
+
+typedef struct
+{
+ u32 next_sid;
+ u32 prev_sid;
+ u32 vep_idx;
+ vppcom_epoll_event_t ev;
+#define VEP_DEFAULT_ET_MASK (EPOLLIN|EPOLLOUT)
+ u32 et_mask;
+} vppcom_epoll_t;
+
+typedef struct
+{
+ u8 is_ip4;
+ ip46_address_t ip46;
+} vppcom_ip46_t;
+
typedef struct
{
volatile session_state_t state;
unix_shared_memory_queue_t *vpp_event_queue;
/* Socket configuration state */
+ /* TBD: covert 'is_*' vars to bit in u8 flags; */
u8 is_server;
u8 is_listen;
u8 is_cut_thru;
u8 is_nonblocking;
+ u8 is_vep;
+ u8 is_vep_session;
+ u32 wait_cont_idx;
+ vppcom_epoll_t vep;
u32 vrf;
- u8 is_ip4;
- u8 ip[16];
+ vppcom_ip46_t lcl_addr;
+ vppcom_ip46_t peer_addr;
u16 port;
u8 proto;
u64 client_queue_address;
if (PREDICT_FALSE ((session_index == ~0) ||
pool_is_free_index (vcm->sessions, session_index)))
{
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
return VPPCOM_EBADFD;
}
bmp->client_index = vcm->my_client_index;
bmp->context = htonl (0xfeedface);
bmp->options[APP_OPTIONS_FLAGS] =
- APP_OPTIONS_FLAGS_USE_FIFO | APP_OPTIONS_FLAGS_ADD_SEGMENT;
+ APP_OPTIONS_FLAGS_ACCEPT_REDIRECT | APP_OPTIONS_FLAGS_ADD_SEGMENT |
+ APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE | APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
bmp->options[SESSION_OPTIONS_SEGMENT_SIZE] = vcm->cfg.segment_size;
bmp->options[SESSION_OPTIONS_ADD_SEGMENT_SIZE] = vcm->cfg.add_segment_size;
bmp->options[SESSION_OPTIONS_RX_FIFO_SIZE] = vcm->cfg.rx_fifo_size;
if (PREDICT_FALSE (rv))
{
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, p[0]);
}
hash_unset (vcm->session_index_by_vpp_handles, mp->handle);
if (PREDICT_FALSE (rval))
{
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, p[0]);
}
else
if (PREDICT_FALSE (rval))
{
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, p[0]);
}
else
vec_reset_length (a->new_segment_indices);
if (PREDICT_FALSE (rv))
{
+ clib_spinlock_unlock (&vcm->sessions_lockp);
clib_warning ("[%d] sm_fifo_segment_attach ('%s') failed",
vcm->my_pid, a->segment_name);
return;
vcm->my_pid, session_index, session_index);
cmp->vrf = session->vrf;
- cmp->is_ip4 = session->is_ip4;
- clib_memcpy (cmp->ip, session->ip, sizeof (cmp->ip));
+ cmp->is_ip4 = session->peer_addr.is_ip4;
+ clib_memcpy (cmp->ip, &session->peer_addr.ip46, sizeof (cmp->ip));
cmp->port = session->port;
cmp->proto = session->proto;
clib_memcpy (cmp->options, session->options, sizeof (cmp->options));
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
return rv;
}
session->is_cut_thru = 0;
session->is_server = 1;
session->port = ntohs (mp->port);
- session->is_ip4 = mp->is_ip4;
- clib_memcpy (session->ip, mp->ip, sizeof (session->ip));
- clib_spinlock_unlock (&vcm->sessions_lockp);
+ session->peer_addr.is_ip4 = mp->is_ip4;
+ clib_memcpy (&session->peer_addr.ip46, mp->ip,
+ sizeof (session->peer_addr.ip46));
/* Add it to lookup table */
hash_set (vcm->session_index_by_vpp_handles, mp->handle, session_index);
clib_fifo_add1 (vcm->client_session_index_fifo, session_index);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
/*
* Send accept reply to vpp
svm_fifo_t *tx_fifo;
unix_shared_memory_queue_t *event_q = 0;
+ clib_spinlock_lock (&vcm->sessions_lockp);
if (!clib_fifo_free_elts (vcm->client_session_index_fifo))
{
if (VPPCOM_DEBUG > 1)
clib_warning ("[%d] client session queue is full!", vcm->my_pid);
rv = VNET_API_ERROR_QUEUE_FULL;
+ clib_spinlock_unlock (&vcm->sessions_lockp);
goto send_reply;
}
if (VPPCOM_DEBUG > 1)
clib_warning ("[%d] created segment '%s'", vcm->my_pid, a->segment_name);
- clib_spinlock_lock (&vcm->sessions_lockp);
pool_get (vcm->sessions, session);
memset (session, 0, sizeof (*session));
session_index = session - vcm->sessions;
session->client_queue_address = mp->client_queue_address;
session->is_cut_thru = 1;
session->is_server = 1;
- session->is_ip4 = mp->is_ip4;
session->port = mp->port;
+ session->peer_addr.is_ip4 = mp->is_ip4;
+ clib_memcpy (&session->peer_addr.ip46, mp->ip,
+ sizeof (session->peer_addr.ip46));
{
void *oldheap;
ssvm_shared_header_t *sh = seg->ssvm.sh;
ssvm_pop_heap (oldheap);
ssvm_unlock_non_recursive (sh);
}
- clib_memcpy (session->ip, mp->ip, sizeof (session->ip));
session->state = STATE_ACCEPT;
if (VPPCOM_DEBUG > 1)
clib_warning ("[%d] Connected cut-thru to client: sid %d",
vcm->my_pid, session_index);
- clib_spinlock_unlock (&vcm->sessions_lockp);
clib_fifo_add1 (vcm->client_session_index_fifo, session_index);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
send_reply:
rmp = vl_msg_api_alloc (sizeof (*rmp));
bmp->client_index = vcm->my_client_index;
bmp->context = htonl (0xfeedface);
bmp->vrf = session->vrf;
- bmp->is_ip4 = session->is_ip4;
- clib_memcpy (bmp->ip, session->ip, sizeof (bmp->ip));
+ bmp->is_ip4 = session->lcl_addr.is_ip4;
+ clib_memcpy (bmp->ip, &session->lcl_addr.ip46, sizeof (bmp->ip));
bmp->port = session->port;
bmp->proto = session->proto;
clib_memcpy (bmp->options, session->options, sizeof (bmp->options));
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
return;
}
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
return VPPCOM_EBADFD;
}
clib_spinlock_lock (&vcm->sessions_lockp);
pool_get (vcm->sessions, session);
+ memset (session, 0, sizeof (*session));
session_index = session - vcm->sessions;
session->vrf = vrf;
rv = vppcom_session_at_index (session_index, &session);
if (PREDICT_FALSE (rv))
{
- clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
- return rv;
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ goto done;
}
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
clib_warning ("[%d] sid %d", vcm->my_pid, session_index);
- if (session->is_cut_thru)
+ if (session->is_vep)
{
- if (session->is_server)
+ u32 next_sid;
+ for (next_sid = session->vep.next_sid; next_sid != ~0;
+ next_sid = session->vep.next_sid)
{
- rv = vppcom_session_unbind_cut_thru (session);
+ rv = vppcom_epoll_ctl (session_index, EPOLL_CTL_DEL, next_sid, 0);
if ((VPPCOM_DEBUG > 0) && (rv < 0))
- clib_warning ("[%d] unbind cut-thru (session %d) failed, "
- "rv = %s (%d)",
+ clib_warning ("[%d] EPOLL_CTL_DEL vep_idx %u, sid %u failed, "
+ "rv = %s (%d)", session_index, next_sid,
vcm->my_pid, session_index,
vppcom_retval_str (rv), rv);
+
+ clib_spinlock_lock (&vcm->sessions_lockp);
+ rv = vppcom_session_at_index (session_index, &session);
+ if (PREDICT_FALSE (rv))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning
+ ("[%d] invalid session, sid (%u) has been closed!",
+ vcm->my_pid, session_index);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ goto done;
+ }
+ clib_spinlock_unlock (&vcm->sessions_lockp);
}
}
- else if (session->is_server)
- {
- rv = vppcom_session_unbind (session_index);
- if ((VPPCOM_DEBUG > 0) && (rv < 0))
- clib_warning ("[%d] unbind (session %d) failed, rv = %s (%d)",
- vcm->my_pid, session_index, vppcom_retval_str (rv), rv);
- }
else
{
- rv = vppcom_session_disconnect (session_index);
- if ((VPPCOM_DEBUG > 0) && (rv < 0))
- clib_warning ("[%d] disconnect (session %d) failed, rv = %s (%d)",
- vcm->my_pid, session_index, vppcom_retval_str (rv), rv);
- }
- if (rv < 0)
- return rv;
+ if (session->is_vep_session)
+ {
+ u32 vep_idx = session->vep.vep_idx;
+ rv = vppcom_epoll_ctl (vep_idx, EPOLL_CTL_DEL, session_index, 0);
+ if ((VPPCOM_DEBUG > 0) && (rv < 0))
+ clib_warning ("[%d] EPOLL_CTL_DEL vep_idx %u, sid %u failed, "
+ "rv = %s (%d)", vep_idx, session_index,
+ vcm->my_pid, session_index,
+ vppcom_retval_str (rv), rv);
- clib_spinlock_lock (&vcm->sessions_lockp);
+ clib_spinlock_lock (&vcm->sessions_lockp);
+ rv = vppcom_session_at_index (session_index, &session);
+ if (PREDICT_FALSE (rv))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning
+ ("[%d] invalid session, sid (%u) has been closed!",
+ vcm->my_pid, session_index);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ goto done;
+ }
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ }
+
+ if (session->is_cut_thru)
+ {
+ if (session->is_server)
+ {
+ rv = vppcom_session_unbind_cut_thru (session);
+ if ((VPPCOM_DEBUG > 0) && (rv < 0))
+ clib_warning ("[%d] unbind cut-thru (session %d) failed, "
+ "rv = %s (%d)",
+ vcm->my_pid, session_index,
+ vppcom_retval_str (rv), rv);
+ }
+ }
+ else if (session->is_server)
+ {
+ rv = vppcom_session_unbind (session_index);
+ if ((VPPCOM_DEBUG > 0) && (rv < 0))
+ clib_warning ("[%d] unbind (session %d) failed, rv = %s (%d)",
+ vcm->my_pid, session_index,
+ vppcom_retval_str (rv), rv);
+ }
+ else
+ {
+ rv = vppcom_session_disconnect (session_index);
+ if ((VPPCOM_DEBUG > 0) && (rv < 0))
+ clib_warning ("[%d] disconnect (session %d) failed, rv = %s (%d)",
+ vcm->my_pid, session_index,
+ vppcom_retval_str (rv), rv);
+ }
+ }
pool_put_index (vcm->sessions, session_index);
- clib_spinlock_unlock (&vcm->sessions_lockp);
+done:
return rv;
}
vppcom_main_t *vcm = &vppcom_main;
session_t *session = 0;
int rv;
- ip46_address_t *ip46;
if (!ep || !ep->ip)
return VPPCOM_EINVAL;
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
return rv;
}
clib_warning ("[%d] sid %d", vcm->my_pid, session_index);
session->vrf = ep->vrf;
- session->is_ip4 = ep->is_ip4;
- memset (session->ip, 0, sizeof (session->ip));
- ip46 = (ip46_address_t *) session->ip;
- *ip46 = to_ip46 (!ep->is_ip4, ep->ip);
+ session->lcl_addr.is_ip4 = ep->is_ip4;
+ session->lcl_addr.ip46 = to_ip46 (!ep->is_ip4, ep->ip);
session->port = ep->port;
clib_spinlock_unlock (&vcm->sessions_lockp);
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, listen_session_index);
return rv;
}
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, listen_session_index);
return rv;
}
listen_session->is_listen = 1;
- clib_spinlock_unlock (&vcm->sessions_lockp);
clib_fifo_validate (vcm->client_session_index_fifo, q_len);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
return VPPCOM_OK;
}
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, listen_session_index);
return rv;
}
break;
}
- clib_fifo_sub1 (vcm->client_session_index_fifo, client_session_index);
-
clib_spinlock_lock (&vcm->sessions_lockp);
+ clib_fifo_sub1 (vcm->client_session_index_fifo, client_session_index);
rv = vppcom_session_at_index (client_session_index, &client_session);
ASSERT (rv == VPPCOM_OK);
- ASSERT (client_session->is_ip4 == listen_session->is_ip4);
+ ASSERT (client_session->peer_addr.is_ip4 ==
+ listen_session->lcl_addr.is_ip4);
if (VPPCOM_DEBUG > 0)
clib_warning ("[%d] Got a request: client sid %d", vcm->my_pid,
ep->vrf = client_session->vrf;
ep->is_cut_thru = client_session->is_cut_thru;
- ep->is_ip4 = client_session->is_ip4;
+ ep->is_ip4 = client_session->peer_addr.is_ip4;
ep->port = client_session->port;
- if (client_session->is_ip4)
- clib_memcpy (ep->ip, client_session->ip, sizeof (ip4_address_t));
+ if (client_session->peer_addr.is_ip4)
+ clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip4,
+ sizeof (ip4_address_t));
else
- clib_memcpy (ep->ip, client_session->ip, sizeof (ip6_address_t));
+ clib_memcpy (ep->ip, &client_session->peer_addr.ip46.ip6,
+ sizeof (ip6_address_t));
clib_spinlock_unlock (&vcm->sessions_lockp);
return (int) client_session_index;
}
vppcom_main_t *vcm = &vppcom_main;
session_t *session = 0;
int rv;
- ip46_address_t *ip46;
clib_spinlock_lock (&vcm->sessions_lockp);
rv = vppcom_session_at_index (session_index, &session);
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
return rv;
}
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] session, sid (%d) already connected!",
+ clib_warning ("[%d] session, sid (%u) already connected!",
vcm->my_pid, session_index);
return VPPCOM_OK;
}
session->vrf = server_ep->vrf;
- session->is_ip4 = server_ep->is_ip4;
- memset (session->ip, 0, sizeof (session->ip));
- ip46 = (ip46_address_t *) session->ip;
- *ip46 = to_ip46 (!server_ep->is_ip4, server_ep->ip);
+ session->peer_addr.is_ip4 = server_ep->is_ip4;
+ session->peer_addr.ip46 = to_ip46 (!server_ep->is_ip4, server_ep->ip);
session->port = server_ep->port;
if (VPPCOM_DEBUG > 0)
{
u8 *ip_str = format (0, "%U", format_ip46_address,
- &session->ip, session->is_ip4);
+ &session->peer_addr.ip46,
+ session->peer_addr.is_ip4);
clib_warning ("[%d] connect sid %d to %s server port %d",
vcm->my_pid, session_index, ip_str,
clib_net_to_host_u16 (session->port));
svm_fifo_t *rx_fifo;
int n_read = 0;
int rv;
- int max_dequeue;
char *fifo_str;
ASSERT (buf);
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
return rv;
}
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] sid (%d) has been closed by remote peer!",
+ clib_warning ("[%d] sid (%u) has been closed by remote peer!",
vcm->my_pid, session_index);
return VPPCOM_ECONNRESET;
}
session->server_rx_fifo : session->server_tx_fifo);
fifo_str = ((!session->is_cut_thru || session->is_server) ?
"server_rx_fifo" : "server_tx_fifo");
- clib_spinlock_unlock (&vcm->sessions_lockp);
- max_dequeue = (int) svm_fifo_max_dequeue (rx_fifo);
- n_read = svm_fifo_dequeue_nowait (rx_fifo, clib_min (n, max_dequeue), buf);
+ do
+ {
+ n_read = svm_fifo_dequeue_nowait (rx_fifo, n, buf);
+ }
+ while (!session->is_nonblocking && (n_read <= 0));
+
+ if (n_read <= 0)
+ session->vep.et_mask |= EPOLLIN;
- if (VPPCOM_DEBUG > 2)
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+
+ if ((VPPCOM_DEBUG > 2) && (n_read > 0))
clib_warning ("[%d] sid %d, read %d bytes from %s (%p)", vcm->my_pid,
session_index, n_read, fifo_str, rx_fifo);
if (session->state == STATE_DISCONNECT)
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] sid (%d) has been closed by remote peer!",
+ clib_warning ("[%d] sid (%u) has been closed by remote peer!",
vcm->my_pid, session_index);
return VPPCOM_ECONNRESET;
}
session_index,
session->is_server ? "server_rx_fifo" : "server_tx_fifo",
rx_fifo, ready);
+ if (ready == 0)
+ session->vep.et_mask |= EPOLLIN;
+
return ready;
}
svm_fifo_t *tx_fifo;
unix_shared_memory_queue_t *q;
session_fifo_event_t evt;
- int rv;
+ int rv, n_write;
char *fifo_str;
- u8 is_nonblocking;
ASSERT (buf);
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
return rv;
}
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] sid (%d) has been closed by remote peer!",
+ clib_warning ("[%d] sid (%u) has been closed by remote peer!",
vcm->my_pid, session_index);
return VPPCOM_ECONNRESET;
}
session->server_tx_fifo : session->server_rx_fifo);
fifo_str = ((!session->is_cut_thru || session->is_server) ?
"server_tx_fifo" : "server_rx_fifo");
-
- is_nonblocking = session->is_nonblocking;
- clib_spinlock_unlock (&vcm->sessions_lockp);
-
do
{
- rv = svm_fifo_enqueue_nowait (tx_fifo, n, buf);
+ n_write = svm_fifo_enqueue_nowait (tx_fifo, n, buf);
}
- while (!is_nonblocking && (rv <= 0));
+ while (!session->is_nonblocking && (n_write <= 0));
/* If event wasn't set, add one */
- if (!session->is_cut_thru && (rv > 0) && svm_fifo_set_event (tx_fifo))
+ if (!session->is_cut_thru && (n_write > 0) && svm_fifo_set_event (tx_fifo))
{
int rval;
evt.event_type = FIFO_EVENT_APP_TX;
evt.event_id = vcm->tx_event_id++;
- clib_spinlock_lock (&vcm->sessions_lockp);
rval = vppcom_session_at_index (session_index, &session);
if (PREDICT_FALSE (rval))
{
clib_spinlock_unlock (&vcm->sessions_lockp);
if (VPPCOM_DEBUG > 1)
- clib_warning ("[%d] invalid session, sid (%d) has been closed!",
+ clib_warning ("[%d] invalid session, sid (%u) has been closed!",
vcm->my_pid, session_index);
return rval;
}
q = session->vpp_event_queue;
- clib_spinlock_unlock (&vcm->sessions_lockp);
ASSERT (q);
unix_shared_memory_queue_add (q, (u8 *) & evt,
0 /* do wait for mutex */ );
}
+ if (n_write <= 0)
+ session->vep.et_mask |= EPOLLOUT;
+
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+
if (VPPCOM_DEBUG > 2)
clib_warning ("[%d] sid %d, wrote %d bytes to %s (%p)", vcm->my_pid,
- session_index, rv, fifo_str, tx_fifo);
-
- return rv;
+ session_index, n_write, fifo_str, tx_fifo);
+ return n_write;
}
static inline int
vppcom_main_t *vcm = &vppcom_main;
svm_fifo_t *tx_fifo;
char *fifo_str;
- int rv;
+ int ready;
/* Assumes caller has acquired spinlock: vcm->sessions_lockp */
if (session->state == STATE_DISCONNECT)
{
if (VPPCOM_DEBUG > 0)
- clib_warning ("[%d] sid (%d) has been closed by remote peer!",
+ clib_warning ("[%d] sid (%u) has been closed by remote peer!",
vcm->my_pid, session_index);
return VPPCOM_ECONNRESET;
}
fifo_str = ((!session->is_cut_thru || session->is_server) ?
"server_tx_fifo" : "server_rx_fifo");
- rv = svm_fifo_max_enqueue (tx_fifo);
+ ready = svm_fifo_max_enqueue (tx_fifo);
if (VPPCOM_DEBUG > 3)
clib_warning ("[%d] sid %d, peek %s (%p), ready = %d", vcm->my_pid,
- session_index, fifo_str, tx_fifo, rv);
- return rv;
+ session_index, fifo_str, tx_fifo, ready);
+ if (ready == 0)
+ session->vep.et_mask |= EPOLLOUT;
+
+ return ready;
}
int
return (bits_set);
}
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
+static inline void
+vep_verify_epoll_chain (u32 vep_idx)
+{
+ session_t *session;
+ vppcom_epoll_t *vep;
+ int rv;
+ u32 sid;
+
+ if (VPPCOM_DEBUG < 1)
+ return;
+
+ /* Assumes caller has acquired spinlock: vcm->sessions_lockp */
+ rv = vppcom_session_at_index (vep_idx, &session);
+ if (PREDICT_FALSE (rv))
+ {
+ clib_warning ("ERROR: Invalid vep_idx (%u)!", vep_idx);
+ goto done;
+ }
+ if (PREDICT_FALSE (!session->is_vep))
+ {
+ clib_warning ("ERROR: vep_idx (%u) is not a vep!", vep_idx);
+ goto done;
+ }
+ if (VPPCOM_DEBUG > 1)
+ clib_warning ("vep_idx (%u): Dumping epoll chain\n"
+ "{\n"
+ " is_vep = %u\n"
+ " is_vep_session = %u\n"
+ " wait_cont_idx = 0x%x (%u)\n"
+ "}\n",
+ vep_idx, session->is_vep, session->is_vep_session,
+ session->wait_cont_idx, session->wait_cont_idx);
+ do
+ {
+ vep = &session->vep;
+ if (session->is_vep_session)
+ {
+ if (VPPCOM_DEBUG > 1)
+ clib_warning ("vep_idx[%u]: sid 0x%x (%u)\n"
+ "{\n"
+ " next_sid = 0x%x (%u)\n"
+ " prev_sid = 0x%x (%u)\n"
+ " vep_idx = 0x%x (%u)\n"
+ " ev.events = 0x%x\n"
+ " ev.data.u64 = 0x%llx\n"
+ " et_mask = 0x%x\n"
+ "}\n",
+ vep_idx, sid, sid,
+ vep->next_sid, vep->next_sid,
+ vep->prev_sid, vep->prev_sid,
+ vep->vep_idx, vep->vep_idx,
+ vep->ev.events, vep->ev.data.u64, vep->et_mask);
+ }
+ sid = vep->next_sid;
+ if (sid != ~0)
+ {
+ rv = vppcom_session_at_index (sid, &session);
+ if (PREDICT_FALSE (rv))
+ {
+ clib_warning ("ERROR: Invalid sid (%u)!", sid);
+ goto done;
+ }
+ if (PREDICT_FALSE (session->is_vep))
+ clib_warning ("ERROR: sid (%u) is a vep!", vep_idx);
+ else if (PREDICT_FALSE (!session->is_vep_session))
+ {
+ clib_warning ("ERROR: session (%u) is not a vep session!", sid);
+ goto done;
+ }
+ if (PREDICT_FALSE (session->vep.vep_idx != vep_idx))
+ clib_warning ("ERROR: session (%u) vep_idx (%u) != "
+ "vep_idx (%u)!",
+ sid, session->vep.vep_idx, vep_idx);
+ }
+ }
+ while (sid != ~0);
+
+done:
+ if (VPPCOM_DEBUG > 1)
+ clib_warning ("vep_idx (%u): Dump complete!", vep_idx);
+}
+
+int
+vppcom_epoll_create (void)
+{
+ vppcom_main_t *vcm = &vppcom_main;
+ session_t *vep_session;
+ u32 vep_idx;
+
+ clib_spinlock_lock (&vcm->sessions_lockp);
+ pool_get (vcm->sessions, vep_session);
+ memset (vep_session, 0, sizeof (*vep_session));
+ vep_idx = vep_session - vcm->sessions;
+
+ vep_session->is_vep = 1;
+ vep_session->vep.vep_idx = ~0;
+ vep_session->vep.next_sid = ~0;
+ vep_session->vep.prev_sid = ~0;
+ vep_session->wait_cont_idx = ~0;
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("Created vep_idx %u!", vep_idx);
+
+ return (vep_idx);
+}
+
+int
+vppcom_epoll_ctl (uint32_t vep_idx, int op, uint32_t session_index,
+ struct epoll_event *event)
+{
+ vppcom_main_t *vcm = &vppcom_main;
+ session_t *vep_session;
+ session_t *session;
+ int rv;
+
+ if (vep_idx == session_index)
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("ERROR: vep_idx == session_index (%u)!", vep_idx);
+ return VPPCOM_EINVAL;
+ }
+
+ clib_spinlock_lock (&vcm->sessions_lockp);
+ rv = vppcom_session_at_index (vep_idx, &vep_session);
+ if (PREDICT_FALSE (rv))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("ERROR: Invalid vep_idx (%u)!", vep_idx);
+ goto done;
+ }
+ if (PREDICT_FALSE (!vep_session->is_vep))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("ERROR: vep_idx (%u) is not a vep!", vep_idx);
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+
+ ASSERT (vep_session->vep.vep_idx == ~0);
+ ASSERT (vep_session->vep.prev_sid == ~0);
+
+ rv = vppcom_session_at_index (session_index, &session);
+ if (PREDICT_FALSE (rv))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("ERROR: Invalid session_index (%u)!", session_index);
+ goto done;
+ }
+ if (PREDICT_FALSE (session->is_vep))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("ERROR: session_index (%u) is a vep!", vep_idx);
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+
+ switch (op)
+ {
+ case EPOLL_CTL_ADD:
+ if (PREDICT_FALSE (!event))
+ {
+ clib_warning ("NULL pointer to epoll_event structure!");
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+ if (vep_session->vep.next_sid != ~0)
+ {
+ session_t *next_session;
+ rv = vppcom_session_at_index (vep_session->vep.next_sid,
+ &next_session);
+ if (PREDICT_FALSE (rv))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("EPOLL_CTL_ADD: Invalid vep.next_sid (%u) on"
+ " vep_idx (%u)!", vep_session->vep.next_sid,
+ vep_idx);
+ goto done;
+ }
+ ASSERT (next_session->vep.prev_sid == vep_idx);
+ next_session->vep.prev_sid = session_index;
+ }
+ session->vep.next_sid = vep_session->vep.next_sid;
+ session->vep.prev_sid = vep_idx;
+ session->vep.vep_idx = vep_idx;
+ session->vep.et_mask = VEP_DEFAULT_ET_MASK;
+ session->vep.ev = *event;
+ session->is_vep_session = 1;
+ vep_session->vep.next_sid = session_index;
+ if (VPPCOM_DEBUG > 1)
+ clib_warning ("EPOLL_CTL_ADD: vep_idx %u, sid %u, events 0x%x,"
+ " data 0x%llx!", vep_idx, session_index,
+ event->events, event->data.u64);
+ break;
+
+ case EPOLL_CTL_MOD:
+ if (PREDICT_FALSE (!event))
+ {
+ clib_warning ("NULL pointer to epoll_event structure!");
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+ if (PREDICT_FALSE (!session->is_vep_session &&
+ (session->vep.vep_idx != vep_idx)))
+ {
+ if (VPPCOM_DEBUG > 0)
+ {
+ if (!session->is_vep_session)
+ clib_warning ("EPOLL_CTL_MOD: session (%u) is not "
+ "a vep session!", session_index);
+ else
+ clib_warning ("EPOLL_CTL_MOD: session (%u) vep_idx (%u) != "
+ "vep_idx (%u)!", session_index,
+ session->vep.vep_idx, vep_idx);
+ }
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+ session->vep.et_mask = VEP_DEFAULT_ET_MASK;
+ session->vep.ev = *event;
+ if (VPPCOM_DEBUG > 1)
+ clib_warning ("EPOLL_CTL_MOD: vep_idx %u, sid %u, events 0x%x,"
+ " data 0x%llx!", vep_idx, session_index,
+ event->events, event->data.u64);
+ break;
+
+ case EPOLL_CTL_DEL:
+ if (PREDICT_FALSE (!session->is_vep_session &&
+ (session->vep.vep_idx != vep_idx)))
+ {
+ if (VPPCOM_DEBUG > 0)
+ {
+ if (!session->is_vep_session)
+ clib_warning ("EPOLL_CTL_DEL: session (%u) is not "
+ "a vep session!", session_index);
+ else
+ clib_warning ("EPOLL_CTL_DEL: session (%u) vep_idx (%u) != "
+ "vep_idx (%u)!", session_index,
+ session->vep.vep_idx, vep_idx);
+ }
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+
+ vep_session->wait_cont_idx =
+ (vep_session->wait_cont_idx == session_index) ?
+ session->vep.next_sid : vep_session->wait_cont_idx;
+
+ if (session->vep.prev_sid == vep_idx)
+ vep_session->vep.next_sid = session->vep.next_sid;
+ else
+ {
+ session_t *prev_session;
+ rv = vppcom_session_at_index (session->vep.prev_sid, &prev_session);
+ if (PREDICT_FALSE (rv))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("EPOLL_CTL_DEL: Invalid vep.prev_sid (%u) on"
+ " sid (%u)!", session->vep.prev_sid,
+ session_index);
+ goto done;
+ }
+ ASSERT (prev_session->vep.next_sid == session_index);
+ prev_session->vep.next_sid = session->vep.next_sid;
+ }
+ if (session->vep.next_sid != ~0)
+ {
+ session_t *next_session;
+ rv = vppcom_session_at_index (session->vep.next_sid, &next_session);
+ if (PREDICT_FALSE (rv))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("EPOLL_CTL_DEL: Invalid vep.next_sid (%u) on"
+ " sid (%u)!", session->vep.next_sid,
+ session_index);
+ goto done;
+ }
+ ASSERT (next_session->vep.prev_sid == session_index);
+ next_session->vep.prev_sid = session->vep.prev_sid;
+ }
+
+ memset (&session->vep, 0, sizeof (session->vep));
+ session->vep.next_sid = ~0;
+ session->vep.prev_sid = ~0;
+ session->vep.vep_idx = ~0;
+ session->is_vep_session = 0;
+ if (VPPCOM_DEBUG > 1)
+ clib_warning ("EPOLL_CTL_DEL: vep_idx %u, sid %u!", vep_idx,
+ session_index);
+ break;
+
+ default:
+ clib_warning ("Invalid operation (%d)!", op);
+ rv = VPPCOM_EINVAL;
+ }
+
+ vep_verify_epoll_chain (vep_idx);
+
+done:
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ return rv;
+}
+
+#define VCL_LOCK_AND_GET_SESSION(I, S) \
+do { \
+ vppcom_main_t *vcm = &vppcom_main; \
+ \
+ clib_spinlock_lock (&vcm->sessions_lockp); \
+ rv = vppcom_session_at_index (I, S); \
+ if (PREDICT_FALSE (rv)) \
+ { \
+ clib_spinlock_unlock (&vcm->sessions_lockp); \
+ \
+ if (VPPCOM_DEBUG > 0) \
+ clib_warning ("ERROR: Invalid ##I (%u)!", I); \
+ \
+ goto done; \
+ } \
+} while (0)
+
+int
+vppcom_epoll_wait (uint32_t vep_idx, struct epoll_event *events,
+ int maxevents, double wait_for_time)
+{
+ vppcom_main_t *vcm = &vppcom_main;
+ session_t *vep_session;
+ int rv;
+ f64 timeout = clib_time_now (&vcm->clib_time) + wait_for_time;
+ int num_ev = 0;
+ u32 vep_next_sid, wait_cont_idx;
+ u8 is_vep;
+
+ if (PREDICT_FALSE (maxevents <= 0))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("ERROR: Invalid maxevents (%d)!", maxevents);
+ return VPPCOM_EINVAL;
+ }
+ if (PREDICT_FALSE (wait_for_time < 0))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("ERROR: Invalid wait_for_time (%f)!", wait_for_time);
+ return VPPCOM_EINVAL;
+ }
+ memset (events, 0, sizeof (*events) * maxevents);
+
+ VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session);
+ vep_next_sid = vep_session->vep.next_sid;
+ is_vep = vep_session->is_vep;
+ wait_cont_idx = vep_session->wait_cont_idx;
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+
+ if (PREDICT_FALSE (!is_vep))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("ERROR: vep_idx (%u) is not a vep!", vep_idx);
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+ if ((VPPCOM_DEBUG > 0) && (PREDICT_FALSE (vep_next_sid == ~0)))
+ {
+ clib_warning ("WARNING: vep_idx (%u) is empty!", vep_idx);
+ goto done;
+ }
+
+ do
+ {
+ u32 sid;
+ u32 next_sid = ~0;
+ session_t *session;
+
+ for (sid = (wait_cont_idx == ~0) ? vep_next_sid : wait_cont_idx;
+ sid != ~0; sid = next_sid)
+ {
+ u32 session_events, et_mask, clear_et_mask, session_vep_idx;
+ u8 add_event, is_vep_session;
+ int ready;
+ u64 session_ev_data;
+
+ VCL_LOCK_AND_GET_SESSION (sid, &session);
+ next_sid = session->vep.next_sid;
+ session_events = session->vep.ev.events;
+ et_mask = session->vep.et_mask;
+ is_vep = session->is_vep;
+ is_vep_session = session->is_vep_session;
+ session_vep_idx = session->vep.vep_idx;
+ session_ev_data = session->vep.ev.data.u64;
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+
+ if (PREDICT_FALSE (is_vep))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("ERROR: sid (%u) is a vep!", vep_idx);
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+ if (PREDICT_FALSE (!is_vep_session))
+ {
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("EPOLL_CTL_MOD: session (%u) is not "
+ "a vep session!", sid);
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+ if (PREDICT_FALSE (session_vep_idx != vep_idx))
+ {
+ clib_warning ("EPOLL_CTL_MOD: session (%u) "
+ "vep_idx (%u) != vep_idx (%u)!",
+ sid, session->vep.vep_idx, vep_idx);
+ rv = VPPCOM_EINVAL;
+ goto done;
+ }
+
+ add_event = clear_et_mask = 0;
+
+ if ((EPOLLIN & session_events) && (EPOLLIN & et_mask))
+ {
+ VCL_LOCK_AND_GET_SESSION (sid, &session);
+ ready = vppcom_session_read_ready (session, sid);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ if (ready > 0)
+ {
+ add_event = 1;
+ events[num_ev].events |= EPOLLIN;
+ if (EPOLLET & session_events)
+ clear_et_mask |= EPOLLIN;
+ }
+ else if (ready < 0)
+ {
+ add_event = 1;
+ switch (ready)
+ {
+ case VPPCOM_ECONNRESET:
+ events[num_ev].events |= EPOLLHUP | EPOLLRDHUP;
+ break;
+
+ default:
+ events[num_ev].events |= EPOLLERR;
+ break;
+ }
+ }
+ }
+
+ if ((EPOLLOUT & session_events) && (EPOLLOUT & et_mask))
+ {
+ VCL_LOCK_AND_GET_SESSION (sid, &session);
+ ready = vppcom_session_write_ready (session, sid);
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ if (ready > 0)
+ {
+ add_event = 1;
+ events[num_ev].events |= EPOLLOUT;
+ if (EPOLLET & session_events)
+ clear_et_mask |= EPOLLOUT;
+ }
+ else if (ready < 0)
+ {
+ add_event = 1;
+ switch (ready)
+ {
+ case VPPCOM_ECONNRESET:
+ events[num_ev].events |= EPOLLHUP;
+ break;
+
+ default:
+ events[num_ev].events |= EPOLLERR;
+ break;
+ }
+ }
+ }
+
+ if (add_event)
+ {
+ events[num_ev].data.u64 = session_ev_data;
+ if (EPOLLONESHOT & session_events)
+ {
+ VCL_LOCK_AND_GET_SESSION (sid, &session);
+ session->vep.ev.events = 0;
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ }
+ num_ev++;
+ if (num_ev == maxevents)
+ {
+ VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session);
+ vep_session->wait_cont_idx = next_sid;
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ goto done;
+ }
+ }
+ if (wait_cont_idx != ~0)
+ {
+ if (next_sid == ~0)
+ next_sid = vep_next_sid;
+ else if (next_sid == wait_cont_idx)
+ next_sid = ~0;
+ }
+ }
+ }
+ while ((num_ev == 0) && (clib_time_now (&vcm->clib_time) <= timeout));
+
+ if (wait_cont_idx != ~0)
+ {
+ VCL_LOCK_AND_GET_SESSION (vep_idx, &vep_session);
+ vep_session->wait_cont_idx = ~0;
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ }
+done:
+ return (rv != VPPCOM_OK) ? rv : num_ev;
+}
+
+int
+vppcom_session_attr (uint32_t session_index, uint32_t op,
+ void *buffer, uint32_t * buflen)
+{
+ vppcom_main_t *vcm = &vppcom_main;
+ session_t *session;
+ int rv = VPPCOM_OK;
+ u32 *flags = buffer;
+ vppcom_ip46_t *vcl_addr = buffer;
+
+ VCL_LOCK_AND_GET_SESSION (session_index, &session);
+ switch (op)
+ {
+ case VPPCOM_ATTR_GET_NREAD:
+ rv = vppcom_session_read_ready (session, session_index);
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VPPCOM_ATTR_GET_NREAD: nread = %d", rv);
+
+ break;
+
+ case VPPCOM_ATTR_PEEK_NREAD:
+ /* TBD */
+ break;
+
+ case VPPCOM_ATTR_GET_FLAGS:
+ if (buffer && buflen && (*buflen >= sizeof (*flags)))
+ {
+ *flags = O_RDWR | ((session->is_nonblocking) ? O_NONBLOCK : 0);
+ *buflen = sizeof (*flags);
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VPPCOM_ATTR_GET_FLAGS: flags = 0x%08x, "
+ "is_nonblocking = %u", *flags,
+ session->is_nonblocking);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_SET_FLAGS:
+ if (buffer && buflen && (*buflen >= sizeof (*flags)))
+ {
+ session->is_nonblocking = (*flags & O_NONBLOCK) ? 1 : 0;
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VPPCOM_ATTR_SET_FLAGS: flags = 0x%08x, "
+ "is_nonblocking = %u", *flags,
+ session->is_nonblocking);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_PEER_ADDR:
+ if (buffer && buflen && (*buflen >= sizeof (*vcl_addr)))
+ {
+ *vcl_addr = session->peer_addr;
+ *buflen = sizeof (*vcl_addr);
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VPPCOM_ATTR_GET_PEER_ADDR: is_ip4 = %u, "
+ "addr = %U", vcl_addr->is_ip4, format_ip46_address,
+ &vcl_addr->ip46, vcl_addr->is_ip4);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+
+ case VPPCOM_ATTR_GET_LCL_ADDR:
+ if (buffer && buflen && (*buflen >= sizeof (*vcl_addr)))
+ {
+ *vcl_addr = session->lcl_addr;
+ *buflen = sizeof (*vcl_addr);
+ if (VPPCOM_DEBUG > 0)
+ clib_warning ("VPPCOM_ATTR_GET_LCL_ADDR: is_ip4 = %u, "
+ "addr = %U", vcl_addr->is_ip4, format_ip46_address,
+ &vcl_addr->ip46, vcl_addr->is_ip4);
+ }
+ else
+ rv = VPPCOM_EINVAL;
+ break;
+ }
+
+done:
+ clib_spinlock_unlock (&vcm->sessions_lockp);
+ return rv;
+}
+
+ /*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */