X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_locked.c;h=69f492b86940aa42880393403b88e9bb52f09e9e;hb=534468e9f768ae7465ef722520dadfd916cdc9fb;hp=d69d391d626bb5f7a6d188ae90b403f65d994065;hpb=458089bbad9cf5bef6cf8119f23fc44e66b36ad3;p=vpp.git diff --git a/src/vcl/vcl_locked.c b/src/vcl/vcl_locked.c index d69d391d626..69f492b8694 100644 --- a/src/vcl/vcl_locked.c +++ b/src/vcl/vcl_locked.c @@ -16,16 +16,34 @@ #include #include +typedef struct vls_shared_data_ +{ + clib_spinlock_t lock; + u32 owner_wrk_index; + u32 *workers_subscribed; + clib_bitmap_t *listeners; +} vls_shared_data_t; + typedef struct vcl_locked_session_ { clib_spinlock_t lock; u32 session_index; u32 worker_index; u32 vls_index; - u32 *workers_subscribed; - clib_bitmap_t *listeners; + u32 shared_data_index; + /** VCL session owned by different workers because of migration */ + u32 owner_vcl_wrk_index; + uword *vcl_wrk_index_to_session_index; } vcl_locked_session_t; +typedef struct vls_worker_ +{ + clib_rwlock_t sh_to_vlsh_table_lock; /** valid for multithread workers */ + vcl_locked_session_t *vls_pool; + uword *session_handle_to_vlsh_table; + u32 wrk_index; +} vls_worker_t; + typedef struct vls_local_ { int vls_wrk_index; @@ -33,7 +51,6 @@ typedef struct vls_local_ pthread_mutex_t vls_mt_mq_mlock; pthread_mutex_t vls_mt_spool_mlock; volatile u8 select_mp_check; - volatile u8 epoll_mp_check; } vls_process_local_t; static vls_process_local_t vls_local; @@ -41,35 +58,149 @@ static vls_process_local_t *vlsl = &vls_local; typedef struct vls_main_ { - vcl_locked_session_t *vls_pool; + vls_worker_t *workers; clib_rwlock_t vls_table_lock; - uword *session_index_to_vlsh_table; + /** Pool of data shared by sessions owned by different workers */ + vls_shared_data_t *shared_data_pool; + clib_rwlock_t shared_data_lock; + /** Lock to protect rpc among workers */ + clib_spinlock_t worker_rpc_lock; } vls_main_t; vls_main_t *vlsm; +typedef enum +{ + VLS_RPC_STATE_INIT, + VLS_RPC_STATE_SUCCESS, + VLS_RPC_STATE_SESSION_NOT_EXIST, +} vls_rpc_state_e; + +typedef enum vls_rpc_msg_type_ +{ + VLS_RPC_CLONE_AND_SHARE, + VLS_RPC_SESS_CLEANUP, +} vls_rpc_msg_type_e; + +typedef struct vls_rpc_msg_ +{ + u8 type; + u8 data[0]; +} vls_rpc_msg_t; + +typedef struct vls_clone_and_share_msg_ +{ + u32 vls_index; /**< vls to be shared */ + u32 session_index; /**< vcl session to be shared */ + u32 origin_vls_wrk; /**< vls worker that initiated the rpc */ + u32 origin_vls_index; /**< vls session of the originator */ + u32 origin_vcl_wrk; /**< vcl worker that initiated the rpc */ + u32 origin_session_index; /**< vcl session of the originator */ +} vls_clone_and_share_msg_t; + +typedef struct vls_sess_cleanup_msg_ +{ + u32 session_index; /**< vcl session to be cleaned */ + u32 origin_vcl_wrk; /**< worker that initiated the rpc */ +} vls_sess_cleanup_msg_t; + +void vls_send_session_cleanup_rpc (vcl_worker_t * wrk, + u32 dst_wrk_index, u32 dst_session_index); +void vls_send_clone_and_share_rpc (vcl_worker_t *wrk, u32 origin_vls_index, + u32 session_index, u32 vls_wrk_index, + u32 dst_wrk_index, u32 dst_vls_index, + u32 dst_session_index); + +static inline u32 +vls_get_worker_index (void) +{ + if (vls_mt_wrk_supported ()) + return vlsl->vls_wrk_index; + else + return vcl_get_worker_index (); +} + +static u32 +vls_shared_data_alloc (void) +{ + vls_shared_data_t *vls_shd; + u32 shd_index; + + clib_rwlock_writer_lock (&vlsm->shared_data_lock); + pool_get_zero (vlsm->shared_data_pool, vls_shd); + clib_spinlock_init (&vls_shd->lock); + shd_index = vls_shd - vlsm->shared_data_pool; + clib_rwlock_writer_unlock (&vlsm->shared_data_lock); + + return shd_index; +} + +static u32 +vls_shared_data_index (vls_shared_data_t * vls_shd) +{ + return vls_shd - vlsm->shared_data_pool; +} + +vls_shared_data_t * +vls_shared_data_get (u32 shd_index) +{ + if (pool_is_free_index (vlsm->shared_data_pool, shd_index)) + return 0; + return pool_elt_at_index (vlsm->shared_data_pool, shd_index); +} + +static void +vls_shared_data_free (u32 shd_index) +{ + vls_shared_data_t *vls_shd; + + clib_rwlock_writer_lock (&vlsm->shared_data_lock); + vls_shd = vls_shared_data_get (shd_index); + clib_spinlock_free (&vls_shd->lock); + clib_bitmap_free (vls_shd->listeners); + vec_free (vls_shd->workers_subscribed); + pool_put (vlsm->shared_data_pool, vls_shd); + clib_rwlock_writer_unlock (&vlsm->shared_data_lock); +} + +static inline void +vls_shared_data_pool_rlock (void) +{ + clib_rwlock_reader_lock (&vlsm->shared_data_lock); +} + +static inline void +vls_shared_data_pool_runlock (void) +{ + clib_rwlock_reader_unlock (&vlsm->shared_data_lock); +} + static inline void -vls_table_rlock (void) +vls_mt_table_rlock (void) { - clib_rwlock_reader_lock (&vlsm->vls_table_lock); + if (vlsl->vls_mt_n_threads > 1) + clib_rwlock_reader_lock (&vlsm->vls_table_lock); } static inline void -vls_table_runlock (void) +vls_mt_table_runlock (void) { - clib_rwlock_reader_unlock (&vlsm->vls_table_lock); + if (vlsl->vls_mt_n_threads > 1) + clib_rwlock_reader_unlock (&vlsm->vls_table_lock); } static inline void -vls_table_wlock (void) +vls_mt_table_wlock (void) { - clib_rwlock_writer_lock (&vlsm->vls_table_lock); + if (vlsl->vls_mt_n_threads > 1) + clib_rwlock_writer_lock (&vlsm->vls_table_lock); } static inline void -vls_table_wunlock (void) +vls_mt_table_wunlock (void) { - clib_rwlock_writer_unlock (&vlsm->vls_table_lock); + if (vlsl->vls_mt_n_threads > 1) + clib_rwlock_writer_unlock (&vlsm->vls_table_lock); } typedef enum @@ -90,7 +221,17 @@ static void vls_mt_add (void) { vlsl->vls_mt_n_threads += 1; - vcl_set_worker_index (vlsl->vls_wrk_index); + + /* If multi-thread workers are supported, for each new thread register a new + * vcl worker with vpp. Otherwise, all threads use the same vcl worker, so + * update the vcl worker's thread local worker index variable */ + if (vls_mt_wrk_supported ()) + { + if (vppcom_worker_register () != VPPCOM_OK) + VERR ("failed to register worker"); + } + else + vcl_set_worker_index (vlsl->vls_wrk_index); } static inline void @@ -124,6 +265,26 @@ vls_mt_locks_init (void) pthread_mutex_init (&vlsl->vls_mt_spool_mlock, NULL); } +u8 +vls_is_shared (vcl_locked_session_t * vls) +{ + return (vls->shared_data_index != ~0); +} + +static inline void +vls_lock (vcl_locked_session_t * vls) +{ + if ((vlsl->vls_mt_n_threads > 1) || vls_is_shared (vls)) + clib_spinlock_lock (&vls->lock); +} + +static inline void +vls_unlock (vcl_locked_session_t * vls) +{ + if ((vlsl->vls_mt_n_threads > 1) || vls_is_shared (vls)) + clib_spinlock_unlock (&vls->lock); +} + static inline vcl_session_handle_t vls_to_sh (vcl_locked_session_t * vls) { @@ -135,52 +296,132 @@ vls_to_sh_tu (vcl_locked_session_t * vls) { vcl_session_handle_t sh; sh = vls_to_sh (vls); - vls_table_runlock (); + vls_mt_table_runlock (); return sh; } +static vls_worker_t * +vls_worker_get_current (void) +{ + return pool_elt_at_index (vlsm->workers, vls_get_worker_index ()); +} + +static void +vls_worker_alloc (void) +{ + vls_worker_t *wrk; + + pool_get_zero (vlsm->workers, wrk); + if (vls_mt_wrk_supported ()) + clib_rwlock_init (&wrk->sh_to_vlsh_table_lock); + wrk->wrk_index = vcl_get_worker_index (); +} + +static void +vls_worker_free (vls_worker_t * wrk) +{ + hash_free (wrk->session_handle_to_vlsh_table); + if (vls_mt_wrk_supported ()) + clib_rwlock_free (&wrk->sh_to_vlsh_table_lock); + pool_free (wrk->vls_pool); + pool_put (vlsm->workers, wrk); +} + +static vls_worker_t * +vls_worker_get (u32 wrk_index) +{ + if (pool_is_free_index (vlsm->workers, wrk_index)) + return 0; + return pool_elt_at_index (vlsm->workers, wrk_index); +} + +static void +vls_sh_to_vlsh_table_add (vls_worker_t *wrk, vcl_session_handle_t sh, u32 vlsh) +{ + if (vls_mt_wrk_supported ()) + clib_rwlock_writer_lock (&wrk->sh_to_vlsh_table_lock); + hash_set (wrk->session_handle_to_vlsh_table, sh, vlsh); + if (vls_mt_wrk_supported ()) + clib_rwlock_writer_unlock (&wrk->sh_to_vlsh_table_lock); +} + +static void +vls_sh_to_vlsh_table_del (vls_worker_t *wrk, vcl_session_handle_t sh) +{ + if (vls_mt_wrk_supported ()) + clib_rwlock_writer_lock (&wrk->sh_to_vlsh_table_lock); + hash_unset (wrk->session_handle_to_vlsh_table, sh); + if (vls_mt_wrk_supported ()) + clib_rwlock_writer_unlock (&wrk->sh_to_vlsh_table_lock); +} + +static uword * +vls_sh_to_vlsh_table_get (vls_worker_t *wrk, vcl_session_handle_t sh) +{ + if (vls_mt_wrk_supported ()) + clib_rwlock_reader_lock (&wrk->sh_to_vlsh_table_lock); + uword *vlshp = hash_get (wrk->session_handle_to_vlsh_table, sh); + if (vls_mt_wrk_supported ()) + clib_rwlock_reader_unlock (&wrk->sh_to_vlsh_table_lock); + return vlshp; +} + static vls_handle_t vls_alloc (vcl_session_handle_t sh) { + vls_worker_t *wrk = vls_worker_get_current (); vcl_locked_session_t *vls; - vls_table_wlock (); - pool_get (vlsm->vls_pool, vls); + vls_mt_table_wlock (); + + pool_get_zero (wrk->vls_pool, vls); vls->session_index = vppcom_session_index (sh); vls->worker_index = vppcom_session_worker (sh); - vls->vls_index = vls - vlsm->vls_pool; - hash_set (vlsm->session_index_to_vlsh_table, vls->session_index, - vls->vls_index); + vls->vls_index = vls - wrk->vls_pool; + vls->shared_data_index = ~0; + vls_sh_to_vlsh_table_add (wrk, sh, vls->vls_index); + if (vls_mt_wrk_supported ()) + { + hash_set (vls->vcl_wrk_index_to_session_index, vls->worker_index, + vls->session_index); + vls->owner_vcl_wrk_index = vls->worker_index; + } clib_spinlock_init (&vls->lock); - vls_table_wunlock (); + + vls_mt_table_wunlock (); return vls->vls_index; } static vcl_locked_session_t * vls_get (vls_handle_t vlsh) { - if (pool_is_free_index (vlsm->vls_pool, vlsh)) + vls_worker_t *wrk = vls_worker_get_current (); + if (pool_is_free_index (wrk->vls_pool, vlsh)) return 0; - return pool_elt_at_index (vlsm->vls_pool, vlsh); + return pool_elt_at_index (wrk->vls_pool, vlsh); } static void vls_free (vcl_locked_session_t * vls) { + vls_worker_t *wrk = vls_worker_get_current (); + ASSERT (vls != 0); - hash_unset (vlsm->session_index_to_vlsh_table, vls->session_index); + vls_sh_to_vlsh_table_del ( + wrk, vcl_session_handle_from_index (vls->session_index)); clib_spinlock_free (&vls->lock); - pool_put (vlsm->vls_pool, vls); + pool_put (wrk->vls_pool, vls); } static vcl_locked_session_t * vls_get_and_lock (vls_handle_t vlsh) { + vls_worker_t *wrk = vls_worker_get_current (); vcl_locked_session_t *vls; - if (pool_is_free_index (vlsm->vls_pool, vlsh)) + if (pool_is_free_index (wrk->vls_pool, vlsh)) return 0; - vls = pool_elt_at_index (vlsm->vls_pool, vlsh); - clib_spinlock_lock (&vls->lock); + vls = pool_elt_at_index (wrk->vls_pool, vlsh); + vls_lock (vls); return vls; } @@ -188,40 +429,36 @@ static vcl_locked_session_t * vls_get_w_dlock (vls_handle_t vlsh) { vcl_locked_session_t *vls; - vls_table_rlock (); + vls_mt_table_rlock (); vls = vls_get_and_lock (vlsh); if (!vls) - vls_table_runlock (); + vls_mt_table_runlock (); return vls; } -static inline void -vls_lock (vcl_locked_session_t * vls) -{ - clib_spinlock_lock (&vls->lock); -} - -static inline void -vls_unlock (vcl_locked_session_t * vls) -{ - clib_spinlock_unlock (&vls->lock); -} - static inline void vls_get_and_unlock (vls_handle_t vlsh) { vcl_locked_session_t *vls; - vls_table_rlock (); + vls_mt_table_rlock (); vls = vls_get (vlsh); vls_unlock (vls); - vls_table_runlock (); + vls_mt_table_runlock (); } static inline void vls_dunlock (vcl_locked_session_t * vls) { vls_unlock (vls); - vls_table_runlock (); + vls_mt_table_runlock (); +} + +static vcl_locked_session_t * +vls_session_get (vls_worker_t * wrk, u32 vls_index) +{ + if (pool_is_free_index (wrk->vls_pool, vls_index)) + return 0; + return pool_elt_at_index (wrk->vls_pool, vls_index); } vcl_session_handle_t @@ -247,10 +484,13 @@ vlsh_to_session_index (vls_handle_t vlsh) } vls_handle_t -vls_si_to_vlsh (u32 session_index) +vls_si_wi_to_vlsh (u32 session_index, u32 vcl_wrk_index) { - uword *vlshp; - vlshp = hash_get (vlsm->session_index_to_vlsh_table, session_index); + vls_worker_t *wrk = vls_worker_get_current (); + uword *vlshp = vls_sh_to_vlsh_table_get ( + wrk, + vcl_session_handle_from_wrk_session_index (session_index, vcl_wrk_index)); + return vlshp ? *vlshp : VLS_INVALID_HANDLE; } @@ -259,39 +499,101 @@ vls_session_index_to_vlsh (uint32_t session_index) { vls_handle_t vlsh; - vls_table_rlock (); - vlsh = vls_si_to_vlsh (session_index); - vls_table_runlock (); + vls_mt_table_rlock (); + vlsh = vls_si_wi_to_vlsh (session_index, vcl_get_worker_index ()); + vls_mt_table_runlock (); return vlsh; } -u8 -vls_is_shared (vcl_locked_session_t * vls) -{ - return vec_len (vls->workers_subscribed); -} - u8 vls_is_shared_by_wrk (vcl_locked_session_t * vls, u32 wrk_index) { + vls_shared_data_t *vls_shd; int i; - for (i = 0; i < vec_len (vls->workers_subscribed); i++) - if (vls->workers_subscribed[i] == wrk_index) - return 1; + + if (vls->shared_data_index == ~0) + return 0; + + vls_shared_data_pool_rlock (); + + vls_shd = vls_shared_data_get (vls->shared_data_index); + clib_spinlock_lock (&vls_shd->lock); + + for (i = 0; i < vec_len (vls_shd->workers_subscribed); i++) + if (vls_shd->workers_subscribed[i] == wrk_index) + { + clib_spinlock_unlock (&vls_shd->lock); + vls_shared_data_pool_runlock (); + return 1; + } + clib_spinlock_unlock (&vls_shd->lock); + + vls_shared_data_pool_runlock (); return 0; } static void vls_listener_wrk_set (vcl_locked_session_t * vls, u32 wrk_index, u8 is_active) { - clib_bitmap_set (vls->listeners, wrk_index, is_active); + vls_shared_data_t *vls_shd; + + if (vls->shared_data_index == ~0) + { + clib_warning ("not a shared session"); + return; + } + + vls_shared_data_pool_rlock (); + + vls_shd = vls_shared_data_get (vls->shared_data_index); + + clib_spinlock_lock (&vls_shd->lock); + clib_bitmap_set (vls_shd->listeners, wrk_index, is_active); + clib_spinlock_unlock (&vls_shd->lock); + + vls_shared_data_pool_runlock (); +} + +static u32 +vls_shared_get_owner (vcl_locked_session_t * vls) +{ + vls_shared_data_t *vls_shd; + u32 owner_wrk; + + vls_shared_data_pool_rlock (); + + vls_shd = vls_shared_data_get (vls->shared_data_index); + owner_wrk = vls_shd->owner_wrk_index; + + vls_shared_data_pool_runlock (); + + return owner_wrk; } static u8 vls_listener_wrk_is_active (vcl_locked_session_t * vls, u32 wrk_index) { - return (clib_bitmap_get (vls->listeners, wrk_index) == 1); + vls_shared_data_t *vls_shd; + u8 is_set; + + if (vls->shared_data_index == ~0) + { + clib_warning ("not a shared session"); + return 0; + } + + vls_shared_data_pool_rlock (); + + vls_shd = vls_shared_data_get (vls->shared_data_index); + + clib_spinlock_lock (&vls_shd->lock); + is_set = clib_bitmap_get (vls_shd->listeners, wrk_index); + clib_spinlock_unlock (&vls_shd->lock); + + vls_shared_data_pool_runlock (); + + return (is_set == 1); } static void @@ -309,103 +611,219 @@ vls_listener_wrk_stop_listen (vcl_locked_session_t * vls, u32 wrk_index) wrk = vcl_worker_get (wrk_index); s = vcl_session_get (wrk, vls->session_index); - if (s->session_state != STATE_LISTEN) + if (s->session_state != VCL_STATE_LISTEN) return; vcl_send_session_unlisten (wrk, s); - s->session_state = STATE_LISTEN_NO_MQ; + s->session_state = VCL_STATE_LISTEN_NO_MQ; vls_listener_wrk_set (vls, wrk_index, 0 /* is_active */ ); } +static int +vls_shared_data_subscriber_position (vls_shared_data_t * vls_shd, + u32 wrk_index) +{ + int i; + + for (i = 0; i < vec_len (vls_shd->workers_subscribed); i++) + { + if (vls_shd->workers_subscribed[i] == wrk_index) + return i; + } + return -1; +} + int vls_unshare_session (vcl_locked_session_t * vls, vcl_worker_t * wrk) { - int i, do_disconnect; + vls_shared_data_t *vls_shd; + int do_disconnect, pos; + u32 n_subscribers; vcl_session_t *s; + if (vls->shared_data_index == ~0) + return 0; + s = vcl_session_get (wrk, vls->session_index); - if (s->session_state == STATE_LISTEN) + if (s->session_state == VCL_STATE_LISTEN) vls_listener_wrk_set (vls, wrk->wrk_index, 0 /* is_active */ ); - for (i = 0; i < vec_len (vls->workers_subscribed); i++) - { - if (vls->workers_subscribed[i] != wrk->wrk_index) - continue; + vls_shared_data_pool_rlock (); - if (s->rx_fifo) - { - svm_fifo_del_subscriber (s->rx_fifo, wrk->vpp_wrk_index); - svm_fifo_del_subscriber (s->tx_fifo, wrk->vpp_wrk_index); - } - vec_del1 (vls->workers_subscribed, i); - do_disconnect = s->session_state == STATE_LISTEN; - vcl_session_cleanup (wrk, s, vcl_session_handle (s), do_disconnect); - return 0; - } + vls_shd = vls_shared_data_get (vls->shared_data_index); + clib_spinlock_lock (&vls_shd->lock); - /* Return, if this is not the owning worker */ - if (vls->worker_index != wrk->wrk_index) - return 0; + pos = vls_shared_data_subscriber_position (vls_shd, wrk->wrk_index); + if (pos < 0) + { + clib_warning ("worker %u not subscribed for vls %u", wrk->wrk_index, + vls->worker_index); + goto done; + } - /* Check if we can change owner or close */ - if (vec_len (vls->workers_subscribed)) + /* + * Unsubscribe from share data and fifos + */ + if (s->rx_fifo) { - vls->worker_index = vls->workers_subscribed[0]; - vec_del1 (vls->workers_subscribed, 0); - vcl_send_session_worker_update (wrk, s, vls->worker_index); - if (vec_len (vls->workers_subscribed)) - clib_warning ("more workers need to be updated"); + svm_fifo_del_subscriber (s->rx_fifo, wrk->vpp_wrk_index); + svm_fifo_del_subscriber (s->tx_fifo, wrk->vpp_wrk_index); } - else + vec_del1 (vls_shd->workers_subscribed, pos); + + /* + * Cleanup vcl state + */ + n_subscribers = vec_len (vls_shd->workers_subscribed); + do_disconnect = s->session_state == VCL_STATE_LISTEN || !n_subscribers; + vcl_session_cleanup (wrk, s, vcl_session_handle (s), do_disconnect); + + /* + * No subscriber left, cleanup shared data + */ + if (!n_subscribers) { - vcl_session_cleanup (wrk, s, vcl_session_handle (s), - 1 /* do_disconnect */ ); + u32 shd_index = vls_shared_data_index (vls_shd); + + clib_spinlock_unlock (&vls_shd->lock); + vls_shared_data_pool_runlock (); + + vls_shared_data_free (shd_index); + + /* All locks have been dropped */ + return 0; } + /* Return, if this is not the owning worker */ + if (vls_shd->owner_wrk_index != wrk->wrk_index) + goto done; + + ASSERT (vec_len (vls_shd->workers_subscribed)); + + /* + * Check if we can change owner or close + */ + vls_shd->owner_wrk_index = vls_shd->workers_subscribed[0]; + vcl_send_session_worker_update (wrk, s, vls_shd->owner_wrk_index); + + /* XXX is this still needed? */ + if (vec_len (vls_shd->workers_subscribed) > 1) + clib_warning ("more workers need to be updated"); + +done: + + clib_spinlock_unlock (&vls_shd->lock); + vls_shared_data_pool_runlock (); + return 0; } void -vls_share_vcl_session (vcl_worker_t * wrk, vcl_session_t * s) +vls_init_share_session (vls_worker_t * vls_wrk, vcl_locked_session_t * vls) { - vcl_locked_session_t *vls; + vls_shared_data_t *vls_shd; + + u32 vls_shd_index = vls_shared_data_alloc (); + + vls_shared_data_pool_rlock (); + + vls_shd = vls_shared_data_get (vls_shd_index); + vls_shd->owner_wrk_index = vls_wrk->wrk_index; + vls->shared_data_index = vls_shd_index; + vec_add1 (vls_shd->workers_subscribed, vls_wrk->wrk_index); + + vls_shared_data_pool_runlock (); +} + +void +vls_share_session (vls_worker_t * vls_wrk, vcl_locked_session_t * vls) +{ + vcl_worker_t *vcl_wrk = vcl_worker_get (vls_wrk->wrk_index); + vls_shared_data_t *vls_shd; + vcl_session_t *s; + + s = vcl_session_get (vcl_wrk, vls->session_index); + if (!s) + { + clib_warning ("wrk %u session %u vls %u NOT AVAILABLE", + vcl_wrk->wrk_index, vls->session_index, vls->vls_index); + return; + } + + ASSERT (vls->shared_data_index != ~0); + + /* Reinit session lock */ + clib_spinlock_init (&vls->lock); + + vls_shared_data_pool_rlock (); + + vls_shd = vls_shared_data_get (vls->shared_data_index); + + clib_spinlock_lock (&vls_shd->lock); + vec_add1 (vls_shd->workers_subscribed, vls_wrk->wrk_index); + clib_spinlock_unlock (&vls_shd->lock); + + vls_shared_data_pool_runlock (); - vls = vls_get (vls_si_to_vlsh (s->session_index)); - if (!vls) - return; - vls_lock (vls); - vec_add1 (vls->workers_subscribed, wrk->wrk_index); if (s->rx_fifo) { - svm_fifo_add_subscriber (s->rx_fifo, wrk->vpp_wrk_index); - svm_fifo_add_subscriber (s->tx_fifo, wrk->vpp_wrk_index); + svm_fifo_add_subscriber (s->rx_fifo, vcl_wrk->vpp_wrk_index); + svm_fifo_add_subscriber (s->tx_fifo, vcl_wrk->vpp_wrk_index); } - else if (s->session_state == STATE_LISTEN) + else if (s->session_state == VCL_STATE_LISTEN) { - s->session_state = STATE_LISTEN_NO_MQ; + s->session_state = VCL_STATE_LISTEN_NO_MQ; } +} - vls_unlock (vls); +static void +vls_share_sessions (vls_worker_t * vls_parent_wrk, vls_worker_t * vls_wrk) +{ + vcl_locked_session_t *vls, *parent_vls; + + /* *INDENT-OFF* */ + pool_foreach (vls, vls_wrk->vls_pool) { + /* Initialize sharing on parent session */ + if (vls->shared_data_index == ~0) + { + parent_vls = vls_session_get (vls_parent_wrk, vls->vls_index); + vls_init_share_session (vls_parent_wrk, parent_vls); + vls->shared_data_index = parent_vls->shared_data_index; + } + vls_share_session (vls_wrk, vls); + } + /* *INDENT-ON* */ } void vls_worker_copy_on_fork (vcl_worker_t * parent_wrk) { + vls_worker_t *vls_wrk = vls_worker_get_current (), *vls_parent_wrk; vcl_worker_t *wrk = vcl_worker_get_current (); - vcl_session_t *s; + u32 vls_index, session_index, wrk_index; + vcl_session_handle_t sh; - wrk->vpp_event_queues = vec_dup (parent_wrk->vpp_event_queues); + /* + * init vcl worker + */ wrk->sessions = pool_dup (parent_wrk->sessions); wrk->session_index_by_vpp_handles = hash_dup (parent_wrk->session_index_by_vpp_handles); - vls_table_rlock (); + /* + * init vls worker + */ + vls_parent_wrk = vls_worker_get (parent_wrk->wrk_index); /* *INDENT-OFF* */ - pool_foreach (s, wrk->sessions, ({ - vls_share_vcl_session (wrk, s); - })); + hash_foreach (sh, vls_index, vls_parent_wrk->session_handle_to_vlsh_table, + ({ + vcl_session_handle_parse (sh, &wrk_index, &session_index); + hash_set (vls_wrk->session_handle_to_vlsh_table, + vcl_session_handle_from_index (session_index), vls_index); + })); /* *INDENT-ON* */ + vls_wrk->vls_pool = pool_dup (vls_parent_wrk->vls_pool); - vls_table_runlock (); + vls_share_sessions (vls_parent_wrk, vls_wrk); } static void @@ -420,7 +838,7 @@ vls_mt_acq_locks (vcl_locked_session_t * vls, vls_mt_ops_t op, int *locks_acq) s = vcl_session_get (wrk, vls->session_index); if (PREDICT_FALSE (!s)) return; - is_nonblk = VCL_SESS_ATTR_TEST (s->attr, VCL_SESS_ATTR_NONBLOCK); + is_nonblk = vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK); } switch (op) @@ -466,15 +884,140 @@ vls_mt_rel_locks (int locks_acq) vls_mt_create_unlock (); } -#define vls_mt_guard(_vls, _op) \ - int _locks_acq = 0; \ - if (PREDICT_FALSE (vcl_get_worker_index () == ~0)) \ - vls_mt_add (); \ - if (PREDICT_FALSE (vlsl->vls_mt_n_threads > 1)) \ - vls_mt_acq_locks (_vls, _op, &_locks_acq); \ +static inline u8 +vls_mt_session_should_migrate (vcl_locked_session_t * vls) +{ + return (vls_mt_wrk_supported () + && vls->worker_index != vcl_get_worker_index ()); +} + +static vcl_locked_session_t * +vls_mt_session_migrate (vcl_locked_session_t *vls) +{ + u32 wrk_index = vcl_get_worker_index (); + vcl_worker_t *wrk; + vls_worker_t *vls_wrk = vls_worker_get_current (); + u32 src_sid, sid, vls_index, own_vcl_wrk_index; + vcl_session_t *session; + uword *p; + + ASSERT (vls_mt_wrk_supported () && vls->worker_index != wrk_index); + + /* + * VCL session on current vcl worker already allocated. Update current + * owner worker and index and return + */ + if ((p = hash_get (vls->vcl_wrk_index_to_session_index, wrk_index))) + { + vls->worker_index = wrk_index; + vls->session_index = (u32) p[0]; + return vls; + } + + /* + * Ask vcl worker that owns the original vcl session to clone it into + * current vcl worker session pool + */ + + if (!(p = hash_get (vls->vcl_wrk_index_to_session_index, + vls->owner_vcl_wrk_index))) + { + VERR ("session in owner worker(%u) is free", vls->owner_vcl_wrk_index); + ASSERT (0); + vls_unlock (vls); + vls_mt_table_runlock (); + return 0; + } + + src_sid = (u32) p[0]; + wrk = vcl_worker_get_current (); + session = vcl_session_alloc (wrk); + sid = session->session_index; + VDBG (1, "migrate session of worker (session): %u (%u) -> %u (%u)", + vls->owner_vcl_wrk_index, src_sid, wrk_index, sid); + + /* Drop lock to prevent dead lock when dst wrk trying to get lock. */ + vls_index = vls->vls_index; + own_vcl_wrk_index = vls->owner_vcl_wrk_index; + vls_unlock (vls); + vls_mt_table_runlock (); + vls_send_clone_and_share_rpc (wrk, vls_index, sid, vls_get_worker_index (), + own_vcl_wrk_index, vls_index, src_sid); + + if (PREDICT_FALSE (wrk->rpc_done == VLS_RPC_STATE_SESSION_NOT_EXIST)) + { + VWRN ("session %u not exist", src_sid); + goto err; + } + else if (PREDICT_FALSE (wrk->rpc_done == VLS_RPC_STATE_INIT)) + { + VWRN ("failed to wait rpc response"); + goto err; + } + else if (PREDICT_FALSE ((session->flags & VCL_SESSION_F_IS_VEP) && + session->vep.next_sh != ~0)) + { + VERR ("can't migrate nonempty epoll session"); + ASSERT (0); + goto err; + } + else if (PREDICT_FALSE (!(session->flags & VCL_SESSION_F_IS_VEP) && + session->session_state != VCL_STATE_CLOSED)) + { + VERR ("migrate NOT supported, session_status (%u)", + session->session_state); + ASSERT (0); + goto err; + } + + vls = vls_get_w_dlock (vls_index); + if (PREDICT_FALSE (!vls)) + { + VWRN ("failed to get vls %u", vls_index); + goto err; + } + + session->session_index = sid; + vls->worker_index = wrk_index; + vls->session_index = sid; + hash_set (vls->vcl_wrk_index_to_session_index, wrk_index, sid); + vls_sh_to_vlsh_table_add (vls_wrk, vcl_session_handle (session), + vls->vls_index); + return vls; + +err: + vcl_session_free (wrk, session); + return 0; +} + +static inline void +vls_mt_detect (void) +{ + if (PREDICT_FALSE (vcl_get_worker_index () == ~0)) + vls_mt_add (); +} + +#define vls_mt_guard(_vls, _op) \ + int _locks_acq = 0; \ + if (vls_mt_wrk_supported ()) \ + { \ + if (PREDICT_FALSE (_vls && \ + ((vcl_locked_session_t *) _vls)->worker_index != \ + vcl_get_worker_index ())) \ + { \ + _vls = vls_mt_session_migrate (_vls); \ + if (PREDICT_FALSE (!_vls)) \ + return VPPCOM_EBADFD; \ + } \ + } \ + else \ + { \ + if (PREDICT_FALSE (vlsl->vls_mt_n_threads > 1)) \ + vls_mt_acq_locks (_vls, _op, &_locks_acq); \ + } -#define vls_mt_unguard() \ - if (PREDICT_FALSE (_locks_acq)) \ +#define vls_mt_unguard() \ + if (PREDICT_FALSE (_locks_acq)) \ vls_mt_rel_locks (_locks_acq) int @@ -483,6 +1026,7 @@ vls_write (vls_handle_t vlsh, void *buf, size_t nbytes) vcl_locked_session_t *vls; int rv; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (vlsh))) return VPPCOM_EBADFD; @@ -499,6 +1043,7 @@ vls_write_msg (vls_handle_t vlsh, void *buf, size_t nbytes) vcl_locked_session_t *vls; int rv; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (vlsh))) return VPPCOM_EBADFD; vls_mt_guard (vls, VLS_MT_OP_WRITE); @@ -515,6 +1060,7 @@ vls_sendto (vls_handle_t vlsh, void *buf, int buflen, int flags, vcl_locked_session_t *vls; int rv; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (vlsh))) return VPPCOM_EBADFD; vls_mt_guard (vls, VLS_MT_OP_WRITE); @@ -530,6 +1076,7 @@ vls_read (vls_handle_t vlsh, void *buf, size_t nbytes) vcl_locked_session_t *vls; int rv; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (vlsh))) return VPPCOM_EBADFD; vls_mt_guard (vls, VLS_MT_OP_READ); @@ -546,6 +1093,7 @@ vls_recvfrom (vls_handle_t vlsh, void *buffer, uint32_t buflen, int flags, vcl_locked_session_t *vls; int rv; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (vlsh))) return VPPCOM_EBADFD; vls_mt_guard (vls, VLS_MT_OP_READ); @@ -562,11 +1110,15 @@ vls_attr (vls_handle_t vlsh, uint32_t op, void *buffer, uint32_t * buflen) vcl_locked_session_t *vls; int rv; - if (PREDICT_FALSE (vcl_get_worker_index () == ~0)) - vls_mt_add (); - + vls_mt_detect (); if (!(vls = vls_get_w_dlock (vlsh))) return VPPCOM_EBADFD; + if (vls_mt_session_should_migrate (vls)) + { + vls = vls_mt_session_migrate (vls); + if (PREDICT_FALSE (!vls)) + return VPPCOM_EBADFD; + } rv = vppcom_session_attr (vls_to_sh_tu (vls), op, buffer, buflen); vls_get_and_unlock (vlsh); return rv; @@ -578,6 +1130,7 @@ vls_bind (vls_handle_t vlsh, vppcom_endpt_t * ep) vcl_locked_session_t *vls; int rv; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (vlsh))) return VPPCOM_EBADFD; rv = vppcom_session_bind (vls_to_sh_tu (vls), ep); @@ -591,6 +1144,7 @@ vls_listen (vls_handle_t vlsh, int q_len) vcl_locked_session_t *vls; int rv; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (vlsh))) return VPPCOM_EBADFD; vls_mt_guard (vls, VLS_MT_OP_XPOLL); @@ -606,6 +1160,7 @@ vls_connect (vls_handle_t vlsh, vppcom_endpt_t * server_ep) vcl_locked_session_t *vls; int rv; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (vlsh))) return VPPCOM_EBADFD; vls_mt_guard (vls, VLS_MT_OP_XPOLL); @@ -620,20 +1175,23 @@ vls_mp_checks (vcl_locked_session_t * vls, int is_add) { vcl_worker_t *wrk = vcl_worker_get_current (); vcl_session_t *s; + u32 owner_wrk; + + if (vls_mt_wrk_supported ()) + return; s = vcl_session_get (wrk, vls->session_index); switch (s->session_state) { - case STATE_LISTEN: + case VCL_STATE_LISTEN: if (is_add) { - if (vls->worker_index == wrk->wrk_index) - vls_listener_wrk_set (vls, wrk->wrk_index, 1 /* is_active */ ); + vls_listener_wrk_set (vls, vls->worker_index, 1 /* is_active */ ); break; } vls_listener_wrk_stop_listen (vls, vls->worker_index); break; - case STATE_LISTEN_NO_MQ: + case VCL_STATE_LISTEN_NO_MQ: if (!is_add) break; @@ -647,8 +1205,9 @@ vls_mp_checks (vcl_locked_session_t * vls, int is_add) * that it is fine to listen and not accept new sessions for a * given listener. Without it, we would accumulate unhandled * accepts on the passive worker message queue. */ - if (!vls_listener_wrk_is_active (vls, vls->worker_index)) - vls_listener_wrk_stop_listen (vls, vls->worker_index); + owner_wrk = vls_shared_get_owner (vls); + if (!vls_listener_wrk_is_active (vls, owner_wrk)) + vls_listener_wrk_stop_listen (vls, owner_wrk); break; default: break; @@ -662,6 +1221,7 @@ vls_accept (vls_handle_t listener_vlsh, vppcom_endpt_t * ep, int flags) vcl_locked_session_t *vls; int sh; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (listener_vlsh))) return VPPCOM_EBADFD; if (vcl_n_workers () > 1) @@ -683,8 +1243,10 @@ vls_create (uint8_t proto, uint8_t is_nonblocking) { vcl_session_handle_t sh; vls_handle_t vlsh; + vcl_locked_session_t *vls = NULL; - vls_mt_guard (0, VLS_MT_OP_SPOOL); + vls_mt_detect (); + vls_mt_guard (vls, VLS_MT_OP_SPOOL); sh = vppcom_session_create (proto, is_nonblocking); vls_mt_unguard (); if (sh == INVALID_SESSION_ID) @@ -697,37 +1259,74 @@ vls_create (uint8_t proto, uint8_t is_nonblocking) return vlsh; } +static void +vls_mt_session_cleanup (vcl_locked_session_t * vls) +{ + u32 session_index, wrk_index, current_vcl_wrk; + vcl_worker_t *wrk = vcl_worker_get_current (); + + ASSERT (vls_mt_wrk_supported ()); + + current_vcl_wrk = vcl_get_worker_index (); + + /* *INDENT-OFF* */ + hash_foreach (wrk_index, session_index, vls->vcl_wrk_index_to_session_index, + ({ + if (current_vcl_wrk != wrk_index) + vls_send_session_cleanup_rpc (wrk, wrk_index, session_index); + })); + /* *INDENT-ON* */ + hash_free (vls->vcl_wrk_index_to_session_index); +} + int vls_close (vls_handle_t vlsh) { vcl_locked_session_t *vls; int rv; - vls_table_wlock (); + vls_mt_detect (); + vls_mt_table_wlock (); vls = vls_get_and_lock (vlsh); if (!vls) { - vls_table_wunlock (); + vls_mt_table_wunlock (); return VPPCOM_EBADFD; } - vls_mt_guard (0, VLS_MT_OP_SPOOL); + vls_mt_guard (vls, VLS_MT_OP_SPOOL); + if (vls_is_shared (vls)) - { - /* At least two workers share the session so vls won't be freed */ - vls_unshare_session (vls, vcl_worker_get_current ()); - vls_unlock (vls); - vls_mt_unguard (); - vls_table_wunlock (); - return VPPCOM_OK; - } + rv = vls_unshare_session (vls, vcl_worker_get_current ()); + else + rv = vppcom_session_close (vls_to_sh (vls)); + + if (vls_mt_wrk_supported ()) + vls_mt_session_cleanup (vls); - rv = vppcom_session_close (vls_to_sh (vls)); vls_free (vls); vls_mt_unguard (); - vls_table_wunlock (); + vls_mt_table_wunlock (); + + return rv; +} + +int +vls_shutdown (vls_handle_t vlsh) +{ + vcl_locked_session_t *vls; + int rv; + + vls_mt_detect (); + if (!(vls = vls_get_w_dlock (vlsh))) + return VPPCOM_EBADFD; + + vls_mt_guard (vls, VLS_MT_OP_SPOOL); + rv = vppcom_session_shutdown (vls_to_sh (vls)); + vls_mt_unguard (); + vls_get_and_unlock (vlsh); return rv; } @@ -738,8 +1337,7 @@ vls_epoll_create (void) vcl_session_handle_t sh; vls_handle_t vlsh; - if (PREDICT_FALSE (vcl_get_worker_index () == ~0)) - vls_mt_add (); + vls_mt_detect (); sh = vppcom_epoll_create (); if (sh == INVALID_SESSION_ID) @@ -755,16 +1353,9 @@ vls_epoll_create (void) static void vls_epoll_ctl_mp_checks (vcl_locked_session_t * vls, int op) { - if (vcl_n_workers () <= 1) - { - vlsl->epoll_mp_check = 1; - return; - } - - if (op == EPOLL_CTL_MOD) + if (vcl_n_workers () <= 1 || op == EPOLL_CTL_MOD) return; - vlsl->epoll_mp_check = 1; vls_mp_checks (vls, op == EPOLL_CTL_ADD); } @@ -776,25 +1367,31 @@ vls_epoll_ctl (vls_handle_t ep_vlsh, int op, vls_handle_t vlsh, vcl_session_handle_t ep_sh, sh; int rv; - vls_table_rlock (); + vls_mt_detect (); + vls_mt_table_rlock (); ep_vls = vls_get_and_lock (ep_vlsh); - vls = vls_get_and_lock (vlsh); - ep_sh = vls_to_sh (ep_vls); - sh = vls_to_sh (vls); - if (PREDICT_FALSE (!vlsl->epoll_mp_check)) - vls_epoll_ctl_mp_checks (vls, op); + if (vls_mt_session_should_migrate (ep_vls)) + { + ep_vls = vls_mt_session_migrate (ep_vls); + if (PREDICT_FALSE (!ep_vls)) + return VPPCOM_EBADFD; + } - vls_table_runlock (); + ep_sh = vls_to_sh (ep_vls); + vls = vls_get_and_lock (vlsh); + sh = vls_to_sh (vls); + vls_epoll_ctl_mp_checks (vls, op); + vls_mt_table_runlock (); rv = vppcom_epoll_ctl (ep_sh, op, sh, event); - vls_table_rlock (); + vls_mt_table_rlock (); ep_vls = vls_get (ep_vlsh); vls = vls_get (vlsh); vls_unlock (vls); vls_unlock (ep_vls); - vls_table_runlock (); + vls_mt_table_runlock (); return rv; } @@ -802,12 +1399,13 @@ int vls_epoll_wait (vls_handle_t ep_vlsh, struct epoll_event *events, int maxevents, double wait_for_time) { - vcl_locked_session_t *vls; + vcl_locked_session_t *vls, *vls_tmp = NULL; int rv; + vls_mt_detect (); if (!(vls = vls_get_w_dlock (ep_vlsh))) return VPPCOM_EBADFD; - vls_mt_guard (0, VLS_MT_OP_XPOLL); + vls_mt_guard (vls_tmp, VLS_MT_OP_XPOLL); rv = vppcom_epoll_wait (vls_to_sh_tu (vls), events, maxevents, wait_for_time); vls_mt_unguard (); @@ -836,14 +1434,14 @@ vls_select_mp_checks (vcl_si_set * read_map) wrk = vcl_worker_get_current (); /* *INDENT-OFF* */ - clib_bitmap_foreach (si, read_map, ({ + clib_bitmap_foreach (si, read_map) { s = vcl_session_get (wrk, si); - if (s->session_state == STATE_LISTEN) + if (s->session_state == VCL_STATE_LISTEN) { vls = vls_get (vls_session_index_to_vlsh (si)); vls_mp_checks (vls, 1 /* is_add */); } - })); + } /* *INDENT-ON* */ } @@ -852,8 +1450,10 @@ vls_select (int n_bits, vcl_si_set * read_map, vcl_si_set * write_map, vcl_si_set * except_map, double wait_for_time) { int rv; + vcl_locked_session_t *vls = NULL; - vls_mt_guard (0, VLS_MT_OP_XPOLL); + vls_mt_detect (); + vls_mt_guard (vls, VLS_MT_OP_XPOLL); if (PREDICT_FALSE (!vlsl->select_mp_check)) vls_select_mp_checks (read_map); rv = vppcom_select (n_bits, read_map, write_map, except_map, wait_for_time); @@ -873,26 +1473,27 @@ vls_unshare_vcl_worker_sessions (vcl_worker_t * wrk) current_wrk = vcl_get_worker_index (); is_current = current_wrk == wrk->wrk_index; - vls_table_wlock (); /* *INDENT-OFF* */ - pool_foreach (s, wrk->sessions, ({ - vls = vls_get (vls_si_to_vlsh (s->session_index)); + pool_foreach (s, wrk->sessions) { + vls = vls_get (vls_si_wi_to_vlsh (s->session_index, wrk->wrk_index)); if (vls && (is_current || vls_is_shared_by_wrk (vls, current_wrk))) vls_unshare_session (vls, wrk); - })); + } /* *INDENT-ON* */ - - vls_table_wunlock (); } static void vls_cleanup_vcl_worker (vcl_worker_t * wrk) { + vls_worker_t *vls_wrk = vls_worker_get (wrk->wrk_index); + /* Unshare sessions and also cleanup worker since child may have * called _exit () and therefore vcl may not catch the event */ vls_unshare_vcl_worker_sessions (wrk); vcl_worker_cleanup (wrk, 1 /* notify vpp */ ); + + vls_worker_free (vls_wrk); } static void @@ -967,6 +1568,11 @@ static void vls_incercept_sigchld () { struct sigaction sa; + if (old_sa.sa_sigaction) + { + VDBG (0, "have intercepted sigchld"); + return; + } clib_memset (&sa, 0, sizeof (sa)); sa.sa_sigaction = vls_intercept_sigchld_handler; sa.sa_flags = SA_SIGINFO; @@ -988,39 +1594,30 @@ static void vls_app_fork_child_handler (void) { vcl_worker_t *parent_wrk; - int rv, parent_wrk_index; - u8 *child_name; + int parent_wrk_index; parent_wrk_index = vcl_get_worker_index (); VDBG (0, "initializing forked child %u with parent wrk %u", getpid (), parent_wrk_index); /* - * Allocate worker + * Clear old state */ vcl_set_worker_index (~0); - if (!vcl_worker_alloc_and_init ()) - VERR ("couldn't allocate new worker"); /* - * Attach to binary api + * Allocate and register vcl worker with vpp */ - child_name = format (0, "%v-child-%u%c", vcm->app_name, getpid (), 0); - vcl_cleanup_bapi (); - vppcom_api_hookup (); - vcm->app_state = STATE_APP_START; - rv = vppcom_connect_to_vpp ((char *) child_name); - vec_free (child_name); - if (rv) + if (vppcom_worker_register ()) { - VERR ("couldn't connect to VPP!"); + VERR ("couldn't register new worker!"); return; } /* - * Register worker with vpp and share sessions + * Allocate/initialize vls worker and share sessions */ - vcl_worker_register_with_vpp (); + vls_worker_alloc (); parent_wrk = vcl_worker_get (parent_wrk_index); vls_worker_copy_on_fork (parent_wrk); parent_wrk->forked_child = vcl_get_worker_index (); @@ -1029,7 +1626,6 @@ vls_app_fork_child_handler (void) vlsl->vls_mt_n_threads = 0; vlsl->vls_wrk_index = vcl_get_worker_index (); vlsl->select_mp_check = 0; - vlsl->epoll_mp_check = 0; vls_mt_locks_init (); VDBG (0, "forked child main worker initialized"); @@ -1047,8 +1643,141 @@ vls_app_fork_parent_handler (void) void vls_app_exit (void) { + vls_worker_t *wrk = vls_worker_get_current (); + /* Unshare the sessions. VCL will clean up the worker */ vls_unshare_vcl_worker_sessions (vcl_worker_get_current ()); + vls_worker_free (wrk); +} + +static void +vls_clone_and_share_rpc_handler (void *args) +{ + vls_clone_and_share_msg_t *msg = (vls_clone_and_share_msg_t *) args; + vls_worker_t *wrk = vls_worker_get_current (), *dst_wrk; + vcl_locked_session_t *vls, *dst_vls; + vcl_worker_t *vcl_wrk = vcl_worker_get_current (), *dst_vcl_wrk; + vcl_session_t *s, *dst_s; + + VDBG (1, "process session clone of worker (session): %u (%u) -> %u (%u)", + vcl_wrk->wrk_index, msg->session_index, msg->origin_vcl_wrk, + msg->origin_session_index); + + /* VCL locked session can't been protected, so DONT touch it. + * VCL session may been free, check it. + */ + dst_vcl_wrk = vcl_worker_get (msg->origin_vcl_wrk); + s = vcl_session_get (vcl_wrk, msg->session_index); + if (PREDICT_FALSE (!s)) + { + dst_vcl_wrk->rpc_done = VLS_RPC_STATE_SESSION_NOT_EXIST; + return; + } + + if (!vls_mt_wrk_supported ()) + { + vls = vls_session_get (wrk, msg->vls_index); + vls_init_share_session (wrk, vls); + dst_wrk = vls_worker_get (msg->origin_vls_wrk); + dst_vls = vls_session_get (dst_wrk, msg->origin_vls_index); + dst_vls->shared_data_index = vls->shared_data_index; + } + dst_s = vcl_session_get (dst_vcl_wrk, msg->origin_session_index); + clib_memcpy (dst_s, s, sizeof (*s)); + + dst_vcl_wrk->rpc_done = VLS_RPC_STATE_SUCCESS; +} + +static void +vls_session_cleanup_rpc_handler (void *args) +{ + vls_sess_cleanup_msg_t *msg = (vls_sess_cleanup_msg_t *) args; + vcl_worker_t *wrk = vcl_worker_get_current (); + vls_worker_t *vls_wrk = vls_worker_get_current (); + vcl_session_handle_t sh = vcl_session_handle_from_index (msg->session_index); + + VDBG (1, "process session cleanup of worker (session): %u (%u) from %u ()", + wrk->wrk_index, msg->session_index, msg->origin_vcl_wrk); + + vppcom_session_close (sh); + vls_sh_to_vlsh_table_del (vls_wrk, sh); +} + +static void +vls_rpc_handler (void *args) +{ + vls_rpc_msg_t *msg = (vls_rpc_msg_t *) args; + switch (msg->type) + { + case VLS_RPC_CLONE_AND_SHARE: + vls_clone_and_share_rpc_handler (msg->data); + break; + case VLS_RPC_SESS_CLEANUP: + vls_session_cleanup_rpc_handler (msg->data); + break; + default: + break; + } +} + +void +vls_send_clone_and_share_rpc (vcl_worker_t *wrk, u32 origin_vls_index, + u32 session_index, u32 vls_wrk_index, + u32 dst_wrk_index, u32 dst_vls_index, + u32 dst_session_index) +{ + u8 data[sizeof (u8) + sizeof (vls_clone_and_share_msg_t)]; + vls_clone_and_share_msg_t *msg; + vls_rpc_msg_t *rpc; + int ret; + f64 timeout = clib_time_now (&wrk->clib_time) + VLS_WORKER_RPC_TIMEOUT; + + rpc = (vls_rpc_msg_t *) & data; + rpc->type = VLS_RPC_CLONE_AND_SHARE; + msg = (vls_clone_and_share_msg_t *) & rpc->data; + msg->origin_vls_wrk = vls_wrk_index; + msg->origin_vls_index = origin_vls_index; + msg->origin_vcl_wrk = wrk->wrk_index; + msg->origin_session_index = session_index; + msg->vls_index = dst_vls_index; + msg->session_index = dst_session_index; + + /* Try lock and handle rpcs if two threads send each other + * clone requests at the same time. + */ + wrk->rpc_done = VLS_RPC_STATE_INIT; + while (!clib_spinlock_trylock (&vlsm->worker_rpc_lock)) + vcl_flush_mq_events (); + ret = vcl_send_worker_rpc (dst_wrk_index, rpc, sizeof (data)); + + VDBG (1, "send session clone to wrk (session): %u (%u) -> %u (%u), ret=%d", + dst_wrk_index, msg->session_index, msg->origin_vcl_wrk, + msg->origin_session_index, ret); + while (!ret && wrk->rpc_done == VLS_RPC_STATE_INIT && + clib_time_now (&wrk->clib_time) < timeout) + ; + clib_spinlock_unlock (&vlsm->worker_rpc_lock); +} + +void +vls_send_session_cleanup_rpc (vcl_worker_t * wrk, + u32 dst_wrk_index, u32 dst_session_index) +{ + u8 data[sizeof (u8) + sizeof (vls_sess_cleanup_msg_t)]; + vls_sess_cleanup_msg_t *msg; + vls_rpc_msg_t *rpc; + int ret; + + rpc = (vls_rpc_msg_t *) & data; + rpc->type = VLS_RPC_SESS_CLEANUP; + msg = (vls_sess_cleanup_msg_t *) & rpc->data; + msg->origin_vcl_wrk = wrk->wrk_index; + msg->session_index = dst_session_index; + + ret = vcl_send_worker_rpc (dst_wrk_index, rpc, sizeof (data)); + + VDBG (1, "send session cleanup to wrk (session): %u (%u) from %u, ret=%d", + dst_wrk_index, msg->session_index, msg->origin_vcl_wrk, ret); } int @@ -1058,17 +1787,51 @@ vls_app_create (char *app_name) if ((rv = vppcom_app_create (app_name))) return rv; + vlsm = clib_mem_alloc (sizeof (vls_main_t)); clib_memset (vlsm, 0, sizeof (*vlsm)); clib_rwlock_init (&vlsm->vls_table_lock); + clib_rwlock_init (&vlsm->shared_data_lock); + clib_spinlock_init (&vlsm->worker_rpc_lock); + pool_alloc (vlsm->workers, vcm->cfg.max_workers); + pthread_atfork (vls_app_pre_fork, vls_app_fork_parent_handler, vls_app_fork_child_handler); atexit (vls_app_exit); + vls_worker_alloc (); vlsl->vls_wrk_index = vcl_get_worker_index (); vls_mt_locks_init (); + vcm->wrk_rpc_fn = vls_rpc_handler; return VPPCOM_OK; } +unsigned char +vls_use_eventfd (void) +{ + return vcm->cfg.use_mq_eventfd; +} + +unsigned char +vls_mt_wrk_supported (void) +{ + return vcm->cfg.mt_wrk_supported; +} + +int +vls_use_real_epoll (void) +{ + if (vcl_get_worker_index () == ~0) + return 0; + + return vcl_worker_get_current ()->vcl_needs_real_epoll; +} + +void +vls_register_vcl_worker (void) +{ + vls_mt_add (); +} + /* * fd.io coding-style-patch-verification: ON *