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

snat: fix 1:1 NAT with multiple workers

Browse Source 
Assign worker when static mapping is created.

Change-Id: I204e486e2ba5d1ef8e357759c35ba92a25a9a097
Signed-off-by: Matus Fabian <matfabia@cisco.com>
This commit is contained in:
Matus Fabian
2016-12-01 01:32:03 -08:00
committed by Damjan Marion
parent dcbc86a8af
commit 4933168df3
4 changed files with 131 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/snat-plugin/snat/out2in.c
View File

@ -877,9 +877,20 @@ snat_out2in_worker_handoff_fn (vlib_main_t * vm,
/* Ever heard of of the "user" before? */
if (clib_bihash_search_8_8 (&sm->worker_by_out, &kv0, &value0))
{
/* No, assign next available worker (RR) */
next_worker_index = sm->first_worker_index +
sm->workers[sm->next_worker++ % vec_len (sm->workers)];
key0.port = 0;
kv0.key = key0.as_u64;
if (clib_bihash_search_8_8 (&sm->worker_by_out, &kv0, &value0))
{
/* No, assign next available worker (RR) */
next_worker_index = sm->first_worker_index +
sm->workers[sm->next_worker++ % vec_len (sm->workers)];
}
else
{
/* Static mapping without port */
next_worker_index = value0.value;
}
/* Add to translated packets worker lookup */
kv0.value = next_worker_index;

29
plugins/snat-plugin/snat/snat.c
View File

@ -440,6 +440,35 @@ int snat_add_static_mapping(ip4_address_t l_addr, ip4_address_t e_addr,
kv.key = m_key.as_u64;
kv.value = m - sm->static_mappings;
clib_bihash_add_del_8_8(&sm->static_mapping_by_external, &kv, 1);
/* Assign worker */
if (sm->workers)
{
snat_user_key_t w_key0;
snat_static_mapping_key_t w_key1;
w_key0.addr = m->local_addr;
w_key0.fib_index = m->fib_index;
kv.key = w_key0.as_u64;
if (clib_bihash_search_8_8 (&sm->worker_by_in, &kv, &value))
{
kv.value = sm->first_worker_index +
sm->workers[sm->next_worker++ % vec_len (sm->workers)];
clib_bihash_add_del_8_8 (&sm->worker_by_in, &kv, 1);
}
else
{
kv.value = value.value;
}
w_key1.addr = m->external_addr;
w_key1.port = clib_host_to_net_u16 (m->external_port);
w_key1.fib_index = sm->outside_fib_index;
kv.key = w_key1.as_u64;
clib_bihash_add_del_8_8 (&sm->worker_by_out, &kv, 1);
}
}
else
{

44
vnet/etc/scripts/snat_static Normal file
View File

@ -0,0 +1,44 @@
create packet-generator interface pg0
create packet-generator interface pg1
packet-generator new {
name f1
limit 1000000
node ip4-input
size 64-64
no-recycle
worker 0
interface pg0
data {
UDP: 10.0.0.3 -> 172.16.1.2
UDP: 3000 -> 3001
length 128 checksum 0 incrementing 1
}
}
packet-generator new {
name f2
limit 1000000
node ip4-input
size 64-64
no-recycle
worker 1
interface pg1
data {
UDP: 172.16.1.2 -> 172.16.1.3
UDP: 3001 -> 3000
length 128 checksum 0 incrementing 1
}
}
snat add address 172.16.1.3
snat add static mapping local 10.0.0.3 external 172.16.1.3
set int ip address pg0 10.0.0.1/24
set int ip address pg1 172.16.1.1/24
set int state pg0 up
set int state pg1 up
set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
set int snat in pg0 out pg1
trace add pg-input 10

44
vnet/etc/scripts/snat_static_with_port Normal file
View File

@ -0,0 +1,44 @@
create packet-generator interface pg0
create packet-generator interface pg1
packet-generator new {
name f1
limit 1000000
node ip4-input
size 64-64
no-recycle
worker 0
interface pg0
data {
UDP: 10.0.0.3 -> 172.16.1.2
UDP: 3000 -> 3001
length 128 checksum 0 incrementing 1
}
}
packet-generator new {
name f2
limit 1000000
node ip4-input
size 64-64
no-recycle
worker 1
interface pg1
data {
UDP: 172.16.1.2 -> 172.16.1.3
UDP: 3001 -> 3000
length 128 checksum 0 incrementing 1
}
}
snat add address 172.16.1.3
snat add static mapping local 10.0.0.3 3000 external 172.16.1.3 3000
set int ip address pg0 10.0.0.1/24
set int ip address pg1 172.16.1.1/24
set int state pg0 up
set int state pg1 up
set ip arp static pg0 10.0.0.3 abcd.abcd.abcd
set ip arp static pg1 172.16.1.2 cdef.abcd.abcd
set int snat in pg0 out pg1
trace add pg-input 10