From nobody Fri Sep 9 17:26:12 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MPNFK5z96z4bvGZ; Fri, 9 Sep 2022 17:26:13 +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 4MPNFK3LBHz3Chk; Fri, 9 Sep 2022 17:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662744373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=myBRXdXndNp0Cg7lokAlmPfNvBT5W2yJ6o2xqFJahok=; b=ozk9lBi8JTjXj/6MX9Qz9uPQCkJRKOH2v4CCUKRMjUL/j1zblMmq2fTbCRCXTbVJc1iz7H qWSCOgGT1iNScIoWHyZhM062bFSs4XTQhFVAtjUW1Xg0LLavOIpTTKWOiS5Zj7CJc0GRAP t0y/HrJReQlFA5gKV09BJ9C7QnKpK6Yr0nDADhGGhExKcVv+wQUD9zvHBDIQRvU/oettfF Ifhv2J1XvTNLQIXD2cQyx1cnVuTZ0oqO7aqAf4Or22tL0KhDeI45TPrb1h0aCNMx5/gfyR 0HkzITQqf96BHSKErAbB8PwBPtSzk8juEu/cDBseyA+v5ybNCBlIQXvdZtMH0A== 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 4MPNFJ6Z9bz1GyC; Fri, 9 Sep 2022 17:26:12 +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 289HQCoD058262; Fri, 9 Sep 2022 17:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 289HQCu2058261; Fri, 9 Sep 2022 17:26:12 GMT (envelope-from git) Date: Fri, 9 Sep 2022 17:26:12 GMT Message-Id: <202209091726.289HQCu2058261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: e5d08f472977 - main - pf: remove pf_bcmp_state_key List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5d08f472977fa6caa93805aa0dc8593c4e48cdf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662744373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=myBRXdXndNp0Cg7lokAlmPfNvBT5W2yJ6o2xqFJahok=; b=bx6EOYU+Fj+6UztEktj2S6zqNUcmNY66nQ1pLDWAbVQ9YUn09bUTuRo3qj/ItGDoH3AAen j6M2IaVMN2BcAxAa4vuLcsoD5vRNCa1k+gIraxhEzcsKGXVTs1o9qdatyYUZ8ohzRjMlF+ HZdZ1REFxKOMIYdLBA0ASs3oXL4DMsI1ZPE7vh11CxleIlcYm7D8nSu8YtdPRlIQzSMiYB RLvw9Pn5x75T46dJozFRAaARaTSkhp+XuYToluRiAGr3ngqfJIRSAYONSvk0mcJ/HcvXjR NcvjfdsBRFWXyYZitKjm1B6LsoTIhlrqJ7PxoaK1puTof8c1UGOy6aDPmLnITQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662744373; a=rsa-sha256; cv=none; b=fIMnzS68fbWcd2xYd24BtN+39LLxh8rrHLD1E+az7CESxsZwExmwdNwiZM/5Nko3iqSLtc TXc/MjVJpNFWzWmO12pNNxQwSyJfFvBgRkQsJ8CajnPcKf5QJm6Fv66W0yVcm3lyurwMTh q3/2IPt5q5SDBrZ/14eYz2YibsinIKfFYZ9UqYG3BD2vyR0TXPnD5z5m5q/lPMtvvBco4O 9eIPTpzyrYj28hNimQjhb2ZWerphj1dMKEkPbwC41XNvkwlL/3FF5Z/RfgcU5ji47ic9Jm VHeEszcyTpXtaKDHECWsoiOKGjfdYHh0XL3wyBxFxOT/znXk1Ld5z/wnsutxrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e5d08f472977fa6caa93805aa0dc8593c4e48cdf commit e5d08f472977fa6caa93805aa0dc8593c4e48cdf Author: Mateusz Guzik AuthorDate: 2022-09-09 17:16:58 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-09 17:16:58 +0000 pf: remove pf_bcmp_state_key Clang 14 performs the optimisation on its own, thus the custom code is no longer needed. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 40 +++------------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index b46c16659ddb..33ef5119ee3c 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -438,40 +438,6 @@ VNET_DEFINE(struct intr_event *, pf_swi_ie); VNET_DEFINE(uint32_t, pf_hashseed); #define V_pf_hashseed VNET(pf_hashseed) -#ifdef __LP64__ -static int -pf_bcmp_state_key(struct pf_state_key *k1_orig, struct pf_state_key_cmp *k2_orig) -{ - unsigned long *k1 = (unsigned long *)k1_orig; - unsigned long *k2 = (unsigned long *)k2_orig; - - if (k1[0] != k2[0]) - return (1); - - if (k1[1] != k2[1]) - return (1); - - if (k1[2] != k2[2]) - return (1); - - if (k1[3] != k2[3]) - return (1); - - if (k1[4] != k2[4]) - return (1); - - return (0); -} -_Static_assert(sizeof(struct pf_state_key_cmp) == 40, "bad size of pf_state_key_cmp"); -#else -static inline int -pf_bcmp_state_key(struct pf_state_key *k1_orig, struct pf_state_key_cmp *k2_orig) -{ - - return (bcmp(k1_orig, k2_orig, sizeof(struct pf_state_key_cmp))); -} -#endif - int pf_addr_cmp(struct pf_addr *a, struct pf_addr *b, sa_family_t af) { @@ -1227,7 +1193,7 @@ pf_state_key_attach(struct pf_state_key *skw, struct pf_state_key *sks, keyattach: LIST_FOREACH(cur, &kh->keys, entry) - if (pf_bcmp_state_key(cur, (struct pf_state_key_cmp *)sk) == 0) + if (bcmp(cur, sk, sizeof(struct pf_state_key_cmp)) == 0) break; if (cur != NULL) { @@ -1533,7 +1499,7 @@ pf_find_state(struct pfi_kkif *kif, struct pf_state_key_cmp *key, u_int dir) PF_HASHROW_LOCK(kh); LIST_FOREACH(sk, &kh->keys, entry) - if (pf_bcmp_state_key(sk, key) == 0) + if (bcmp(sk, key, sizeof(struct pf_state_key_cmp)) == 0) break; if (sk == NULL) { PF_HASHROW_UNLOCK(kh); @@ -1580,7 +1546,7 @@ pf_find_state_all(struct pf_state_key_cmp *key, u_int dir, int *more) PF_HASHROW_LOCK(kh); LIST_FOREACH(sk, &kh->keys, entry) - if (pf_bcmp_state_key(sk, key) == 0) + if (bcmp(sk, key, sizeof(struct pf_state_key_cmp)) == 0) break; if (sk == NULL) { PF_HASHROW_UNLOCK(kh);