ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: fix session_handle_to_vlsh_table update after session migrate

Browse Source 
Type: fix

Signed-off-by: wanghanlin <wanghanlin@corp.netease.com>
Change-Id: I6698749163b0ed38093d8439e94b18b6841dc6ce
This commit is contained in:
wanghanlin
2021-01-08 14:57:11 +08:00
parent b6f367e3a1
commit e8f848a56e
1 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/vcl/vcl_locked.c
View File

@ -38,6 +38,7 @@ typedef struct vcl_locked_session_
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;
@ -312,6 +313,8 @@ 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 ();
}
@ -319,6 +322,8 @@ 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);
}
@ -331,6 +336,37 @@ vls_worker_get (u32 wrk_index)
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)
{
@ -344,7 +380,7 @@ vls_alloc (vcl_session_handle_t sh)
vls->worker_index = vppcom_session_worker (sh);
vls->vls_index = vls - wrk->vls_pool;
vls->shared_data_index = ~0;
hash_set (wrk->session_handle_to_vlsh_table, sh, vls->vls_index);
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,
@ -372,8 +408,8 @@ vls_free (vcl_locked_session_t * vls)
vls_worker_t *wrk = vls_worker_get_current ();
ASSERT (vls != 0);
hash_unset (wrk->session_handle_to_vlsh_table,
vcl_session_handle_from_index (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 (wrk->vls_pool, vls);
}
@ -452,10 +488,10 @@ vls_handle_t
vls_si_wi_to_vlsh (u32 session_index, u32 vcl_wrk_index)
{
vls_worker_t *wrk = vls_worker_get_current ();
uword *vlshp;
vlshp = hash_get (wrk->session_handle_to_vlsh_table,
vcl_session_handle_from_wrk_session_index (session_index,
vcl_wrk_index));
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;
}
@ -861,6 +897,7 @@ 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;
@ -945,6 +982,8 @@ vls_mt_session_migrate (vcl_locked_session_t *vls)
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:
@ -1643,12 +1682,14 @@ 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