From owner-dev-commits-src-all@freebsd.org Thu Sep 30 00:44:27 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 046DF67F5D1; Thu, 30 Sep 2021 00:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HKZJB6R8fz3PQr; Thu, 30 Sep 2021 00:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B7ADA21F62; Thu, 30 Sep 2021 00:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18U0iQPp084965; Thu, 30 Sep 2021 00:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18U0iQiD084964; Thu, 30 Sep 2021 00:44:26 GMT (envelope-from git) Date: Thu, 30 Sep 2021 00:44:26 GMT Message-Id: <202109300044.18U0iQiD084964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 4a7b49a0da00 - main - ipfilter: Save time and cycles swapping bucket table sizes MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a7b49a0da00d7822656e2adefafac885bbfd310 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Sep 2021 00:44:27 -0000 The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4a7b49a0da00d7822656e2adefafac885bbfd310 commit 4a7b49a0da00d7822656e2adefafac885bbfd310 Author: Cy Schubert AuthorDate: 2021-09-28 03:04:18 +0000 Commit: Cy Schubert CommitDate: 2021-09-30 00:44:02 +0000 ipfilter: Save time and cycles swapping bucket table sizes 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 --- sys/contrib/ipfilter/netinet/ip_nat.c | 13 +++++-------- sys/contrib/ipfilter/netinet/ip_nat6.c | 29 +++++++++++++++++------------ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c index 0475a4386079..054f92a93401 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.c +++ b/sys/contrib/ipfilter/netinet/ip_nat.c @@ -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] >= diff --git a/sys/contrib/ipfilter/netinet/ip_nat6.c b/sys/contrib/ipfilter/netinet/ip_nat6.c index baa3c302504a..c03048ee12ac 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat6.c +++ b/sys/contrib/ipfilter/netinet/ip_nat6.c @@ -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 */