_(EVENT_FIFO_FULL, "Events not sent for lack of event fifo space") \
_(API_QUEUE_FULL, "Sessions not created for lack of API queue space") \
_(NEW_SEG_NO_SPACE, "Created segment, couldn't allocate a fifo pair") \
-_(NO_SPACE, "Couldn't allocate a fifo pair")
+_(NO_SPACE, "Couldn't allocate a fifo pair") \
+_(SEG_CREATE, "Couldn't create a new segment")
typedef enum
{
void *arg;
} rpc_args_t;
+typedef u64 session_handle_t;
+
/* *INDENT-OFF* */
typedef CLIB_PACKED (struct {
union
{
svm_fifo_t * fifo;
- u64 session_handle;
+ session_handle_t session_handle;
rpc_args_t rpc_args;
};
u8 event_type;
/** Per worker thread session pools */
stream_session_t **sessions;
- /** Per worker-thread count of threads peeking into the session pool */
- u32 *session_peekers;
-
- /** Per worker-thread rw peekers locks */
- clib_spinlock_t *peekers_readers_locks;
- clib_spinlock_t *peekers_write_locks;
+ /** Per worker-thread session pool peekers rw locks */
+ clib_rwlock_t *peekers_rw_locks;
/** Pool of listen sessions. Same type as stream sessions to ease lookups */
stream_session_t **listen_sessions;
/** Session ssvm segment configs*/
uword session_baseva;
- u32 segment_timeout;
+ uword session_va_space_size;
u32 evt_qs_segment_size;
u8 evt_qs_use_memfd_seg;
return pool_elt_at_index (session_manager_main.sessions[thread_index], si);
}
-always_inline u64
+always_inline session_handle_t
session_handle (stream_session_t * s)
{
return ((u64) s->thread_index << 32) | (u64) s->session_index;
}
always_inline u32
-session_index_from_handle (u64 handle)
+session_index_from_handle (session_handle_t handle)
{
return handle & 0xFFFFFFFF;
}
always_inline u32
-session_thread_from_handle (u64 handle)
+session_thread_from_handle (session_handle_t handle)
{
return handle >> 32;
}
always_inline void
-session_parse_handle (u64 handle, u32 * index, u32 * thread_index)
+session_parse_handle (session_handle_t handle, u32 * index,
+ u32 * thread_index)
{
*index = session_index_from_handle (handle);
*thread_index = session_thread_from_handle (handle);
}
always_inline stream_session_t *
-session_get_from_handle (u64 handle)
+session_get_from_handle (session_handle_t handle)
{
session_manager_main_t *smm = &session_manager_main;
- return
- pool_elt_at_index (smm->sessions[session_thread_from_handle (handle)],
- session_index_from_handle (handle));
+ u32 session_index, thread_index;
+ session_parse_handle (handle, &session_index, &thread_index);
+ return pool_elt_at_index (smm->sessions[thread_index], session_index);
+}
+
+always_inline stream_session_t *
+session_get_from_handle_if_valid (session_handle_t handle)
+{
+ u32 session_index, thread_index;
+ session_parse_handle (handle, &session_index, &thread_index);
+ return session_get_if_valid (session_index, thread_index);
+}
+
+always_inline u8
+session_handle_is_local (session_handle_t handle)
+{
+ if ((handle >> 32) == SESSION_LOCAL_TABLE_PREFIX)
+ return 1;
+ return 0;
+}
+
+always_inline transport_proto_t
+session_type_transport_proto (session_type_t st)
+{
+ return (st >> 1);
}
always_inline transport_proto_t
return (s->session_type >> 1);
}
+always_inline fib_protocol_t
+session_get_fib_proto (stream_session_t * s)
+{
+ u8 is_ip4 = s->session_type & 1;
+ return (is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
+}
+
always_inline session_type_t
session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4)
{
return (proto << 1 | is_ip4);
}
+always_inline u8
+session_has_transport (stream_session_t * s)
+{
+ return (session_get_transport_proto (s) != TRANSPORT_PROTO_NONE);
+}
+
/**
* Acquires a lock that blocks a session pool from expanding.
*
session_manager_main_t *smm = &session_manager_main;
if (thread_index == vlib_get_thread_index ())
return;
- clib_spinlock_lock_if_init (&smm->peekers_readers_locks[thread_index]);
- smm->session_peekers[thread_index] += 1;
- if (smm->session_peekers[thread_index] == 1)
- clib_spinlock_lock_if_init (&smm->peekers_write_locks[thread_index]);
- clib_spinlock_unlock_if_init (&smm->peekers_readers_locks[thread_index]);
+ clib_rwlock_reader_lock (&smm->peekers_rw_locks[thread_index]);
}
always_inline void
session_manager_main_t *smm = &session_manager_main;
if (thread_index == vlib_get_thread_index ())
return;
- ASSERT (session_manager_main.session_peekers[thread_index] > 0);
- clib_spinlock_lock_if_init (&smm->peekers_readers_locks[thread_index]);
- smm->session_peekers[thread_index] -= 1;
- if (smm->session_peekers[thread_index] == 0)
- clib_spinlock_unlock_if_init (&smm->peekers_write_locks[thread_index]);
- clib_spinlock_unlock_if_init (&smm->peekers_readers_locks[thread_index]);
+ clib_rwlock_reader_unlock (&smm->peekers_rw_locks[thread_index]);
}
/**
int stream_session_listen (stream_session_t * s, session_endpoint_t * tep);
int stream_session_stop_listen (stream_session_t * s);
void stream_session_disconnect (stream_session_t * s);
+void stream_session_disconnect_transport (stream_session_t * s);
void stream_session_cleanup (stream_session_t * s);
void session_send_session_evt_to_thread (u64 session_handle,
fifo_event_type_t evt_type,
}
always_inline stream_session_t *
-listen_session_get_from_handle (u64 handle)
+listen_session_get_from_handle (session_handle_t handle)
{
session_manager_main_t *smm = &session_manager_main;
stream_session_t *s;