X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_private.h;h=7104adc4452a5f8a3236ece3532ab804378f8fea;hb=a5a9efd4d1995ef6d46dfab4e5b8aba9c5d114ef;hp=7e1d35b220542436d1ab614fa42b85c35b4fbfa3;hpb=b88de908101081f870d94e1415659326b589b9ce;p=vpp.git diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h index 7e1d35b2205..7104adc4452 100644 --- a/src/vcl/vcl_private.h +++ b/src/vcl/vcl_private.h @@ -62,23 +62,18 @@ typedef enum STATE_APP_READY } vcl_bapi_app_state_t; -typedef enum -{ - STATE_CLOSED = 0, - STATE_CONNECT = 0x01, - STATE_LISTEN = 0x02, - STATE_ACCEPT = 0x04, - STATE_VPP_CLOSING = 0x08, - STATE_DISCONNECT = 0x10, - STATE_DETACHED = 0x20, - STATE_UPDATED = 0x40, - STATE_LISTEN_NO_MQ = 0x80, +typedef enum vcl_session_state_ +{ + VCL_STATE_CLOSED, + VCL_STATE_LISTEN, + VCL_STATE_READY, + VCL_STATE_VPP_CLOSING, + VCL_STATE_DISCONNECT, + VCL_STATE_DETACHED, + VCL_STATE_UPDATED, + VCL_STATE_LISTEN_NO_MQ, } vcl_session_state_t; -#define SERVER_STATE_OPEN (STATE_ACCEPT|STATE_VPP_CLOSING) -#define CLIENT_STATE_OPEN (STATE_CONNECT|STATE_VPP_CLOSING) -#define STATE_OPEN (SERVER_STATE_OPEN | CLIENT_STATE_OPEN) - typedef struct epoll_event vppcom_epoll_event_t; typedef struct @@ -136,54 +131,41 @@ typedef enum VCL_SESS_ATTR_MAX } vppcom_session_attr_t; -#define VCL_SESS_ATTR_SET(ATTR, VAL) \ -do { \ - (ATTR) |= 1 << (VAL); \ - } while (0) - -#define VCL_SESS_ATTR_CLR(ATTR, VAL) \ -do { \ - (ATTR) &= ~(1 << (VAL)); \ - } while (0) - -#define VCL_SESS_ATTR_TEST(ATTR, VAL) \ - ((ATTR) & (1 << (VAL)) ? 1 : 0) - typedef enum vcl_session_flags_ { VCL_SESSION_F_CONNECTED = 1 << 0, + VCL_SESSION_F_IS_VEP = 1 << 1, + VCL_SESSION_F_IS_VEP_SESSION = 1 << 2, + VCL_SESSION_F_HAS_RX_EVT = 1 << 3, } __clib_packed vcl_session_flags_t; -typedef struct +typedef struct vcl_session_ { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + #define _(type, name) type name; foreach_app_session_field #undef _ - u32 sndbuf_size; // VPP-TBD: Hack until support setsockopt(SO_SNDBUF) - u32 rcvbuf_size; // VPP-TBD: Hack until support setsockopt(SO_RCVBUF) - u32 user_mss; // VPP-TBD: Hack until support setsockopt(TCP_MAXSEG) - u64 vpp_handle; - u32 vpp_thread_index; + vcl_session_flags_t flags; /**< see @ref vcl_session_flags_t */ + u32 rx_bytes_pending; /**< bytes rx-ed as segs but not yet freed */ svm_fifo_t *ct_rx_fifo; svm_fifo_t *ct_tx_fifo; + vcl_session_msg_t *accept_evts_fifo; - /* Socket configuration state */ - u8 is_vep; - u8 is_vep_session; - vcl_session_flags_t flags; - /* VCL session index of the listening session (if any) */ - u32 listener_index; - /* Accepted sessions on this listener */ - int n_accepted_sessions; - u8 has_rx_evt; - u32 attr; + u64 vpp_handle; u64 parent_handle; + u32 listener_index; /**< index of parent listener (if any) */ + int n_accepted_sessions; /**< sessions accepted by this listener */ vppcom_epoll_t vep; + u32 attributes; /**< see @ref vppcom_session_attr_t */ int libc_epfd; - svm_msg_q_t *our_evt_q; - vcl_session_msg_t *accept_evts_fifo; + u32 ckpair_index; + + u32 sndbuf_size; // VPP-TBD: Hack until support setsockopt(SO_SNDBUF) + u32 rcvbuf_size; // VPP-TBD: Hack until support setsockopt(SO_RCVBUF) + u32 user_mss; // VPP-TBD: Hack until support setsockopt(TCP_MAXSEG) + #if VCL_ELOG elog_track_t elog_track; #endif @@ -193,7 +175,6 @@ typedef struct vppcom_cfg_t_ { uword heapsize; u32 max_workers; - u32 vpp_api_q_length; uword segment_baseva; uword segment_size; uword add_segment_size; @@ -214,9 +195,8 @@ typedef struct vppcom_cfg_t_ f64 accept_timeout; u32 event_ring_size; char *event_log_path; - u8 *vpp_bapi_filename; /**< bapi shm transport file name */ + u8 *vpp_app_socket_api; /**< app socket api socket file name */ u8 *vpp_bapi_socket_name; /**< bapi socket transport socket name */ - u8 *vpp_bapi_chroot; u32 tls_engine; u8 mt_wrk_supported; } vppcom_cfg_t; @@ -251,8 +231,11 @@ typedef struct vcl_worker_ /** Worker index in vpp*/ u32 vpp_wrk_index; - /** VPP bapi client handle */ - u32 bapi_client_index; + /** + * Generic api client handle. When binary api is in used, it stores + * the "client_index" and when socket api is use, it stores the sapi + * client handle */ + u32 api_client_handle; /** VPP binary api input queue */ svm_queue_t *vl_input_queue; @@ -280,9 +263,6 @@ typedef struct vcl_worker_ /** Our event message queue */ svm_msg_q_t *app_event_queue; - /** VPP workers event message queues */ - svm_msg_q_t **vpp_event_queues; - /** For deadman timers */ clib_time_t clib_time; @@ -302,15 +282,24 @@ typedef struct vcl_worker_ u32 forked_child; + clib_socket_t app_api_sock; socket_client_main_t bapi_sock_ctx; - memory_client_main_t bapi_shm_ctx; api_main_t bapi_api_ctx; + /* State of the connection, shared between msg RX thread and main thread */ + volatile vcl_bapi_app_state_t bapi_app_state; + volatile uword bapi_return; + /** vcl needs next epoll_create to go to libc_epoll */ u8 vcl_needs_real_epoll; volatile int rpc_done; } vcl_worker_t; +STATIC_ASSERT (sizeof (session_disconnected_msg_t) <= 16, + "disconnected must fit in session_event_t"); +STATIC_ASSERT (sizeof (session_reset_msg_t) <= 16, + "disconnected must fit in session_event_t"); + typedef void (vcl_rpc_fn_t) (void *args); typedef struct vppcom_main_t_ @@ -355,9 +344,6 @@ typedef struct vppcom_main_t_ * Binary api context */ - /* State of the connection, shared between msg RX thread and main thread */ - volatile vcl_bapi_app_state_t bapi_app_state; - /* VNET_API_ERROR_FOO -> "Foo" hash table */ uword *error_string_by_error_number; @@ -502,18 +488,18 @@ vcl_session_is_connectable_listener (vcl_worker_t * wrk, if (session->session_type != VPPCOM_PROTO_QUIC) return 0; if (session->listener_index == VCL_INVALID_SESSION_INDEX) - return !(session->session_state & STATE_LISTEN); + return !(session->session_state == VCL_STATE_LISTEN); ls = vcl_session_get_w_handle (wrk, session->listener_index); if (!ls) return VPPCOM_EBADFD; - return ls->session_state & STATE_LISTEN; + return ls->session_state == VCL_STATE_LISTEN; } static inline vcl_session_t * vcl_session_table_lookup_listener (vcl_worker_t * wrk, u64 handle) { uword *p; - vcl_session_t *session; + vcl_session_t *s; p = hash_get (wrk->session_index_by_vpp_handles, handle); if (!p) @@ -522,16 +508,17 @@ vcl_session_table_lookup_listener (vcl_worker_t * wrk, u64 handle) " %llx", handle); return 0; } - session = vcl_session_get (wrk, p[0]); - if (!session) + s = vcl_session_get (wrk, p[0]); + if (!s) { VDBG (1, "invalid listen session index (%u)", p[0]); return 0; } - ASSERT ((session->session_state & (STATE_LISTEN | STATE_LISTEN_NO_MQ)) || - vcl_session_is_connectable_listener (wrk, session)); - return session; + ASSERT (s->session_state == VCL_STATE_LISTEN + || s->session_state == VCL_STATE_LISTEN_NO_MQ + || vcl_session_is_connectable_listener (wrk, s)); + return s; } const char *vppcom_session_state_str (vcl_session_state_t state); @@ -550,38 +537,51 @@ vcl_session_is_cl (vcl_session_t * s) return 0; } +static inline u8 +vcl_session_has_crypto (vcl_session_t *s) +{ + return (s->session_type == VPPCOM_PROTO_TLS || + s->session_type == VPPCOM_PROTO_QUIC); +} + +static inline u8 +vcl_session_is_ready (vcl_session_t * s) +{ + return (s->session_state == VCL_STATE_READY + || s->session_state == VCL_STATE_VPP_CLOSING); +} + static inline u8 vcl_session_is_open (vcl_session_t * s) { - return ((s->session_state & STATE_OPEN) - || (s->session_state == STATE_LISTEN - && s->session_type == VPPCOM_PROTO_UDP)); + return ((vcl_session_is_ready (s)) + || (s->session_state == VCL_STATE_LISTEN && vcl_session_is_cl (s))); } static inline u8 vcl_session_is_closing (vcl_session_t * s) { - return (s->session_state == STATE_VPP_CLOSING - || s->session_state == STATE_DISCONNECT); + return (s->session_state == VCL_STATE_VPP_CLOSING + || s->session_state == VCL_STATE_DISCONNECT); } static inline u8 vcl_session_is_closed (vcl_session_t * s) { - return (!s || (s->session_state == STATE_CLOSED)); + return (!s || (s->session_state == VCL_STATE_CLOSED)); } static inline int vcl_session_closing_error (vcl_session_t * s) { /* Return 0 on closing sockets */ - return s->session_state == STATE_DISCONNECT ? VPPCOM_ECONNRESET : 0; + return s->session_state == VCL_STATE_DISCONNECT ? VPPCOM_ECONNRESET : 0; } static inline int vcl_session_closed_error (vcl_session_t * s) { - return s->session_state == STATE_DISCONNECT + return s->session_state == VCL_STATE_DISCONNECT ? VPPCOM_ECONNRESET : VPPCOM_ENOTCONN; } @@ -610,6 +610,24 @@ vcl_proto_is_dgram (uint8_t proto) return proto == VPPCOM_PROTO_UDP; } +static inline u8 +vcl_session_has_attr (vcl_session_t * s, u8 attr) +{ + return (s->attributes & (1 << attr)) ? 1 : 0; +} + +static inline void +vcl_session_set_attr (vcl_session_t * s, u8 attr) +{ + s->attributes |= 1 << attr; +} + +static inline void +vcl_session_clear_attr (vcl_session_t * s, u8 attr) +{ + s->attributes &= ~(1 << attr); +} + /* * Helpers */ @@ -661,10 +679,10 @@ vcl_n_workers (void) return pool_elts (vcm->workers); } -static inline svm_msg_q_t * -vcl_session_vpp_evt_q (vcl_worker_t * wrk, vcl_session_t * s) +static inline u64 +vcl_vpp_worker_segment_handle (u32 wrk_index) { - return wrk->vpp_event_queues[s->vpp_thread_index]; + return (VCL_INVALID_SEGMENT_HANDLE - wrk_index - 1); } void vcl_send_session_worker_update (vcl_worker_t * wrk, vcl_session_t * s, @@ -676,6 +694,12 @@ int vcl_segment_attach (u64 segment_handle, char *name, void vcl_segment_detach (u64 segment_handle); void vcl_send_session_unlisten (vcl_worker_t * wrk, vcl_session_t * s); +int vcl_segment_attach_session (uword segment_handle, uword rxf_offset, + uword txf_offset, uword mq_offset, u8 is_ct, + vcl_session_t *s); +int vcl_segment_attach_mq (uword segment_handle, uword mq_offset, u32 mq_index, + svm_msg_q_t **mq); + /* * VCL Binary API */ @@ -683,13 +707,21 @@ int vcl_bapi_attach (void); int vcl_bapi_app_worker_add (void); void vcl_bapi_app_worker_del (vcl_worker_t * wrk); void vcl_bapi_disconnect_from_vpp (void); -void vcl_bapi_send_application_tls_cert_add (vcl_session_t * session, - char *cert, u32 cert_len); -void vcl_bapi_send_application_tls_key_add (vcl_session_t * session, - char *key, u32 key_len); +int vcl_bapi_recv_fds (vcl_worker_t * wrk, int *fds, int n_fds); +int vcl_bapi_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair); +int vcl_bapi_del_cert_key_pair (u32 ckpair_index); u32 vcl_bapi_max_nsid_len (void); int vcl_bapi_worker_set (void); +/* + * VCL Socket API + */ +int vcl_sapi_attach (void); +int vcl_sapi_app_worker_add (void); +void vcl_sapi_app_worker_del (vcl_worker_t * wrk); +void vcl_sapi_detach (vcl_worker_t * wrk); +int vcl_sapi_recv_fds (vcl_worker_t * wrk, int *fds, int n_fds); + #endif /* SRC_VCL_VCL_PRIVATE_H_ */ /*