Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove c-11 memcpy checks from perf-critical code
[vpp.git]
/
src
/
plugins
/
nat
/
out2in_ed.c
diff --git
a/src/plugins/nat/out2in_ed.c
b/src/plugins/nat/out2in_ed.c
index
1a9f897
..
55b34f5
100644
(file)
--- a/
src/plugins/nat/out2in_ed.c
+++ b/
src/plugins/nat/out2in_ed.c
@@
-112,6
+112,8
@@
icmp_out2in_ed_slow_path (snat_main_t * sm, vlib_buffer_t * b0,
nat44_session_update_counters (s0, now,
vlib_buffer_length_in_chain
(sm->vlib_main, b0));
nat44_session_update_counters (s0, now,
vlib_buffer_length_in_chain
(sm->vlib_main, b0));
+ /* Per-user LRU list maintenance */
+ nat44_session_update_lru (sm, s0, thread_index);
}
return next0;
}
}
return next0;
}
@@
-453,6
+455,8
@@
create_bypass_for_fwd (snat_main_t * sm, ip4_header_t * ip, u32 rx_fib_index,
/* Accounting */
nat44_session_update_counters (s, now, 0);
/* Accounting */
nat44_session_update_counters (s, now, 0);
+ /* Per-user LRU list maintenance */
+ nat44_session_update_lru (sm, s, thread_index);
}
u32
}
u32
@@
-467,7
+471,7
@@
icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
clib_bihash_kv_16_8_t kv, value;
snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
snat_session_t *s = 0;
clib_bihash_kv_16_8_t kv, value;
snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
snat_session_t *s = 0;
- u8 dont_translate = 0, is_addr_only;
+ u8 dont_translate = 0, is_addr_only
, identity_nat
;
snat_session_key_t e_key, l_key;
icmp = (icmp46_header_t *) ip4_next_header (ip);
snat_session_key_t e_key, l_key;
icmp = (icmp46_header_t *) ip4_next_header (ip);
@@
-492,7
+496,7
@@
icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
e_key.protocol = ip_proto_to_snat_proto (key.proto);
e_key.fib_index = rx_fib_index;
if (snat_static_mapping_match
e_key.protocol = ip_proto_to_snat_proto (key.proto);
e_key.fib_index = rx_fib_index;
if (snat_static_mapping_match
- (sm, e_key, &l_key, 1, &is_addr_only, 0, 0, 0))
+ (sm, e_key, &l_key, 1, &is_addr_only, 0, 0, 0
, &identity_nat
))
{
if (!sm->forwarding_enabled)
{
{
if (!sm->forwarding_enabled)
{
@@
-529,6
+533,12
@@
icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
goto out;
}
goto out;
}
+ if (PREDICT_FALSE (identity_nat))
+ {
+ dont_translate = 1;
+ goto out;
+ }
+
/* Create session initiated by host from external network */
s = create_session_for_static_mapping_ed (sm, b, l_key, e_key, node,
thread_index, 0, 0,
/* Create session initiated by host from external network */
s = create_session_for_static_mapping_ed (sm, b, l_key, e_key, node,
thread_index, 0, 0,
@@
-663,6
+673,8
@@
nat44_ed_out2in_unknown_proto (snat_main_t * sm,
/* Accounting */
nat44_session_update_counters (s, now, vlib_buffer_length_in_chain (vm, b));
/* Accounting */
nat44_session_update_counters (s, now, vlib_buffer_length_in_chain (vm, b));
+ /* Per-user LRU list maintenance */
+ nat44_session_update_lru (sm, s, thread_index);
return s;
}
return s;
}
@@
-711,6
+723,7
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
snat_session_key_t e_key0, l_key0, e_key1, l_key1;
lb_nat_type_t lb_nat0, lb_nat1;
twice_nat_type_t twice_nat0, twice_nat1;
snat_session_key_t e_key0, l_key0, e_key1, l_key1;
lb_nat_type_t lb_nat0, lb_nat1;
twice_nat_type_t twice_nat0, twice_nat1;
+ u8 identity_nat0, identity_nat1;
/* Prefetch next iteration. */
{
/* Prefetch next iteration. */
{
@@
-822,7
+835,8
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
e_key0.fib_index = rx_fib_index0;
if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
&twice_nat0, &lb_nat0,
e_key0.fib_index = rx_fib_index0;
if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
&twice_nat0, &lb_nat0,
- &ip0->src_address))
+ &ip0->src_address,
+ &identity_nat0))
{
/*
* Send DHCP packets to the ipv4 stack, or we won't
{
/*
* Send DHCP packets to the ipv4 stack, or we won't
@@
-858,6
+872,9
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
goto trace00;
}
goto trace00;
}
+ if (PREDICT_FALSE (identity_nat0))
+ goto trace00;
+
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
e_key0, node,
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
e_key0, node,
@@
-936,6
+953,8
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
nat44_session_update_counters (s0, now,
vlib_buffer_length_in_chain (vm,
b0));
nat44_session_update_counters (s0, now,
vlib_buffer_length_in_chain (vm,
b0));
+ /* Per-user LRU list maintenance */
+ nat44_session_update_lru (sm, s0, thread_index);
trace00:
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
trace00:
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@
-1038,7
+1057,8
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
e_key1.fib_index = rx_fib_index1;
if (snat_static_mapping_match (sm, e_key1, &l_key1, 1, 0,
&twice_nat1, &lb_nat1,
e_key1.fib_index = rx_fib_index1;
if (snat_static_mapping_match (sm, e_key1, &l_key1, 1, 0,
&twice_nat1, &lb_nat1,
- &ip1->src_address))
+ &ip1->src_address,
+ &identity_nat1))
{
/*
* Send DHCP packets to the ipv4 stack, or we won't
{
/*
* Send DHCP packets to the ipv4 stack, or we won't
@@
-1074,6
+1094,9
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
goto trace01;
}
goto trace01;
}
+ if (PREDICT_FALSE (identity_nat1))
+ goto trace01;
+
/* Create session initiated by host from external network */
s1 = create_session_for_static_mapping_ed (sm, b1, l_key1,
e_key1, node,
/* Create session initiated by host from external network */
s1 = create_session_for_static_mapping_ed (sm, b1, l_key1,
e_key1, node,
@@
-1152,6
+1175,8
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
nat44_session_update_counters (s1, now,
vlib_buffer_length_in_chain (vm,
b1));
nat44_session_update_counters (s1, now,
vlib_buffer_length_in_chain (vm,
b1));
+ /* Per-user LRU list maintenance */
+ nat44_session_update_lru (sm, s1, thread_index);
trace01:
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
trace01:
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@
-1192,6
+1217,7
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
snat_session_key_t e_key0, l_key0;
lb_nat_type_t lb_nat0;
twice_nat_type_t twice_nat0;
snat_session_key_t e_key0, l_key0;
lb_nat_type_t lb_nat0;
twice_nat_type_t twice_nat0;
+ u8 identity_nat0;
/* speculatively enqueue b0 to the current next frame */
bi0 = from[0];
/* speculatively enqueue b0 to the current next frame */
bi0 = from[0];
@@
-1287,7
+1313,8
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
e_key0.fib_index = rx_fib_index0;
if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
&twice_nat0, &lb_nat0,
e_key0.fib_index = rx_fib_index0;
if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
&twice_nat0, &lb_nat0,
- &ip0->src_address))
+ &ip0->src_address,
+ &identity_nat0))
{
/*
* Send DHCP packets to the ipv4 stack, or we won't
{
/*
* Send DHCP packets to the ipv4 stack, or we won't
@@
-1323,6
+1350,9
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
goto trace0;
}
goto trace0;
}
+ if (PREDICT_FALSE (identity_nat0))
+ goto trace0;
+
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
e_key0, node,
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
e_key0, node,
@@
-1401,6
+1431,8
@@
nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
nat44_session_update_counters (s0, now,
vlib_buffer_length_in_chain (vm,
b0));
nat44_session_update_counters (s0, now,
vlib_buffer_length_in_chain (vm,
b0));
+ /* Per-user LRU list maintenance */
+ nat44_session_update_lru (sm, s0, thread_index);
trace0:
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
trace0:
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@
-1542,6
+1574,7
@@
nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
snat_session_key_t e_key0, l_key0;
lb_nat_type_t lb0;
twice_nat_type_t twice_nat0;
snat_session_key_t e_key0, l_key0;
lb_nat_type_t lb0;
twice_nat_type_t twice_nat0;
+ u8 identity_nat0;
/* speculatively enqueue b0 to the current next frame */
bi0 = from[0];
/* speculatively enqueue b0 to the current next frame */
bi0 = from[0];
@@
-1622,7
+1655,8
@@
nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
e_key0.protocol = proto0;
e_key0.fib_index = rx_fib_index0;
if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
e_key0.protocol = proto0;
e_key0.fib_index = rx_fib_index0;
if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
- &twice_nat0, &lb0, 0))
+ &twice_nat0, &lb0, 0,
+ &identity_nat0))
{
/*
* Send DHCP packets to the ipv4 stack, or we won't
{
/*
* Send DHCP packets to the ipv4 stack, or we won't
@@
-1662,6
+1696,12
@@
nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
goto trace0;
}
goto trace0;
}
+ if (PREDICT_FALSE (identity_nat0))
+ {
+ reass0->flags |= NAT_REASS_FLAG_ED_DONT_TRANSLATE;
+ goto trace0;
+ }
+
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
e_key0, node,
/* Create session initiated by host from external network */
s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
e_key0, node,
@@
-1769,6
+1809,8
@@
nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
nat44_session_update_counters (s0, now,
vlib_buffer_length_in_chain (vm,
b0));
nat44_session_update_counters (s0, now,
vlib_buffer_length_in_chain (vm,
b0));
+ /* Per-user LRU list maintenance */
+ nat44_session_update_lru (sm, s0, thread_index);
trace0:
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
trace0:
if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@
-1802,17
+1844,16
@@
nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
u32 len = vec_len (fragments_to_loopback);
if (len <= VLIB_FRAME_SIZE)
{
u32 len = vec_len (fragments_to_loopback);
if (len <= VLIB_FRAME_SIZE)
{
- clib_memcpy (from, fragments_to_loopback,
- sizeof (u32) * len);
+ clib_memcpy
_fast
(from, fragments_to_loopback,
+
sizeof (u32) * len);
n_left_from = len;
vec_reset_length (fragments_to_loopback);
}
else
{
n_left_from = len;
vec_reset_length (fragments_to_loopback);
}
else
{
- clib_memcpy (from,
- fragments_to_loopback + (len -
- VLIB_FRAME_SIZE),
- sizeof (u32) * VLIB_FRAME_SIZE);
+ clib_memcpy_fast (from, fragments_to_loopback +
+ (len - VLIB_FRAME_SIZE),
+ sizeof (u32) * VLIB_FRAME_SIZE);
n_left_from = VLIB_FRAME_SIZE;
_vec_len (fragments_to_loopback) = len - VLIB_FRAME_SIZE;
}
n_left_from = VLIB_FRAME_SIZE;
_vec_len (fragments_to_loopback) = len - VLIB_FRAME_SIZE;
}