summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhanlin <hanlin_wang@163.com>2020-08-21 11:05:36 +0800
committerFlorin Coras <florin.coras@gmail.com>2020-08-26 01:04:50 +0000
commitf8e1363c4fc6b6b258663eeff19ee20d2b038256 (patch)
treee346c7fce2837bbaae71fc8410a8cd21b347cd48 /src
parentcd631b5ba0bff66b3feb0f9efeebe4864877acca (diff)
vcl: fix duplicated key of session_index_to_vlsh_table in multiple
threads vcl workers scenario Type: fix In multiple threads vcl workers scenario, multiple vcl workes can create sessions with same index. Because only one vls worker created, key of session_index_to_vlsh_table is duplicated. Signed-off-by: hanlin <hanlin_wang@163.com> Change-Id: I7e1f5bc471adc5378194452aef85e611f5d0df1d
Diffstat (limited to 'src')
-rw-r--r--src/vcl/vcl_locked.c32
-rw-r--r--src/vcl/vcl_private.h7
2 files changed, 28 insertions, 11 deletions
diff --git a/src/vcl/vcl_locked.c b/src/vcl/vcl_locked.c
index da4522aed70..4b88b27ac6f 100644
--- a/src/vcl/vcl_locked.c
+++ b/src/vcl/vcl_locked.c
@@ -39,7 +39,7 @@ typedef struct vcl_locked_session_
typedef struct vls_worker_
{
vcl_locked_session_t *vls_pool;
- uword *session_index_to_vlsh_table;
+ uword *session_handle_to_vlsh_table;
u32 wrk_index;
} vls_worker_t;
@@ -308,7 +308,7 @@ vls_worker_alloc (void)
static void
vls_worker_free (vls_worker_t * wrk)
{
- hash_free (wrk->session_index_to_vlsh_table);
+ hash_free (wrk->session_handle_to_vlsh_table);
pool_free (wrk->vls_pool);
pool_put (vlsm->workers, wrk);
}
@@ -334,8 +334,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_index_to_vlsh_table, vls->session_index,
- vls->vls_index);
+ hash_set (wrk->session_handle_to_vlsh_table, sh, vls->vls_index);
if (vls_mt_wrk_supported ())
{
hash_set (vls->vcl_wrk_index_to_session_index, vls->worker_index,
@@ -363,7 +362,8 @@ vls_free (vcl_locked_session_t * vls)
vls_worker_t *wrk = vls_worker_get_current ();
ASSERT (vls != 0);
- hash_unset (wrk->session_index_to_vlsh_table, vls->session_index);
+ hash_unset (wrk->session_handle_to_vlsh_table,
+ vcl_session_handle_from_index (vls->session_index));
clib_spinlock_free (&vls->lock);
pool_put (wrk->vls_pool, vls);
}
@@ -439,11 +439,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)
{
vls_worker_t *wrk = vls_worker_get_current ();
uword *vlshp;
- vlshp = hash_get (wrk->session_index_to_vlsh_table, session_index);
+ vlshp = hash_get (wrk->session_handle_to_vlsh_table,
+ vcl_session_handle_from_wrk_session_index (session_index,
+ vcl_wrk_index));
return vlshp ? *vlshp : VLS_INVALID_HANDLE;
}
@@ -453,7 +455,7 @@ vls_session_index_to_vlsh (uint32_t session_index)
vls_handle_t vlsh;
vls_mt_table_rlock ();
- vlsh = vls_si_to_vlsh (session_index);
+ vlsh = vls_si_wi_to_vlsh (session_index, vcl_get_worker_index ());
vls_mt_table_runlock ();
return vlsh;
@@ -752,6 +754,8 @@ 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 ();
+ u32 vls_index, session_index, wrk_index;
+ vcl_session_handle_t sh;
/*
* init vcl worker
@@ -765,8 +769,14 @@ vls_worker_copy_on_fork (vcl_worker_t * parent_wrk)
* init vls worker
*/
vls_parent_wrk = vls_worker_get (parent_wrk->wrk_index);
- vls_wrk->session_index_to_vlsh_table =
- hash_dup (vls_parent_wrk->session_index_to_vlsh_table);
+ /* *INDENT-OFF* */
+ 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_share_sessions (vls_parent_wrk, vls_wrk);
@@ -1368,7 +1378,7 @@ vls_unshare_vcl_worker_sessions (vcl_worker_t * wrk)
/* *INDENT-OFF* */
pool_foreach (s, wrk->sessions, ({
- vls = vls_get (vls_si_to_vlsh (s->session_index));
+ 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);
}));
diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h
index 231d7ebcbcf..c930803f760 100644
--- a/src/vcl/vcl_private.h
+++ b/src/vcl/vcl_private.h
@@ -404,6 +404,13 @@ vcl_session_get (vcl_worker_t * wrk, u32 session_index)
}
static inline vcl_session_handle_t
+vcl_session_handle_from_wrk_session_index (u32 session_index, u32 wrk_index)
+{
+ ASSERT (session_index < 2 << 24);
+ return (wrk_index << 24 | session_index);
+}
+
+static inline vcl_session_handle_t
vcl_session_handle_from_index (u32 session_index)
{
ASSERT (session_index < 2 << 24);