ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session: move fifo allocation logic to app worker

Browse Source 
Change-Id: I1662ec4b5503cb64a8a86a2441842311d959b3a6
Signed-off-by: Florin Coras <fcoras@cisco.com>
This commit is contained in:
Florin Coras
2019-02-18 13:02:28 -08:00
parent 25cfb775e3
commit a27a46eaeb
9 changed files with 160 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/unittest/tcp_test.c
+1 -1
View File
@@ -1789,7 +1789,7 @@ tcp_test_session (vlib_main_t * vm, unformat_input_t * input)
0 /* notify */ ))
clib_warning ("stream_session_accept failed");
stream_session_accept_notify (&tc0->connection);
session_stream_accept_notify (&tc0->connection);
}
else
{
src/vnet/sctp/sctp_input.c
+2 -2
View File
@@ -909,7 +909,7 @@ sctp_handle_cookie_echo (sctp_header_t * sctp_hdr,
sctp_timer_set (sctp_conn, idx, SCTP_TIMER_T4_HEARTBEAT,
sctp_conn->sub_conn[idx].RTO);
stream_session_accept_notify (&sctp_conn->sub_conn[idx].connection);
session_stream_accept_notify (&sctp_conn->sub_conn[idx].connection);
return SCTP_ERROR_NONE;
@@ -940,7 +940,7 @@ sctp_handle_cookie_ack (sctp_header_t * sctp_hdr,
sctp_timer_set (sctp_conn, idx, SCTP_TIMER_T4_HEARTBEAT,
sctp_conn->sub_conn[idx].RTO);
stream_session_accept_notify (&sctp_conn->sub_conn[idx].connection);
session_stream_accept_notify (&sctp_conn->sub_conn[idx].connection);
return SCTP_ERROR_NONE;
src/vnet/session/application.c
+5 -1
View File
@@ -191,9 +191,11 @@ app_listener_alloc_and_init (application_t * app,
session_handle_t lh;
session_type_t st;
session_t *ls = 0;
u32 al_index;
int rv;
app_listener = app_listener_alloc (app);
al_index = app_listener->al_index;
st = session_type_from_proto_and_ip (sep->transport_proto, sep->is_ip4);
/*
@@ -239,8 +241,10 @@ app_listener_alloc_and_init (application_t * app,
session_free (ls);
return rv;
}
ls = session_get_from_handle (lh);
app_listener = app_listener_get (app, al_index);
app_listener->session_index = ls->session_index;
ls->al_index = app_listener->al_index;
ls->al_index = al_index;
}
if (!ll && !ls)
src/vnet/session/application.h
+5
View File
@@ -237,6 +237,11 @@ int app_worker_connect_session (app_worker_t * app, session_endpoint_t * tep,
u32 api_context);
int app_worker_start_listen (app_worker_t * app_wrk, app_listener_t * lstnr);
int app_worker_stop_listen (app_worker_t * app_wrk, app_listener_t * al);
int app_worker_init_accepted (session_t * s);
int app_worker_accept_notify (app_worker_t * app_wrk, session_t * s);
int app_worker_init_connected (app_worker_t * app_wrk, session_t * s);
int app_worker_connect_notify (app_worker_t * app_wrk, session_t * s,
u32 opaque);
segment_manager_t *app_worker_get_listen_segment_manager (app_worker_t *,
session_t *);
segment_manager_t *app_worker_get_connect_segment_manager (app_worker_t *);
src/vnet/session/application_worker.c
+70 -2
View File
@@ -255,6 +255,29 @@ app_worker_alloc_segment_manager (app_worker_t * app_wrk)
return sm;
}
static int
app_worker_alloc_session_fifos (segment_manager_t * sm, session_t * s)
{
svm_fifo_t *rx_fifo = 0, *tx_fifo = 0;
u32 fifo_segment_index;
int rv;
if ((rv = segment_manager_alloc_session_fifos (sm, &rx_fifo, &tx_fifo,
&fifo_segment_index)))
return rv;
rx_fifo->master_session_index = s->session_index;
rx_fifo->master_thread_index = s->thread_index;
tx_fifo->master_session_index = s->session_index;
tx_fifo->master_thread_index = s->thread_index;
s->rx_fifo = rx_fifo;
s->tx_fifo = tx_fifo;
s->svm_segment_index = fifo_segment_index;
return 0;
}
int
app_worker_start_listen (app_worker_t * app_wrk,
app_listener_t * app_listener)
@@ -284,7 +307,7 @@ app_worker_start_listen (app_worker_t * app_wrk,
if (session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
{
if (!ls->rx_fifo && session_alloc_fifos (sm, ls))
if (!ls->rx_fifo && app_worker_alloc_session_fifos (sm, ls))
return -1;
}
return 0;
@@ -351,6 +374,51 @@ app_worker_stop_listen (app_worker_t * app_wrk, app_listener_t * al)
return 0;
}
int
app_worker_init_accepted (session_t * s)
{
app_worker_t *app_wrk;
segment_manager_t *sm;
session_t *listener;
listener = listen_session_get (s->listener_index);
app_wrk = application_listener_select_worker (listener);
s->app_wrk_index = app_wrk->wrk_index;
sm = app_worker_get_listen_segment_manager (app_wrk, listener);
return app_worker_alloc_session_fifos (sm, s);
}
int
app_worker_accept_notify (app_worker_t * app_wrk, session_t * s)
{
application_t *app = application_get (app_wrk->app_index);
return app->cb_fns.session_accept_callback (s);
}
int
app_worker_init_connected (app_worker_t * app_wrk, session_t * s)
{
application_t *app = application_get (app_wrk->app_index);
segment_manager_t *sm;
/* Allocate fifos for session, unless the app is a builtin proxy */
if (!application_is_builtin_proxy (app))
{
sm = app_worker_get_connect_segment_manager (app_wrk);
if (app_worker_alloc_session_fifos (sm, s))
return -1;
}
return 0;
}
int
app_worker_connect_notify (app_worker_t * app_wrk, session_t * s, u32 opaque)
{
application_t *app = application_get (app_wrk->app_index);
return app->cb_fns.session_connected_callback (app_wrk->wrk_index, opaque,
s, s == 0 /* is_fail */ );
}
int
app_worker_own_session (app_worker_t * app_wrk, session_t * s)
{
@@ -372,7 +440,7 @@ app_worker_own_session (app_worker_t * app_wrk, session_t * s)
s->tx_fifo = 0;
sm = app_worker_get_or_alloc_connect_segment_manager (app_wrk);
if (session_alloc_fifos (sm, s))
if (app_worker_alloc_session_fifos (sm, s))
return -1;
if (!svm_fifo_is_empty (rxf))
src/vnet/session/session.c
+59 -137
View File
@@ -195,30 +195,6 @@ session_delete (session_t * s)
session_free_w_fifos (s);
}
int
session_alloc_fifos (segment_manager_t * sm, session_t * s)
{
svm_fifo_t *server_rx_fifo = 0, *server_tx_fifo = 0;
u32 fifo_segment_index;
int rv;
if ((rv = segment_manager_alloc_session_fifos (sm, &server_rx_fifo,
&server_tx_fifo,
&fifo_segment_index)))
return rv;
/* Initialize backpointers */
server_rx_fifo->master_session_index = s->session_index;
server_rx_fifo->master_thread_index = s->thread_index;
server_tx_fifo->master_session_index = s->session_index;
server_tx_fifo->master_thread_index = s->thread_index;
s->rx_fifo = server_rx_fifo;
s->tx_fifo = server_tx_fifo;
s->svm_segment_index = fifo_segment_index;
return 0;
}
static session_t *
session_alloc_for_connection (transport_connection_t * tc)
{
@@ -239,28 +215,6 @@ session_alloc_for_connection (transport_connection_t * tc)
return s;
}
static int
session_alloc_and_init (segment_manager_t * sm, transport_connection_t * tc,
u8 alloc_fifos, session_t ** ret_s)
{
session_t *s;
int rv;
s = session_alloc_for_connection (tc);
if (alloc_fifos && (rv = session_alloc_fifos (sm, s)))
{
session_free (s);
*ret_s = 0;
return rv;
}
/* Add to the main lookup table */
session_lookup_add_connection (tc, session_handle (s));
*ret_s = s;
return 0;
}
/**
* Discards bytes from buffer chain
*
@@ -664,19 +618,15 @@ int
session_stream_connect_notify (transport_connection_t * tc, u8 is_fail)
{
u32 opaque = 0, new_ti, new_si;
session_t *new_s = 0;
segment_manager_t *sm;
app_worker_t *app_wrk;
application_t *app;
u8 alloc_fifos;
int error = 0;
u64 handle;
session_t *s = 0;
u64 ho_handle;
/*
* Find connection handle and cleanup half-open table
*/
handle = session_lookup_half_open_handle (tc);
if (handle == HALF_OPEN_LOOKUP_INVALID_VALUE)
ho_handle = session_lookup_half_open_handle (tc);
if (ho_handle == HALF_OPEN_LOOKUP_INVALID_VALUE)
{
SESSION_DBG ("half-open was removed!");
return -1;
@@ -686,56 +636,40 @@ session_stream_connect_notify (transport_connection_t * tc, u8 is_fail)
/* Get the app's index from the handle we stored when opening connection
* and the opaque (api_context for external apps) from transport session
* index */
app_wrk = app_worker_get_if_valid (handle >> 32);
app_wrk = app_worker_get_if_valid (ho_handle >> 32);
if (!app_wrk)
return -1;
opaque = tc->s_index;
app = application_get (app_wrk->app_index);
/*
* Allocate new session with fifos (svm segments are allocated if needed)
*/
if (!is_fail)
if (is_fail)
return app_worker_connect_notify (app_wrk, s, opaque);
s = session_alloc_for_connection (tc);
s->session_state = SESSION_STATE_CONNECTING;
s->app_wrk_index = app_wrk->wrk_index;
new_si = s->session_index;
new_ti = s->thread_index;
if (app_worker_init_connected (app_wrk, s))
{
sm = app_worker_get_connect_segment_manager (app_wrk);
alloc_fifos = !application_is_builtin_proxy (app);
if (session_alloc_and_init (sm, tc, alloc_fifos, &new_s))
{
is_fail = 1;
error = -1;
}
else
{
new_s->session_state = SESSION_STATE_CONNECTING;
new_s->app_wrk_index = app_wrk->wrk_index;
new_si = new_s->session_index;
new_ti = new_s->thread_index;
}
session_free (s);
app_worker_connect_notify (app_wrk, 0, opaque);
return -1;
}
/*
* Notify client application
*/
if (app->cb_fns.session_connected_callback (app_wrk->wrk_index, opaque,
new_s, is_fail))
if (app_worker_connect_notify (app_wrk, s, opaque))
{
SESSION_DBG ("failed to notify app");
if (!is_fail)
{
new_s = session_get (new_si, new_ti);
session_transport_close (new_s);
}
}
else
{
if (!is_fail)
{
new_s = session_get (new_si, new_ti);
new_s->session_state = SESSION_STATE_READY;
}
s = session_get (new_si, new_ti);
session_free_w_fifos (s);
return -1;
}
return error;
s = session_get (new_si, new_ti);
s->session_state = SESSION_STATE_READY;
session_lookup_add_connection (tc, session_handle (s));
return 0;
}
typedef struct _session_switch_pool_args
@@ -799,22 +733,6 @@ session_dgram_connect_notify (transport_connection_t * tc,
return 0;
}
int
stream_session_accept_notify (transport_connection_t * tc)
{
app_worker_t *app_wrk;
application_t *app;
session_t *s;
s = session_get (tc->s_index, tc->thread_index);
app_wrk = app_worker_get_if_valid (s->app_wrk_index);
if (!app_wrk)
return -1;
s->session_state = SESSION_STATE_ACCEPTING;
app = application_get (app_wrk->app_index);
return app->cb_fns.session_accept_callback (s);
}
/**
* Notification from transport that connection is being closed.
*
@@ -947,6 +865,20 @@ session_transport_reset_notify (transport_connection_t * tc)
app->cb_fns.session_reset_callback (s);
}
int
session_stream_accept_notify (transport_connection_t * tc)
{
app_worker_t *app_wrk;
session_t *s;
s = session_get (tc->s_index, tc->thread_index);
app_wrk = app_worker_get_if_valid (s->app_wrk_index);
if (!app_wrk)
return -1;
s->session_state = SESSION_STATE_ACCEPTING;
return app_worker_accept_notify (app_wrk, s);
}
/**
* Accept a stream session. Optionally ping the server by callback.
*/
@@ -954,28 +886,23 @@ int
session_stream_accept (transport_connection_t * tc, u32 listener_index,
u8 notify)
{
session_t *s, *listener;
app_worker_t *app_wrk;
segment_manager_t *sm;
session_t *s;
int rv;
/* Find the server */
listener = listen_session_get (listener_index);
app_wrk = application_listener_select_worker (listener);
sm = app_worker_get_listen_segment_manager (app_wrk, listener);
if ((rv = session_alloc_and_init (sm, tc, 1, &s)))
return rv;
s->app_wrk_index = app_wrk->wrk_index;
s = session_alloc_for_connection (tc);
s->listener_index = listener_index;
s->session_state = SESSION_STATE_CREATED;
if ((rv = app_worker_init_accepted (s)))
return rv;
session_lookup_add_connection (tc, session_handle (s));
/* Shoulder-tap the server */
if (notify)
{
application_t *app = application_get (app_wrk->app_index);
return app->cb_fns.session_accept_callback (s);
app_worker_t *app_wrk = app_worker_get (s->app_wrk_index);
return app_worker_accept_notify (app_wrk, s);
}
return 0;
@@ -986,10 +913,8 @@ session_open_cl (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque)
{
transport_connection_t *tc;
transport_endpoint_cfg_t *tep;
segment_manager_t *sm;
app_worker_t *app_wrk;
session_t *s;
application_t *app;
int rv;
tep = session_endpoint_to_transport_cfg (rmt);
@@ -1002,21 +927,18 @@ session_open_cl (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque)
tc = transport_get_half_open (rmt->transport_proto, (u32) rv);
/* For dgram type of service, allocate session and fifos now.
*/
/* For dgram type of service, allocate session and fifos now */
app_wrk = app_worker_get (app_wrk_index);
sm = app_worker_get_connect_segment_manager (app_wrk);
if (session_alloc_and_init (sm, tc, 1, &s))
return -1;
s = session_alloc_for_connection (tc);
s->app_wrk_index = app_wrk->wrk_index;
s->session_state = SESSION_STATE_OPENED;
if (app_worker_init_connected (app_wrk, s))
{
session_free (s);
return -1;
}
/* Tell the app about the new event fifo for this session */
app = application_get (app_wrk->app_index);
app->cb_fns.session_connected_callback (app_wrk->wrk_index, opaque, s, 0);
return 0;
return app_worker_connect_notify (app_wrk, s, opaque);
}
int
src/vnet/session/session.h
+1 -2
View File
@@ -206,7 +206,6 @@ stream_session_is_valid (u32 si, u8 thread_index)
}
session_t *session_alloc (u32 thread_index);
int session_alloc_fifos (segment_manager_t * sm, session_t * s);
void session_free (session_t * s);
void session_free_w_fifos (session_t * s);
@@ -385,7 +384,7 @@ int session_dgram_connect_notify (transport_connection_t * tc,
void stream_session_init_fifos_pointers (transport_connection_t * tc,
u32 rx_pointer, u32 tx_pointer);
int stream_session_accept_notify (transport_connection_t * tc);
int session_stream_accept_notify (transport_connection_t * tc);
void session_transport_closing_notify (transport_connection_t * tc);
void session_transport_delete_notify (transport_connection_t * tc);
void session_transport_closed_notify (transport_connection_t * tc);
src/vnet/tcp/tcp_input.c
+1 -1
View File
@@ -2763,7 +2763,7 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
/* Reset SYN-ACK retransmit and SYN_RCV establish timers */
tcp_retransmit_timer_reset (tc0);
tcp_timer_reset (tc0, TCP_TIMER_ESTABLISH);
if (stream_session_accept_notify (&tc0->connection))
if (session_stream_accept_notify (&tc0->connection))
{
error0 = TCP_ERROR_MSG_QUEUE_FULL;
tcp_connection_reset (tc0);
src/vnet/tls/tls.c
+16 -31
View File
@@ -190,51 +190,39 @@ int
tls_notify_app_accept (tls_ctx_t * ctx)
{
session_t *app_listener, *app_session;
segment_manager_t *sm;
app_worker_t *app_wrk;
application_t *app;
tls_ctx_t *lctx;
int rv;
app_wrk = app_worker_get_if_valid (ctx->parent_app_index);
if (!app_wrk)
{
tls_disconnect (ctx->tls_ctx_handle, vlib_get_thread_index ());
return -1;
}
app = application_get (app_wrk->app_index);
lctx = tls_listener_ctx_get (ctx->listener_ctx_index);
app_listener = listen_session_get_from_handle (lctx->app_session_handle);
app_session = session_get (ctx->c_s_index, ctx->c_thread_index);
app_session->app_wrk_index = ctx->parent_app_index;
app_session->connection_index = ctx->tls_ctx_handle;
app_listener = listen_session_get_from_handle (lctx->app_session_handle);
app_session->session_type = app_listener->session_type;
app_session->listener_index = app_listener->session_index;
sm = app_worker_get_listen_segment_manager (app_wrk, app_listener);
app_session->t_app_index = tls_main.app_index;
if ((rv = session_alloc_fifos (sm, app_session)))
if ((rv = app_worker_init_accepted (app_session)))
{
TLS_DBG (1, "failed to allocate fifos");
session_free (app_session);
return rv;
}
ctx->app_session_handle = session_handle (app_session);
session_lookup_add_connection (&ctx->connection,
session_handle (app_session));
return app->cb_fns.session_accept_callback (app_session);
ctx->parent_app_index = app_session->app_wrk_index;
app_wrk = app_worker_get (app_session->app_wrk_index);
return app_worker_accept_notify (app_wrk, app_session);
}
int
tls_notify_app_connected (tls_ctx_t * ctx, u8 is_failed)
{
int (*cb_fn) (u32, u32, session_t *, u8);
session_t *app_session;
segment_manager_t *sm;
app_worker_t *app_wrk;
application_t *app;
app_wrk = app_worker_get_if_valid (ctx->parent_app_index);
if (!app_wrk)
@@ -243,13 +231,9 @@ tls_notify_app_connected (tls_ctx_t * ctx, u8 is_failed)
return -1;
}
app = application_get (app_wrk->app_index);
cb_fn = app->cb_fns.session_connected_callback;
if (is_failed)
goto failed;
sm = app_worker_get_connect_segment_manager (app_wrk);
app_session = session_get (ctx->c_s_index, ctx->c_thread_index);
app_session->app_wrk_index = ctx->parent_app_index;
app_session->connection_index = ctx->tls_ctx_handle;
@@ -257,12 +241,12 @@ tls_notify_app_connected (tls_ctx_t * ctx, u8 is_failed)
session_type_from_proto_and_ip (TRANSPORT_PROTO_TLS, ctx->tcp_is_ip4);
app_session->t_app_index = tls_main.app_index;
if (session_alloc_fifos (sm, app_session))
if (app_worker_init_connected (app_wrk, app_session))
goto failed;
app_session->session_state = SESSION_STATE_CONNECTING;
if (cb_fn (ctx->parent_app_index, ctx->parent_app_api_context,
app_session, 0 /* not failed */ ))
if (app_worker_connect_notify (app_wrk, app_session,
ctx->parent_app_api_context))
{
TLS_DBG (1, "failed to notify app");
tls_disconnect (ctx->tls_ctx_handle, vlib_get_thread_index ());
@@ -278,8 +262,7 @@ tls_notify_app_connected (tls_ctx_t * ctx, u8 is_failed)
failed:
tls_disconnect (ctx->tls_ctx_handle, vlib_get_thread_index ());
return cb_fn (ctx->parent_app_index, ctx->parent_app_api_context, 0,
1 /* failed */ );
return app_worker_connect_notify (app_wrk, 0, ctx->parent_app_api_context);
}
static inline void
@@ -589,12 +572,13 @@ tls_start_listen (u32 app_listener_index, transport_endpoint_t * tep)
vnet_listen_args_t _bargs, *args = &_bargs;
app_worker_t *app_wrk;
tls_main_t *tm = &tls_main;
session_handle_t tls_handle;
session_handle_t tls_al_handle;
session_endpoint_cfg_t *sep;
session_t *tls_listener;
session_t *app_listener;
tls_engine_type_t engine_type;
application_t *app;
app_listener_t *al;
tls_ctx_t *lctx;
u32 lctx_index;
@@ -615,16 +599,17 @@ tls_start_listen (u32 app_listener_index, transport_endpoint_t * tep)
if (vnet_listen (args))
return -1;
tls_handle = args->handle;
lctx_index = tls_listener_ctx_alloc ();
tls_listener = listen_session_get_from_handle (tls_handle);
tls_al_handle = args->handle;
al = app_listener_get_w_handle (tls_al_handle);
tls_listener = app_listener_get_session (al);
tls_listener->opaque = lctx_index;
app_listener = listen_session_get (app_listener_index);
lctx = tls_listener_ctx_get (lctx_index);
lctx->parent_app_index = sep->app_wrk_index;
lctx->tls_session_handle = tls_handle;
lctx->tls_session_handle = tls_al_handle;
lctx->app_session_handle = listen_session_get_handle (app_listener);
lctx->tcp_is_ip4 = sep->is_ip4;
lctx->tls_ctx_engine = engine_type;