X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvnet%2Fsession%2Fapplication.h;h=09737a6752dbc9de0e2c35dbfc07255d09168e43;hb=da052b62bd2158944342735ae4cfdc65de268d6b;hp=9943576377d9244c0e95629804a310c684f44d4b;hpb=d1b9e706841150d0da042a05aab51f19fa804192;p=vpp.git diff --git a/src/vnet/session/application.h b/src/vnet/session/application.h index 9943576377d..09737a6752d 100644 --- a/src/vnet/session/application.h +++ b/src/vnet/session/application.h @@ -29,6 +29,16 @@ #define APP_DBG(_fmt, _args...) #endif +typedef struct app_wrk_postponed_msg_ +{ + u32 len; + u8 event_type; + u8 ring; + u8 is_sapi; + int fd; + u8 data[SESSION_CTRL_MSG_TX_MAX_SIZE]; +} app_wrk_postponed_msg_t; + typedef struct app_worker_ { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); @@ -45,24 +55,39 @@ typedef struct app_worker_ /** Application listens for events on this svm queue */ svm_msg_q_t *event_queue; - /** Segment manager used for outgoing connects issued by the app */ + /** + * Segment manager used for outgoing connects issued by the app. By + * convention this is the first segment manager allocated by the worker + * so it's also the one that holds the first segment with the app's + * message queue in it. + */ u32 connects_seg_manager; /** Lookup tables for listeners. Value is segment manager index */ uword *listeners_table; - /** - * First segment manager has in the the first segment the application's - * event fifo. Depending on what the app does, it may be either used for - * a listener or for connects. - */ - u32 first_segment_manager; - u8 first_segment_manager_in_use; - /** API index for the worker. Needed for multi-process apps */ u32 api_client_index; + /** Set if mq is congested */ + u8 mq_congested; + u8 app_is_builtin; + + /** Pool of half-open session handles. Tracked in case worker detaches */ + session_handle_t *half_open_table; + + /** Protects detached seg managers */ + clib_spinlock_t detached_seg_managers_lock; + + /** Vector of detached listener segment managers */ + u32 *detached_seg_managers; + + /** Fifo of messages postponed because of mq congestion */ + app_wrk_postponed_msg_t *postponed_mq_msgs; + + /** Lock to add/sub message from ref @postponed_mq_msgs */ + clib_spinlock_t postponed_mq_msgs_lock; } app_worker_t; typedef struct app_worker_map_ @@ -83,6 +108,22 @@ typedef struct app_listener_ the app listener */ } app_listener_t; +typedef enum app_rx_mq_flags_ +{ + APP_RX_MQ_F_PENDING = 1 << 0, + APP_RX_MQ_F_POSTPONED = 1 << 1, +} app_rx_mq_flags_t; + +typedef struct app_rx_mq_elt_ +{ + struct app_rx_mq_elt_ *next; + struct app_rx_mq_elt_ *prev; + svm_msg_q_t *mq; + uword file_index; + u32 app_index; + u8 flags; +} app_rx_mq_elt_t; + typedef struct application_ { /** App index in app pool */ @@ -118,8 +159,38 @@ typedef struct application_ char quic_iv[17]; u8 quic_iv_set; + /** Segment where rx mqs were allocated */ + fifo_segment_t rx_mqs_segment; + + /** + * Fixed vector of rx mqs that can be a part of pending_rx_mqs + * linked list maintained by the app sublayer for each worker + */ + app_rx_mq_elt_t *rx_mqs; } application_t; +typedef struct app_rx_mq_handle_ +{ + union + { + struct + { + u32 app_index; + u32 thread_index; + }; + u64 as_u64; + }; +} __attribute__ ((aligned (sizeof (u64)))) app_rx_mq_handle_t; + +/** + * App sublayer per vpp worker state + */ +typedef struct asl_wrk_ +{ + /** Linked list of mqs with pending messages */ + app_rx_mq_elt_t *pending_rx_mqs; +} appsl_wrk_t; + typedef struct app_main_ { /** @@ -146,6 +217,11 @@ typedef struct app_main_ * Last registered crypto engine type */ crypto_engine_type_t last_crypto_engine; + + /** + * App sublayer per-worker state + */ + appsl_wrk_t *wrk; } app_main_t; typedef struct app_init_args_ @@ -223,6 +299,7 @@ u8 application_has_local_scope (application_t * app); u8 application_has_global_scope (application_t * app); void application_setup_proxy (application_t * app); void application_remove_proxy (application_t * app); +void application_namespace_cleanup (app_namespace_t *app_ns); segment_manager_props_t *application_get_segment_manager_properties (u32 app_index); @@ -230,6 +307,11 @@ segment_manager_props_t *application_get_segment_manager_properties (u32 segment_manager_props_t * application_segment_manager_properties (application_t * app); +svm_msg_q_t *application_rx_mq_get (application_t *app, u32 mq_index); +u8 application_use_private_rx_mqs (void); +fifo_segment_t *application_get_rx_mqs_segment (application_t *app); +void application_enable_rx_mqs_nodes (u8 is_en); + /* * App worker */ @@ -242,15 +324,17 @@ app_worker_t *app_worker_get_if_valid (u32 wrk_index); application_t *app_worker_get_app (u32 wrk_index); int app_worker_own_session (app_worker_t * app_wrk, session_t * s); void app_worker_free (app_worker_t * app_wrk); -int app_worker_connect_session (app_worker_t * app, session_endpoint_t * tep, - u32 api_context); +int app_worker_connect_session (app_worker_t *app, session_endpoint_cfg_t *sep, + session_handle_t *rsh); 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); + session_error_t err, u32 opaque); +int app_worker_add_half_open (app_worker_t *app_wrk, session_handle_t sh); +int app_worker_del_half_open (app_worker_t *app_wrk, session_t *s); int app_worker_close_notify (app_worker_t * app_wrk, session_t * s); int app_worker_transport_closed_notify (app_worker_t * app_wrk, session_t * s); @@ -261,12 +345,12 @@ int app_worker_migrate_notify (app_worker_t * app_wrk, session_t * s, session_handle_t new_sh); int app_worker_builtin_rx (app_worker_t * app_wrk, session_t * s); int app_worker_builtin_tx (app_worker_t * app_wrk, session_t * s); +int app_worker_session_fifo_tuning (app_worker_t * app_wrk, session_t * s, + svm_fifo_t * f, + session_ft_action_t act, u32 len); 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 *); -segment_manager_t - * app_worker_get_or_alloc_connect_segment_manager (app_worker_t *); -int app_worker_alloc_connects_segment_manager (app_worker_t * app); int app_worker_add_segment_notify (app_worker_t * app_wrk, u64 segment_handle); int app_worker_del_segment_notify (app_worker_t * app_wrk, @@ -274,11 +358,16 @@ int app_worker_del_segment_notify (app_worker_t * app_wrk, u32 app_worker_n_listeners (app_worker_t * app); session_t *app_worker_first_listener (app_worker_t * app, u8 fib_proto, u8 transport_proto); +void app_wrk_send_ctrl_evt_fd (app_worker_t *app_wrk, u8 evt_type, void *msg, + u32 msg_len, int fd); +void app_wrk_send_ctrl_evt (app_worker_t *app_wrk, u8 evt_type, void *msg, + u32 msg_len); int app_worker_send_event (app_worker_t * app, session_t * s, u8 evt); int app_worker_lock_and_send_event (app_worker_t * app, session_t * s, u8 evt_type); session_t *app_worker_proxy_listener (app_worker_t * app, u8 fib_proto, u8 transport_proto); +void app_worker_del_detached_sm (app_worker_t * app_wrk, u32 sm_index); u8 *format_app_worker (u8 * s, va_list * args); u8 *format_app_worker_listener (u8 * s, va_list * args); u8 *format_crypto_engine (u8 * s, va_list * args); @@ -296,9 +385,10 @@ app_cert_key_pair_t *app_cert_key_pair_get_default (); int mq_send_session_bound_cb (u32 app_wrk_index, u32 api_context, session_handle_t handle, int rv); int mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, - session_t * s, u8 is_fail); + session_t * s, session_error_t err); void mq_send_unlisten_reply (app_worker_t * app_wrk, session_handle_t sh, u32 context, int rv); +void sapi_socket_close_w_handle (u32 api_handle); crypto_engine_type_t app_crypto_engine_type_add (void); u8 app_crypto_engine_n_types (void);