X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.h;h=d3bfb3b03dd5f0a5c8d034a7001fbda247ac2d1c;hb=534468e9f768ae7465ef722520dadfd916cdc9fb;hp=7d5d044cc5a02c74f6405048cf2de125005246d3;hpb=00e01d3e875bb18397ff81e0f58f9b468477f473;p=vpp.git diff --git a/src/vnet/session/application_interface.h b/src/vnet/session/application_interface.h index 7d5d044cc5a..d3bfb3b03dd 100644 --- a/src/vnet/session/application_interface.h +++ b/src/vnet/session/application_interface.h @@ -81,6 +81,7 @@ typedef struct session_cb_vft_ _(u8 *, namespace_id) \ _(session_cb_vft_t *, session_cb_vft) \ _(u32, app_index) \ + _(u8, use_sock_api) \ typedef struct _vnet_app_attach_args_t { @@ -113,9 +114,6 @@ typedef struct _vnet_bind_args_t /* * Results */ - char *segment_name; - u32 segment_name_length; - u64 server_event_queue_address; u64 handle; } vnet_listen_args_t; @@ -141,10 +139,14 @@ typedef struct _vnet_connect_args u32 app_index; u32 wrk_map_index; u32 api_context; - - session_handle_t session_handle; } vnet_connect_args_t; +typedef struct _vnet_shutdown_args_t +{ + session_handle_t handle; + u32 app_index; +} vnet_shutdown_args_t; + typedef struct _vnet_disconnect_args_t { session_handle_t handle; @@ -177,6 +179,8 @@ typedef struct _vnet_app_add_cert_key_pair_args_ { u8 *cert; u8 *key; + u32 cert_len; + u32 key_len; u32 index; } vnet_app_add_cert_key_pair_args_t; @@ -200,6 +204,7 @@ typedef enum APP_OPTIONS_RX_FIFO_SIZE, APP_OPTIONS_TX_FIFO_SIZE, APP_OPTIONS_PREALLOC_FIFO_PAIRS, + APP_OPTIONS_PREALLOC_FIFO_HDRS, APP_OPTIONS_NAMESPACE, APP_OPTIONS_NAMESPACE_SECRET, APP_OPTIONS_PROXY_TRANSPORT, @@ -267,10 +272,9 @@ int vnet_application_detach (vnet_app_detach_args_t * a); int vnet_listen (vnet_listen_args_t * a); int vnet_connect (vnet_connect_args_t * a); int vnet_unlisten (vnet_unlisten_args_t * a); +int vnet_shutdown_session (vnet_shutdown_args_t *a); int vnet_disconnect_session (vnet_disconnect_args_t * a); -clib_error_t *vnet_app_add_tls_cert (vnet_app_add_tls_cert_args_t * a); -clib_error_t *vnet_app_add_tls_key (vnet_app_add_tls_key_args_t * a); int vnet_app_add_cert_key_pair (vnet_app_add_cert_key_pair_args_t * a); int vnet_app_del_cert_key_pair (u32 index); /** Ask for app cb on pair deletion */ @@ -312,8 +316,8 @@ typedef struct session_listen_msg_ u8 proto; u8 is_ip4; ip46_address_t ip; - u32 ckpair_index; - u8 crypto_engine; + u8 flags; + uword ext_config; } __clib_packed session_listen_msg_t; STATIC_ASSERT (sizeof (session_listen_msg_t) <= SESSION_CTRL_MSG_MAX_SIZE, @@ -340,9 +344,7 @@ typedef struct session_bound_msg_ uword rx_fifo; uword tx_fifo; uword vpp_evt_q; - u32 segment_size; - u8 segment_name_length; - u8 segment_name[128]; + u64 segment_handle; } __clib_packed session_bound_msg_t; typedef struct session_unlisten_msg_ @@ -369,6 +371,7 @@ typedef struct session_accepted_msg_ uword server_tx_fifo; u64 segment_handle; uword vpp_event_queue_address; + u32 mq_index; transport_endpoint_t rmt; u8 flags; } __clib_packed session_accepted_msg_t; @@ -392,12 +395,11 @@ typedef struct session_connect_msg_ u8 is_ip4; ip46_address_t ip; ip46_address_t lcl_ip; - u8 hostname_len; - u8 hostname[16]; u64 parent_handle; u32 ckpair_index; u8 crypto_engine; u8 flags; + uword ext_config; } __clib_packed session_connect_msg_t; STATIC_ASSERT (sizeof (session_connect_msg_t) <= SESSION_CTRL_MSG_MAX_SIZE, @@ -431,6 +433,13 @@ typedef struct session_connected_msg_ transport_endpoint_t lcl; } __clib_packed session_connected_msg_t; +typedef struct session_shutdown_msg_ +{ + u32 client_index; + u32 context; + session_handle_t handle; +} __clib_packed session_shutdown_msg_t; + typedef struct session_disconnect_msg_ { u32 client_index; @@ -516,14 +525,39 @@ typedef struct session_migrate_msg_ uword vpp_evt_q; session_handle_t handle; session_handle_t new_handle; + u64 segment_handle; u32 vpp_thread_index; } __clib_packed session_migrated_msg_t; typedef struct session_cleanup_msg_ { session_handle_t handle; + u8 type; } __clib_packed session_cleanup_msg_t; +typedef struct session_app_wrk_rpc_msg_ +{ + u32 client_index; /**< app client index */ + u32 wrk_index; /**< dst worker index */ + u8 data[64]; /**< rpc data */ +} __clib_packed session_app_wrk_rpc_msg_t; + +typedef struct session_transport_attr_msg_ +{ + u32 client_index; + session_handle_t handle; + transport_endpt_attr_t attr; + u8 is_get; +} __clib_packed session_transport_attr_msg_t; + +typedef struct session_transport_attr_reply_msg_ +{ + i32 retval; + session_handle_t handle; + transport_endpt_attr_t attr; + u8 is_get; +} __clib_packed session_transport_attr_reply_msg_t; + typedef struct app_session_event_ { svm_msg_q_msg_t msg; @@ -571,7 +605,8 @@ app_send_io_evt_to_vpp (svm_msg_q_t * mq, u32 session_index, u8 evt_type, { if (svm_msg_q_try_lock (mq)) return -1; - if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING))) + if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING) + || svm_msg_q_is_full (mq))) { svm_msg_q_unlock (mq); return -2; @@ -588,7 +623,7 @@ app_send_io_evt_to_vpp (svm_msg_q_t * mq, u32 session_index, u8 evt_type, svm_msg_q_lock (mq); while (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING) || svm_msg_q_is_full (mq)) - svm_msg_q_wait (mq); + svm_msg_q_wait_prod (mq); msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); evt->session_index = session_index; @@ -603,35 +638,35 @@ app_send_dgram_raw (svm_fifo_t * f, app_session_transport_t * at, svm_msg_q_t * vpp_evt_q, u8 * data, u32 len, u8 evt_type, u8 do_evt, u8 noblock) { - u32 max_enqueue, actual_write; session_dgram_hdr_t hdr; int rv; - max_enqueue = svm_fifo_max_enqueue_prod (f); - if (max_enqueue <= sizeof (session_dgram_hdr_t)) + if (svm_fifo_max_enqueue_prod (f) < (sizeof (session_dgram_hdr_t) + len)) return 0; - max_enqueue -= sizeof (session_dgram_hdr_t); - actual_write = clib_min (len, max_enqueue); - hdr.data_length = actual_write; + hdr.data_length = len; hdr.data_offset = 0; clib_memcpy_fast (&hdr.rmt_ip, &at->rmt_ip, sizeof (ip46_address_t)); hdr.is_ip4 = at->is_ip4; hdr.rmt_port = at->rmt_port; clib_memcpy_fast (&hdr.lcl_ip, &at->lcl_ip, sizeof (ip46_address_t)); hdr.lcl_port = at->lcl_port; - rv = svm_fifo_enqueue (f, sizeof (hdr), (u8 *) & hdr); - ASSERT (rv == sizeof (hdr)); - rv = svm_fifo_enqueue (f, actual_write, data); + /* *INDENT-OFF* */ + svm_fifo_seg_t segs[2] = {{ (u8 *) &hdr, sizeof (hdr) }, { data, len }}; + /* *INDENT-ON* */ + + rv = svm_fifo_enqueue_segments (f, segs, 2, 0 /* allow partial */ ); + if (PREDICT_FALSE (rv < 0)) + return 0; + if (do_evt) { - if (rv > 0 && svm_fifo_set_event (f)) - app_send_io_evt_to_vpp (vpp_evt_q, f->master_session_index, evt_type, - noblock); + if (svm_fifo_set_event (f)) + app_send_io_evt_to_vpp (vpp_evt_q, f->shr->master_session_index, + evt_type, noblock); } - ASSERT (rv); - return rv; + return len; } always_inline int @@ -652,8 +687,8 @@ app_send_stream_raw (svm_fifo_t * f, svm_msg_q_t * vpp_evt_q, u8 * data, if (do_evt) { if (rv > 0 && svm_fifo_set_event (f)) - app_send_io_evt_to_vpp (vpp_evt_q, f->master_session_index, evt_type, - noblock); + app_send_io_evt_to_vpp (vpp_evt_q, f->shr->master_session_index, + evt_type, noblock); } return rv; } @@ -694,18 +729,21 @@ app_recv_dgram_raw (svm_fifo_t * f, u8 * buf, u32 len, svm_fifo_peek (f, 0, sizeof (ph), (u8 *) & ph); ASSERT (ph.data_length >= ph.data_offset); - if (!ph.data_offset) - svm_fifo_peek (f, sizeof (ph), sizeof (*at), (u8 *) at); + + /* Check if we have the full dgram */ + if (max_deq < (ph.data_length + SESSION_CONN_HDR_LEN) + && len >= ph.data_length) + return 0; + + svm_fifo_peek (f, sizeof (ph), sizeof (*at), (u8 *) at); len = clib_min (len, ph.data_length - ph.data_offset); rv = svm_fifo_peek (f, ph.data_offset + SESSION_CONN_HDR_LEN, len, buf); if (peek) return rv; - ASSERT (rv > 0); - ph.data_offset += rv; - if (ph.data_offset == ph.data_length) - svm_fifo_dequeue_drop (f, ph.data_length + SESSION_CONN_HDR_LEN); - else - svm_fifo_overwrite_head (f, (u8 *) & ph, sizeof (ph)); + + /* Discards data that did not fit in buffer */ + svm_fifo_dequeue_drop (f, ph.data_length + SESSION_CONN_HDR_LEN); + return rv; } @@ -759,6 +797,89 @@ format_session_error (u8 * s, va_list * args) s = format (s, "invalid session err %u", -error); return s; } + +/* + * Socket API messages + */ + +typedef enum app_sapi_msg_type +{ + APP_SAPI_MSG_TYPE_NONE, + APP_SAPI_MSG_TYPE_ATTACH, + APP_SAPI_MSG_TYPE_ATTACH_REPLY, + APP_SAPI_MSG_TYPE_ADD_DEL_WORKER, + APP_SAPI_MSG_TYPE_ADD_DEL_WORKER_REPLY, + APP_SAPI_MSG_TYPE_SEND_FDS, +} __clib_packed app_sapi_msg_type_e; + +typedef struct app_sapi_attach_msg_ +{ + u8 name[64]; + u64 options[18]; +} __clib_packed app_sapi_attach_msg_t; + +STATIC_ASSERT (sizeof (u64) * APP_OPTIONS_N_OPTIONS <= + sizeof (((app_sapi_attach_msg_t *) 0)->options), + "Out of options, fix message definition"); + +typedef struct app_sapi_attach_reply_msg_ +{ + i32 retval; + u32 app_index; + u64 app_mq; + u64 vpp_ctrl_mq; + u64 segment_handle; + u32 api_client_handle; + u8 vpp_ctrl_mq_thread; + u8 n_fds; + u8 fd_flags; +} __clib_packed app_sapi_attach_reply_msg_t; + +typedef struct app_sapi_worker_add_del_msg_ +{ + u32 app_index; + u32 wrk_index; + u8 is_add; +} __clib_packed app_sapi_worker_add_del_msg_t; + +typedef struct app_sapi_worker_add_del_reply_msg_ +{ + i32 retval; + u32 wrk_index; + u64 app_event_queue_address; + u64 segment_handle; + u32 api_client_handle; + u8 n_fds; + u8 fd_flags; + u8 is_add; +} __clib_packed app_sapi_worker_add_del_reply_msg_t; + +typedef struct app_sapi_msg_ +{ + app_sapi_msg_type_e type; + union + { + app_sapi_attach_msg_t attach; + app_sapi_attach_reply_msg_t attach_reply; + app_sapi_worker_add_del_msg_t worker_add_del; + app_sapi_worker_add_del_reply_msg_t worker_add_del_reply; + }; +} __clib_packed app_sapi_msg_t; + +static inline void +session_endpoint_alloc_ext_cfg (session_endpoint_cfg_t *sep_ext, + transport_endpt_ext_cfg_type_t type) +{ + transport_endpt_ext_cfg_t *cfg; + u32 cfg_size; + + cfg_size = sizeof (transport_endpt_ext_cfg_t); + cfg = clib_mem_alloc (cfg_size); + clib_memset (cfg, 0, cfg_size); + cfg->type = type; + sep_ext->ext_cfg = cfg; +} + #endif /* __included_uri_h__ */ /*