X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_private.h;h=34e05f20f8878031f29b314f795208b34a05d54c;hb=04ae8273f;hp=8e4c229ea7665c5660dbd0f908e23e7dfa157d21;hpb=dfffdd7faff2d0ff4b3a0df6f755044b68d3234a;p=vpp.git diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h index 8e4c229ea76..34e05f20f88 100644 --- a/src/vcl/vcl_private.h +++ b/src/vcl/vcl_private.h @@ -131,56 +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; - /** bytes delivered as segment but not yet freed */ - u32 rx_bytes_pending; + u32 ckpair_index; + u32 vrf; + + u32 sndbuf_size; // VPP-TBD: Hack until support setsockopt(SO_SNDBUF) + u32 rcvbuf_size; // VPP-TBD: Hack until support setsockopt(SO_RCVBUF) + #if VCL_ELOG elog_track_t elog_track; #endif @@ -190,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; @@ -212,9 +196,7 @@ typedef struct vppcom_cfg_t_ u32 event_ring_size; char *event_log_path; u8 *vpp_app_socket_api; /**< app socket api socket file name */ - u8 *vpp_bapi_filename; /**< bapi shm transport 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; @@ -281,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; @@ -305,14 +284,27 @@ typedef struct vcl_worker_ 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; + memory_client_main_t bapi_mem_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; + + u8 session_attr_op; + int session_attr_op_rv; + transport_endpt_attr_t session_attr_rv; /** 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_ @@ -357,9 +349,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; @@ -379,6 +368,8 @@ extern vppcom_main_t _vppcom_main; #define VCL_INVALID_SEGMENT_INDEX ((u32)~0) #define VCL_INVALID_SEGMENT_HANDLE ((u64)~0) +void vcl_session_detach_fifos (vcl_session_t *s); + static inline vcl_session_t * vcl_session_alloc (vcl_worker_t * wrk) { @@ -395,6 +386,7 @@ vcl_session_free (vcl_worker_t * wrk, vcl_session_t * s) { /* Debug level set to 1 to avoid debug messages while ldp is cleaning up */ VDBG (1, "session %u [0x%llx] removed", s->session_index, s->vpp_handle); + vcl_session_detach_fifos (s); pool_put (wrk->sessions, s); } @@ -553,6 +545,14 @@ 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 || + s->session_type == VPPCOM_PROTO_DTLS); +} + static inline u8 vcl_session_is_ready (vcl_session_t * s) { @@ -564,8 +564,7 @@ static inline u8 vcl_session_is_open (vcl_session_t * s) { return ((vcl_session_is_ready (s)) - || (s->session_state == VCL_STATE_LISTEN - && s->session_type == VPPCOM_PROTO_UDP)); + || (s->session_state == VCL_STATE_LISTEN && vcl_session_is_cl (s))); } static inline u8 @@ -617,7 +616,25 @@ vcl_ip_copy_to_ep (ip46_address_t * ip, vppcom_endpt_t * ep, u8 is_ip4) static inline int vcl_proto_is_dgram (uint8_t proto) { - return proto == VPPCOM_PROTO_UDP; + return proto == VPPCOM_PROTO_UDP || proto == VPPCOM_PROTO_DTLS; +} + +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); } /* @@ -671,12 +688,6 @@ 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) -{ - return wrk->vpp_event_queues[s->vpp_thread_index]; -} - static inline u64 vcl_vpp_worker_segment_handle (u32 wrk_index) { @@ -692,6 +703,13 @@ 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); +int vcl_segment_discover_mqs (uword segment_handle, int *fds, u32 n_fds); + /* * VCL Binary API */ @@ -700,10 +718,8 @@ int vcl_bapi_app_worker_add (void); void vcl_bapi_app_worker_del (vcl_worker_t * wrk); void vcl_bapi_disconnect_from_vpp (void); int vcl_bapi_recv_fds (vcl_worker_t * wrk, int *fds, int n_fds); -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_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);