diff options
Diffstat (limited to 'src/vcl/vcl_private.h')
| -rw-r--r-- | src/vcl/vcl_private.h | 83 |
1 files changed, 66 insertions, 17 deletions
diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h index c9db03cbc2f..b89052f96af 100644 --- a/src/vcl/vcl_private.h +++ b/src/vcl/vcl_private.h @@ -118,16 +118,17 @@ typedef enum VCL_SESS_ATTR_CUT_THRU, VCL_SESS_ATTR_VEP, VCL_SESS_ATTR_VEP_SESSION, - VCL_SESS_ATTR_LISTEN, // SOL_SOCKET,SO_ACCEPTCONN - VCL_SESS_ATTR_NONBLOCK, // fcntl,O_NONBLOCK - VCL_SESS_ATTR_REUSEADDR, // SOL_SOCKET,SO_REUSEADDR - VCL_SESS_ATTR_REUSEPORT, // SOL_SOCKET,SO_REUSEPORT - VCL_SESS_ATTR_BROADCAST, // SOL_SOCKET,SO_BROADCAST - VCL_SESS_ATTR_V6ONLY, // SOL_TCP,IPV6_V6ONLY - VCL_SESS_ATTR_KEEPALIVE, // SOL_SOCKET,SO_KEEPALIVE - VCL_SESS_ATTR_TCP_NODELAY, // SOL_TCP,TCP_NODELAY - VCL_SESS_ATTR_TCP_KEEPIDLE, // SOL_TCP,TCP_KEEPIDLE - VCL_SESS_ATTR_TCP_KEEPINTVL, // SOL_TCP,TCP_KEEPINTVL + VCL_SESS_ATTR_LISTEN, // SOL_SOCKET,SO_ACCEPTCONN + VCL_SESS_ATTR_NONBLOCK, // fcntl,O_NONBLOCK + VCL_SESS_ATTR_REUSEADDR, // SOL_SOCKET,SO_REUSEADDR + VCL_SESS_ATTR_REUSEPORT, // SOL_SOCKET,SO_REUSEPORT + VCL_SESS_ATTR_BROADCAST, // SOL_SOCKET,SO_BROADCAST + VCL_SESS_ATTR_V6ONLY, // SOL_TCP,IPV6_V6ONLY + VCL_SESS_ATTR_KEEPALIVE, // SOL_SOCKET,SO_KEEPALIVE + VCL_SESS_ATTR_TCP_NODELAY, // SOL_TCP,TCP_NODELAY + VCL_SESS_ATTR_TCP_KEEPIDLE, // SOL_TCP,TCP_KEEPIDLE + VCL_SESS_ATTR_TCP_KEEPINTVL, // SOL_TCP,TCP_KEEPINTVL + VCL_SESS_ATTR_IP_PKTINFO, /* IPPROTO_IP, IP_PKTINFO */ VCL_SESS_ATTR_MAX } vppcom_session_attr_t; @@ -139,6 +140,9 @@ typedef enum vcl_session_flags_ VCL_SESSION_F_HAS_RX_EVT = 1 << 3, VCL_SESSION_F_RD_SHUTDOWN = 1 << 4, VCL_SESSION_F_WR_SHUTDOWN = 1 << 5, + VCL_SESSION_F_PENDING_DISCONNECT = 1 << 6, + VCL_SESSION_F_PENDING_FREE = 1 << 7, + VCL_SESSION_F_PENDING_LISTEN = 1 << 8, } __clib_packed vcl_session_flags_t; typedef struct vcl_session_ @@ -155,23 +159,30 @@ typedef struct vcl_session_ svm_fifo_t *ct_tx_fifo; vcl_session_msg_t *accept_evts_fifo; - u64 vpp_handle; - u64 parent_handle; + session_handle_t vpp_handle; + session_handle_t 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; u32 vrf; + u16 gso_size; u32 sndbuf_size; // VPP-TBD: Hack until support setsockopt(SO_SNDBUF) u32 rcvbuf_size; // VPP-TBD: Hack until support setsockopt(SO_RCVBUF) transport_endpt_ext_cfg_t *ext_config; + u8 dscp; + + i32 vpp_error; #if VCL_ELOG elog_track_t elog_track; #endif + + u16 original_dst_port; /**< original dst port (network order) */ + u32 original_dst_ip4; /**< original dst ip4 (network order) */ } vcl_session_t; typedef struct vppcom_cfg_t_ @@ -185,7 +196,6 @@ typedef struct vppcom_cfg_t_ u32 rx_fifo_size; u32 tx_fifo_size; u32 event_queue_size; - u32 listen_queue_size; u8 app_proxy_transport_tcp; u8 app_proxy_transport_udp; u8 app_scope_local; @@ -195,13 +205,13 @@ typedef struct vppcom_cfg_t_ u8 use_mq_eventfd; f64 app_timeout; f64 session_timeout; - f64 accept_timeout; - u32 event_ring_size; char *event_log_path; u8 *vpp_app_socket_api; /**< app socket api socket file name */ u8 *vpp_bapi_socket_name; /**< bapi socket transport socket name */ u32 tls_engine; u8 mt_wrk_supported; + u8 huge_page; + u8 app_original_dst; } vppcom_cfg_t; void vppcom_cfg (vppcom_cfg_t * vcl_cfg); @@ -338,6 +348,10 @@ typedef struct vppcom_main_t_ /** Lock to protect worker registrations */ clib_spinlock_t workers_lock; + /** Counter to determine order of execution of `vcl_api_retry_attach` + * function by multiple workers */ + int reattach_count; + /** Lock to protect segment hash table */ clib_rwlock_t segment_table_lock; @@ -543,8 +557,6 @@ vcl_session_table_lookup_listener (vcl_worker_t * wrk, u64 handle) return s; } -const char *vppcom_session_state_str (vcl_session_state_t state); - static inline u8 vcl_session_is_ct (vcl_session_t * s) { @@ -652,6 +664,32 @@ vcl_session_clear_attr (vcl_session_t * s, u8 attr) s->attributes &= ~(1 << attr); } +static inline session_evt_type_t +vcl_session_dgram_tx_evt (vcl_session_t *s, session_evt_type_t et) +{ + return (s->flags & VCL_SESSION_F_CONNECTED) ? et : SESSION_IO_EVT_TX_MAIN; +} + +static inline void +vcl_session_add_want_deq_ntf (vcl_session_t *s, svm_fifo_deq_ntf_t evt) +{ + svm_fifo_t *txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + if (txf) + { + svm_fifo_add_want_deq_ntf (txf, evt); + /* Request tx notification only if 3% of fifo is empty */ + svm_fifo_set_deq_thresh (txf, 0.03 * svm_fifo_size (txf)); + } +} + +static inline void +vcl_session_del_want_deq_ntf (vcl_session_t *s, svm_fifo_deq_ntf_t evt) +{ + svm_fifo_t *txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; + if (txf) + svm_fifo_del_want_deq_ntf (txf, evt); +} + /* * Helpers */ @@ -718,6 +756,8 @@ int vcl_send_worker_rpc (u32 dst_wrk_index, void *data, u32 data_len); int vcl_segment_attach (u64 segment_handle, char *name, ssvm_segment_type_t type, int fd); void vcl_segment_detach (u64 segment_handle); +void vcl_segment_detach_segments (u32 *seg_indices); +void vcl_send_session_listen (vcl_worker_t *wrk, vcl_session_t *s); void vcl_send_session_unlisten (vcl_worker_t * wrk, vcl_session_t * s); int vcl_segment_attach_session (uword segment_handle, uword rxf_offset, @@ -731,6 +771,7 @@ svm_fifo_chunk_t *vcl_segment_alloc_chunk (uword segment_handle, uword *offset); int vcl_session_share_fifos (vcl_session_t *s, svm_fifo_t *rxf, svm_fifo_t *txf); +void vcl_worker_detach_sessions (vcl_worker_t *wrk); /* * VCL Binary API @@ -756,6 +797,14 @@ int vcl_sapi_recv_fds (vcl_worker_t * wrk, int *fds, int n_fds); int vcl_sapi_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair); int vcl_sapi_del_cert_key_pair (u32 ckpair_index); +/* + * Utility functions + */ +const char *vcl_session_state_str (vcl_session_state_t state); +u8 *vcl_format_ip4_address (u8 *s, va_list *args); +u8 *vcl_format_ip6_address (u8 *s, va_list *args); +u8 *vcl_format_ip46_address (u8 *s, va_list *args); + #endif /* SRC_VCL_VCL_PRIVATE_H_ */ /* |