Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use thread local storage for thread index
[vpp.git]
/
src
/
plugins
/
snat
/
out2in.c
diff --git
a/src/plugins/snat/out2in.c
b/src/plugins/snat/out2in.c
index
656e42d
..
5d308d7
100644
(file)
--- a/
src/plugins/snat/out2in.c
+++ b/
src/plugins/snat/out2in.c
@@
-129,7
+129,7
@@
create_session_for_static_mapping (snat_main_t *sm,
snat_session_key_t in2out,
snat_session_key_t out2in,
vlib_node_runtime_t * node,
snat_session_key_t in2out,
snat_session_key_t out2in,
vlib_node_runtime_t * node,
- u32
cpu
_index)
+ u32
thread
_index)
{
snat_user_t *u;
snat_user_key_t user_key;
{
snat_user_t *u;
snat_user_key_t user_key;
@@
-146,36
+146,36
@@
create_session_for_static_mapping (snat_main_t *sm,
if (clib_bihash_search_8_8 (&sm->user_hash, &kv0, &value0))
{
/* no, make a new one */
if (clib_bihash_search_8_8 (&sm->user_hash, &kv0, &value0))
{
/* no, make a new one */
- pool_get (sm->per_thread_data[
cpu
_index].users, u);
+ pool_get (sm->per_thread_data[
thread
_index].users, u);
memset (u, 0, sizeof (*u));
u->addr = in2out.addr;
u->fib_index = in2out.fib_index;
memset (u, 0, sizeof (*u));
u->addr = in2out.addr;
u->fib_index = in2out.fib_index;
- pool_get (sm->per_thread_data[
cpu
_index].list_pool,
+ pool_get (sm->per_thread_data[
thread
_index].list_pool,
per_user_list_head_elt);
u->sessions_per_user_list_head_index = per_user_list_head_elt -
per_user_list_head_elt);
u->sessions_per_user_list_head_index = per_user_list_head_elt -
- sm->per_thread_data[
cpu
_index].list_pool;
+ sm->per_thread_data[
thread
_index].list_pool;
- clib_dlist_init (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_init (sm->per_thread_data[
thread
_index].list_pool,
u->sessions_per_user_list_head_index);
u->sessions_per_user_list_head_index);
- kv0.value = u - sm->per_thread_data[
cpu
_index].users;
+ kv0.value = u - sm->per_thread_data[
thread
_index].users;
/* add user */
clib_bihash_add_del_8_8 (&sm->user_hash, &kv0, 1 /* is_add */);
/* add non-traslated packets worker lookup */
/* add user */
clib_bihash_add_del_8_8 (&sm->user_hash, &kv0, 1 /* is_add */);
/* add non-traslated packets worker lookup */
- kv0.value =
cpu
_index;
+ kv0.value =
thread
_index;
clib_bihash_add_del_8_8 (&sm->worker_by_in, &kv0, 1);
}
else
{
clib_bihash_add_del_8_8 (&sm->worker_by_in, &kv0, 1);
}
else
{
- u = pool_elt_at_index (sm->per_thread_data[
cpu
_index].users,
+ u = pool_elt_at_index (sm->per_thread_data[
thread
_index].users,
value0.value);
}
value0.value);
}
- pool_get (sm->per_thread_data[
cpu
_index].sessions, s);
+ pool_get (sm->per_thread_data[
thread
_index].sessions, s);
memset (s, 0, sizeof (*s));
s->outside_address_index = ~0;
memset (s, 0, sizeof (*s));
s->outside_address_index = ~0;
@@
-183,22
+183,22
@@
create_session_for_static_mapping (snat_main_t *sm,
u->nstaticsessions++;
/* Create list elts */
u->nstaticsessions++;
/* Create list elts */
- pool_get (sm->per_thread_data[
cpu
_index].list_pool,
+ pool_get (sm->per_thread_data[
thread
_index].list_pool,
per_user_translation_list_elt);
per_user_translation_list_elt);
- clib_dlist_init (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_init (sm->per_thread_data[
thread
_index].list_pool,
per_user_translation_list_elt -
per_user_translation_list_elt -
- sm->per_thread_data[
cpu
_index].list_pool);
+ sm->per_thread_data[
thread
_index].list_pool);
per_user_translation_list_elt->value =
per_user_translation_list_elt->value =
- s - sm->per_thread_data[
cpu
_index].sessions;
+ s - sm->per_thread_data[
thread
_index].sessions;
s->per_user_index =
s->per_user_index =
- per_user_translation_list_elt - sm->per_thread_data[
cpu
_index].list_pool;
+ per_user_translation_list_elt - sm->per_thread_data[
thread
_index].list_pool;
s->per_user_list_head_index = u->sessions_per_user_list_head_index;
s->per_user_list_head_index = u->sessions_per_user_list_head_index;
- clib_dlist_addtail (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_addtail (sm->per_thread_data[
thread
_index].list_pool,
s->per_user_list_head_index,
per_user_translation_list_elt -
s->per_user_list_head_index,
per_user_translation_list_elt -
- sm->per_thread_data[
cpu
_index].list_pool);
+ sm->per_thread_data[
thread
_index].list_pool);
s->in2out = in2out;
s->out2in = out2in;
s->in2out = in2out;
s->out2in = out2in;
@@
-206,12
+206,12
@@
create_session_for_static_mapping (snat_main_t *sm,
/* Add to translation hashes */
kv0.key = s->in2out.as_u64;
/* Add to translation hashes */
kv0.key = s->in2out.as_u64;
- kv0.value = s - sm->per_thread_data[
cpu
_index].sessions;
+ kv0.value = s - sm->per_thread_data[
thread
_index].sessions;
if (clib_bihash_add_del_8_8 (&sm->in2out, &kv0, 1 /* is_add */))
clib_warning ("in2out key add failed");
kv0.key = s->out2in.as_u64;
if (clib_bihash_add_del_8_8 (&sm->in2out, &kv0, 1 /* is_add */))
clib_warning ("in2out key add failed");
kv0.key = s->out2in.as_u64;
- kv0.value = s - sm->per_thread_data[
cpu
_index].sessions;
+ kv0.value = s - sm->per_thread_data[
thread
_index].sessions;
if (clib_bihash_add_del_8_8 (&sm->out2in, &kv0, 1 /* is_add */))
clib_warning ("out2in key add failed");
if (clib_bihash_add_del_8_8 (&sm->out2in, &kv0, 1 /* is_add */))
clib_warning ("out2in key add failed");
@@
-298,7
+298,7
@@
is_interface_addr(snat_main_t *sm, vlib_node_runtime_t *node, u32 sw_if_index0,
*
* @param[in,out] sm SNAT main
* @param[in,out] node SNAT node runtime
*
* @param[in,out] sm SNAT main
* @param[in,out] node SNAT node runtime
- * @param[in]
cpu_index CPU
index
+ * @param[in]
thread_index thread
index
* @param[in,out] b0 buffer containing packet to be translated
* @param[out] p_key address and port before NAT translation
* @param[out] p_value address and port after NAT translation
* @param[in,out] b0 buffer containing packet to be translated
* @param[out] p_key address and port before NAT translation
* @param[out] p_value address and port after NAT translation
@@
-306,7
+306,7
@@
is_interface_addr(snat_main_t *sm, vlib_node_runtime_t *node, u32 sw_if_index0,
* @param d optional parameter
*/
u32 icmp_match_out2in_slow(snat_main_t *sm, vlib_node_runtime_t *node,
* @param d optional parameter
*/
u32 icmp_match_out2in_slow(snat_main_t *sm, vlib_node_runtime_t *node,
- u32
cpu
_index, vlib_buffer_t *b0,
+ u32
thread
_index, vlib_buffer_t *b0,
snat_session_key_t *p_key,
snat_session_key_t *p_value,
u8 *p_dont_translate, void *d)
snat_session_key_t *p_key,
snat_session_key_t *p_value,
u8 *p_dont_translate, void *d)
@@
-366,7
+366,7
@@
u32 icmp_match_out2in_slow(snat_main_t *sm, vlib_node_runtime_t *node,
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping(sm, b0, sm0, key0,
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping(sm, b0, sm0, key0,
- node,
cpu
_index);
+ node,
thread
_index);
if (!s0)
{
if (!s0)
{
@@
-375,7
+375,7
@@
u32 icmp_match_out2in_slow(snat_main_t *sm, vlib_node_runtime_t *node,
}
}
else
}
}
else
- s0 = pool_elt_at_index (sm->per_thread_data[
cpu
_index].sessions,
+ s0 = pool_elt_at_index (sm->per_thread_data[
thread
_index].sessions,
value0.value);
out:
value0.value);
out:
@@
-393,7
+393,7
@@
out:
*
* @param[in] sm SNAT main
* @param[in,out] node SNAT node runtime
*
* @param[in] sm SNAT main
* @param[in,out] node SNAT node runtime
- * @param[in]
cpu_index CPU
index
+ * @param[in]
thread_index thread
index
* @param[in,out] b0 buffer containing packet to be translated
* @param[out] p_key address and port before NAT translation
* @param[out] p_value address and port after NAT translation
* @param[in,out] b0 buffer containing packet to be translated
* @param[out] p_key address and port before NAT translation
* @param[out] p_value address and port after NAT translation
@@
-401,7
+401,7
@@
out:
* @param d optional parameter
*/
u32 icmp_match_out2in_fast(snat_main_t *sm, vlib_node_runtime_t *node,
* @param d optional parameter
*/
u32 icmp_match_out2in_fast(snat_main_t *sm, vlib_node_runtime_t *node,
- u32
cpu
_index, vlib_buffer_t *b0,
+ u32
thread
_index, vlib_buffer_t *b0,
snat_session_key_t *p_key,
snat_session_key_t *p_value,
u8 *p_dont_translate, void *d)
snat_session_key_t *p_key,
snat_session_key_t *p_value,
u8 *p_dont_translate, void *d)
@@
-460,7
+460,7
@@
static inline u32 icmp_out2in (snat_main_t *sm,
u32 rx_fib_index0,
vlib_node_runtime_t * node,
u32 next0,
u32 rx_fib_index0,
vlib_node_runtime_t * node,
u32 next0,
- u32
cpu
_index,
+ u32
thread
_index,
void *d)
{
snat_session_key_t key0, sm0;
void *d)
{
snat_session_key_t key0, sm0;
@@
-477,7
+477,7
@@
static inline u32 icmp_out2in (snat_main_t *sm,
echo0 = (icmp_echo_header_t *)(icmp0+1);
echo0 = (icmp_echo_header_t *)(icmp0+1);
- next0_tmp = sm->icmp_match_out2in_cb(sm, node,
cpu
_index, b0,
+ next0_tmp = sm->icmp_match_out2in_cb(sm, node,
thread
_index, b0,
&key0, &sm0, &dont_translate, d);
if (next0_tmp != ~0)
next0 = next0_tmp;
&key0, &sm0, &dont_translate, d);
if (next0_tmp != ~0)
next0 = next0_tmp;
@@
-589,11
+589,11
@@
static inline u32 icmp_out2in_slow_path (snat_main_t *sm,
u32 rx_fib_index0,
vlib_node_runtime_t * node,
u32 next0, f64 now,
u32 rx_fib_index0,
vlib_node_runtime_t * node,
u32 next0, f64 now,
- u32
cpu
_index,
+ u32
thread
_index,
snat_session_t ** p_s0)
{
next0 = icmp_out2in(sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
snat_session_t ** p_s0)
{
next0 = icmp_out2in(sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
- next0,
cpu
_index, p_s0);
+ next0,
thread
_index, p_s0);
snat_session_t * s0 = *p_s0;
if (PREDICT_TRUE(next0 != SNAT_OUT2IN_NEXT_DROP && s0))
{
snat_session_t * s0 = *p_s0;
if (PREDICT_TRUE(next0 != SNAT_OUT2IN_NEXT_DROP && s0))
{
@@
-604,9
+604,9
@@
static inline u32 icmp_out2in_slow_path (snat_main_t *sm,
/* Per-user LRU list maintenance for dynamic translation */
if (!snat_is_session_static (s0))
{
/* Per-user LRU list maintenance for dynamic translation */
if (!snat_is_session_static (s0))
{
- clib_dlist_remove (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_remove (sm->per_thread_data[
thread
_index].list_pool,
s0->per_user_index);
s0->per_user_index);
- clib_dlist_addtail (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_addtail (sm->per_thread_data[
thread
_index].list_pool,
s0->per_user_list_head_index,
s0->per_user_index);
}
s0->per_user_list_head_index,
s0->per_user_index);
}
@@
-624,7
+624,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
u32 pkts_processed = 0;
snat_main_t * sm = &snat_main;
f64 now = vlib_time_now (vm);
u32 pkts_processed = 0;
snat_main_t * sm = &snat_main;
f64 now = vlib_time_now (vm);
- u32
cpu_index = os_get_cpu_number
();
+ u32
thread_index = vlib_get_thread_index
();
from = vlib_frame_vector_args (frame);
n_left_from = frame->n_vectors;
from = vlib_frame_vector_args (frame);
n_left_from = frame->n_vectors;
@@
-712,7
+712,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
{
next0 = icmp_out2in_slow_path
(sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
{
next0 = icmp_out2in_slow_path
(sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
- next0, now,
cpu
_index, &s0);
+ next0, now,
thread
_index, &s0);
goto trace0;
}
goto trace0;
}
@@
-743,7
+743,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping(sm, b0, sm0, key0, node,
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping(sm, b0, sm0, key0, node,
-
cpu
_index);
+
thread
_index);
if (!s0)
{
b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
if (!s0)
{
b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
@@
-752,7
+752,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
}
}
else
}
}
else
- s0 = pool_elt_at_index (sm->per_thread_data[
cpu
_index].sessions,
+ s0 = pool_elt_at_index (sm->per_thread_data[
thread
_index].sessions,
value0.value);
old_addr0 = ip0->dst_address.as_u32;
value0.value);
old_addr0 = ip0->dst_address.as_u32;
@@
-796,9
+796,9
@@
snat_out2in_node_fn (vlib_main_t * vm,
/* Per-user LRU list maintenance for dynamic translation */
if (!snat_is_session_static (s0))
{
/* Per-user LRU list maintenance for dynamic translation */
if (!snat_is_session_static (s0))
{
- clib_dlist_remove (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_remove (sm->per_thread_data[
thread
_index].list_pool,
s0->per_user_index);
s0->per_user_index);
- clib_dlist_addtail (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_addtail (sm->per_thread_data[
thread
_index].list_pool,
s0->per_user_list_head_index,
s0->per_user_index);
}
s0->per_user_list_head_index,
s0->per_user_index);
}
@@
-813,7
+813,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
t->next_index = next0;
t->session_index = ~0;
if (s0)
t->next_index = next0;
t->session_index = ~0;
if (s0)
- t->session_index = s0 - sm->per_thread_data[
cpu
_index].sessions;
+ t->session_index = s0 - sm->per_thread_data[
thread
_index].sessions;
}
pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
}
pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
@@
-847,7
+847,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
{
next1 = icmp_out2in_slow_path
(sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node,
{
next1 = icmp_out2in_slow_path
(sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node,
- next1, now,
cpu
_index, &s1);
+ next1, now,
thread
_index, &s1);
goto trace1;
}
goto trace1;
}
@@
-878,7
+878,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
/* Create session initiated by host from external network */
s1 = create_session_for_static_mapping(sm, b1, sm1, key1, node,
/* Create session initiated by host from external network */
s1 = create_session_for_static_mapping(sm, b1, sm1, key1, node,
-
cpu
_index);
+
thread
_index);
if (!s1)
{
b1->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
if (!s1)
{
b1->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
@@
-887,7
+887,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
}
}
else
}
}
else
- s1 = pool_elt_at_index (sm->per_thread_data[
cpu
_index].sessions,
+ s1 = pool_elt_at_index (sm->per_thread_data[
thread
_index].sessions,
value1.value);
old_addr1 = ip1->dst_address.as_u32;
value1.value);
old_addr1 = ip1->dst_address.as_u32;
@@
-931,9
+931,9
@@
snat_out2in_node_fn (vlib_main_t * vm,
/* Per-user LRU list maintenance for dynamic translation */
if (!snat_is_session_static (s1))
{
/* Per-user LRU list maintenance for dynamic translation */
if (!snat_is_session_static (s1))
{
- clib_dlist_remove (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_remove (sm->per_thread_data[
thread
_index].list_pool,
s1->per_user_index);
s1->per_user_index);
- clib_dlist_addtail (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_addtail (sm->per_thread_data[
thread
_index].list_pool,
s1->per_user_list_head_index,
s1->per_user_index);
}
s1->per_user_list_head_index,
s1->per_user_index);
}
@@
-948,7
+948,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
t->next_index = next1;
t->session_index = ~0;
if (s1)
t->next_index = next1;
t->session_index = ~0;
if (s1)
- t->session_index = s1 - sm->per_thread_data[
cpu
_index].sessions;
+ t->session_index = s1 - sm->per_thread_data[
thread
_index].sessions;
}
pkts_processed += next1 != SNAT_OUT2IN_NEXT_DROP;
}
pkts_processed += next1 != SNAT_OUT2IN_NEXT_DROP;
@@
-1016,7
+1016,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
{
next0 = icmp_out2in_slow_path
(sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
{
next0 = icmp_out2in_slow_path
(sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
- next0, now,
cpu
_index, &s0);
+ next0, now,
thread
_index, &s0);
goto trace00;
}
goto trace00;
}
@@
-1048,7
+1048,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping(sm, b0, sm0, key0, node,
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping(sm, b0, sm0, key0, node,
-
cpu
_index);
+
thread
_index);
if (!s0)
{
b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
if (!s0)
{
b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
@@
-1057,7
+1057,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
}
}
else
}
}
else
- s0 = pool_elt_at_index (sm->per_thread_data[
cpu
_index].sessions,
+ s0 = pool_elt_at_index (sm->per_thread_data[
thread
_index].sessions,
value0.value);
old_addr0 = ip0->dst_address.as_u32;
value0.value);
old_addr0 = ip0->dst_address.as_u32;
@@
-1101,9
+1101,9
@@
snat_out2in_node_fn (vlib_main_t * vm,
/* Per-user LRU list maintenance for dynamic translation */
if (!snat_is_session_static (s0))
{
/* Per-user LRU list maintenance for dynamic translation */
if (!snat_is_session_static (s0))
{
- clib_dlist_remove (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_remove (sm->per_thread_data[
thread
_index].list_pool,
s0->per_user_index);
s0->per_user_index);
- clib_dlist_addtail (sm->per_thread_data[
cpu
_index].list_pool,
+ clib_dlist_addtail (sm->per_thread_data[
thread
_index].list_pool,
s0->per_user_list_head_index,
s0->per_user_index);
}
s0->per_user_list_head_index,
s0->per_user_index);
}
@@
-1118,7
+1118,7
@@
snat_out2in_node_fn (vlib_main_t * vm,
t->next_index = next0;
t->session_index = ~0;
if (s0)
t->next_index = next0;
t->session_index = ~0;
if (s0)
- t->session_index = s0 - sm->per_thread_data[
cpu
_index].sessions;
+ t->session_index = s0 - sm->per_thread_data[
thread
_index].sessions;
}
pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
}
pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
@@
-1599,7
+1599,7
@@
snat_out2in_worker_handoff_fn (vlib_main_t * vm,
u32 n_left_to_next_worker = 0, *to_next_worker = 0;
u32 next_worker_index = 0;
u32 current_worker_index = ~0;
u32 n_left_to_next_worker = 0, *to_next_worker = 0;
u32 next_worker_index = 0;
u32 current_worker_index = ~0;
- u32
cpu_index = os_get_cpu_number
();
+ u32
thread_index = vlib_get_thread_index
();
ASSERT (vec_len (sm->workers));
ASSERT (vec_len (sm->workers));
@@
-1637,7
+1637,7
@@
snat_out2in_worker_handoff_fn (vlib_main_t * vm,
next_worker_index = sm->worker_out2in_cb(ip0, rx_fib_index0);
next_worker_index = sm->worker_out2in_cb(ip0, rx_fib_index0);
- if (PREDICT_FALSE (next_worker_index !=
cpu
_index))
+ if (PREDICT_FALSE (next_worker_index !=
thread
_index))
{
do_handoff = 1;
{
do_handoff = 1;