d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipfilter: Save time and cycles swapping bucket table sizes

Browse Source 
NAT hash tables are inverted for inbound vs outbound. Rather than spend
the time and cycles swapping them, let's simply calculate the bucket
lengths inversely.

MFC after:	1 week
This commit is contained in:
Cy Schubert 2021-09-27 20:04:18 -07:00
parent 9aa29457d5
commit 4a7b49a0da
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/contrib/ipfilter/netinet/ip_nat.c
View File

@ -3521,15 +3521,12 @@ ipf_nat_hashtab_add(softc, softn, nat)
u_int hv0;
u_int hv1;
hv0 = nat->nat_hv[0] % softn->ipf_nat_table_sz;
hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz;
if (nat->nat_dir == NAT_INBOUND || nat->nat_dir == NAT_DIVERTIN) {
u_int swap;
swap = hv0;
hv0 = hv1;
hv1 = swap;
hv1 = nat->nat_hv[0] % softn->ipf_nat_table_sz;
hv0 = nat->nat_hv[1] % softn->ipf_nat_table_sz;
} else {
hv0 = nat->nat_hv[0] % softn->ipf_nat_table_sz;
hv1 = nat->nat_hv[1] % softn->ipf_nat_table_sz;
}
if (softn->ipf_nat_stats.ns_side[0].ns_bucketlen[hv0] >=

29
sys/contrib/ipfilter/netinet/ip_nat6.c
View File

@ -2160,19 +2160,24 @@ ipf_nat6_tabmove(softn, nat)
/*
* Add into the NAT table in the new position
*/
hv0 = NAT_HASH_FN6(&nat->nat_osrc6, nat->nat_osport, 0xffffffff);
hv0 = NAT_HASH_FN6(&nat->nat_odst6, hv0 + nat->nat_odport,
softn->ipf_nat_table_sz);
hv1 = NAT_HASH_FN6(&nat->nat_nsrc6, nat->nat_nsport, 0xffffffff);
hv1 = NAT_HASH_FN6(&nat->nat_ndst6, hv1 + nat->nat_ndport,
softn->ipf_nat_table_sz);
if (nat->nat_dir == NAT_INBOUND || nat->nat_dir == NAT_DIVERTIN) {
u_int swap;
swap = hv0;
hv0 = hv1;
hv1 = swap;
hv1 = NAT_HASH_FN6(&nat->nat_osrc6,
nat->nat_osport, 0xffffffff);
hv1 = NAT_HASH_FN6(&nat->nat_odst6, hv1 + nat->nat_odport,
softn->ipf_nat_table_sz);
hv0 = NAT_HASH_FN6(&nat->nat_nsrc6,
nat->nat_nsport, 0xffffffff);
hv0 = NAT_HASH_FN6(&nat->nat_ndst6, hv0 + nat->nat_ndport,
softn->ipf_nat_table_sz);
} else {
hv0 = NAT_HASH_FN6(&nat->nat_osrc6,
nat->nat_osport, 0xffffffff);
hv0 = NAT_HASH_FN6(&nat->nat_odst6, hv0 + nat->nat_odport,
softn->ipf_nat_table_sz);
hv1 = NAT_HASH_FN6(&nat->nat_nsrc6,
nat->nat_nsport, 0xffffffff);
hv1 = NAT_HASH_FN6(&nat->nat_ndst6, hv1 + nat->nat_ndport,
softn->ipf_nat_table_sz);
}
/* TRACE nat_osrc6, nat_osport, nat_odst6, nat_odport, hv0 */