From nobody Mon Mar 28 11:47:31 2022 X-Original-To: dev-commits-src-main@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 87B8A1A42716; Mon, 28 Mar 2022 11:47:32 +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 4KRrXh0F0Yz4Sdn; Mon, 28 Mar 2022 11:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648468052; 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=76zVIDy7TbjhQ11VyCUvk+8NBoQ0KoNmBzKMUFfn5mg=; b=CZo6Q1StZSk96PsnqTDUYP1rQvZ4kaqf+Nbewdl0wt5HwlwkX9uRZ77b0+m0eOHjyAWi6C JjNXuJO8OLxlol5Wg+8WRry7xy5DE81RlC4pC4M8bBdSfolijXVGcHFLwosjBxZO+08Q3E DeWA6pP5Aa6RPvDWcms1V1ZaMfs4Fa0GeA3+MnH6TuA+mf4/n5MnUqpDiDO0UpwyUeKA9B HU6w/+G0I0OGHfTDS4ROy2tjZv/fLYwIhEaTNKQO4LXJO+/QcI922DOmTXlS84NwZnm2oB m6JTxeJvuIuFLsbw7vMBwJXwn4vtQP6CKggkHWJ18fky+tNZ6sO1wfLGp5necw== 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 B5D31F4D; Mon, 28 Mar 2022 11:47:31 +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 22SBlVgB090166; Mon, 28 Mar 2022 11:47:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SBlVZo090165; Mon, 28 Mar 2022 11:47:31 GMT (envelope-from git) Date: Mon, 28 Mar 2022 11:47:31 GMT Message-Id: <202203281147.22SBlVZo090165@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: 1a3e98a5b876 - main - pf: pre-compute rule hash List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 1a3e98a5b87670760af9a480884b46615dc138c2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648468052; 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=76zVIDy7TbjhQ11VyCUvk+8NBoQ0KoNmBzKMUFfn5mg=; b=PcYNw6EGhPMgOr3UN7/8ryuch6Aie7zLVUwW6ltSkdhvWtDNtr2PWoZE+tb2OS1STkO3+o dEueswZ8joz4AxYzRpREd/kI16ZxIj9DiyDiqTFWoKzWs5yMtfZwc4WPYbEzwNGWQpFRET BMoOH0WStr9WBiCw0B1O/eqU8lhVUUpVePXlSPCAMtyeP8Ga1MIfLpf26aWNkAYqVPKxGw 9W/7DoKlS3QvpjTsNh9mzuX1LFe9YCWfWK9C9jqt0rIJWayghICTFvP6t+bF8kSKniHUWF UPkOE3slm/gGRA9B2c2BmwRm4jqc9XqNPrcMsp+lKZ2i1wotSA/xghFnHldN4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648468052; a=rsa-sha256; cv=none; b=YrSQ5c94a7nNC0ozJMHp94wsKazTtXylZpoacRMeIAYcvlnpmgx5+FgKAaghMKSy70Yog8 D46vKdkCGT79tswIyaBSA0TuQcL26Cy6bVsnYAFMAf86bOKUa49NVnBy5ONKQjEUFCdNOJ xeZyadBB9El0u4EEE3JTOZfS0mGDonhWoxLE9JDN4D9rnG9n16uCfzFwhr7yzmV+hsC7Yw FMrUDVYUk3KM6A9GLKjeyONFOwE3YlQIcdo2HosE3Uk1fmjBKkj39KyDv7wHRT+Sd+3Nqe 9FibGBx1ugbZLxNPEmqm7l7jA6lpfoLwkNPrGSY0t00FCHUmlI/yAiHjzHeR/g== 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=1a3e98a5b87670760af9a480884b46615dc138c2 commit 1a3e98a5b87670760af9a480884b46615dc138c2 Author: Mateusz Guzik AuthorDate: 2022-02-25 17:50:56 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-28 11:44:52 +0000 pf: pre-compute rule hash Makes it cheaper to compare rules when "keep_counters" is set. This also sets up keeping them in a RB tree. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 1 + sys/netpfil/pf/pf_ioctl.c | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 66cb6a4ba051..b83a6d90f8d6 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -769,6 +769,7 @@ struct pf_krule { struct pf_addr addr; u_int16_t port; } divert; + u_int8_t md5sum[PF_MD5_DIGEST_LENGTH]; #ifdef PF_WANT_32_TO_64_COUNTER LIST_ENTRY(pf_krule) allrulelist; diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 117ee0d04c53..724ca9b700db 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -123,7 +123,8 @@ static void pf_qid_unref(uint16_t); static int pf_begin_rules(u_int32_t *, int, const char *); static int pf_rollback_rules(u_int32_t, int, char *); static int pf_setup_pfsync_matching(struct pf_kruleset *); -static void pf_hash_rule(MD5_CTX *, struct pf_krule *); +static void pf_hash_rule_rolling(MD5_CTX *, struct pf_krule *); +static void pf_hash_rule(struct pf_krule *); static void pf_hash_rule_addr(MD5_CTX *, struct pf_rule_addr *); static int pf_commit_rules(u_int32_t, int, char *); static int pf_addr_setup(struct pf_kruleset *, @@ -1223,7 +1224,7 @@ pf_hash_rule_addr(MD5_CTX *ctx, struct pf_rule_addr *pfr) } static void -pf_hash_rule(MD5_CTX *ctx, struct pf_krule *rule) +pf_hash_rule_rolling(MD5_CTX *ctx, struct pf_krule *rule) { u_int16_t x; u_int32_t y; @@ -1264,20 +1265,21 @@ pf_hash_rule(MD5_CTX *ctx, struct pf_krule *rule) PF_MD5_UPD_STR(rule, anchor->path); } +static void +pf_hash_rule(struct pf_krule *rule) +{ + MD5_CTX ctx; + + MD5Init(&ctx); + pf_hash_rule_rolling(&ctx, rule); + MD5Final(rule->md5sum, &ctx); +} + static bool pf_krule_compare(struct pf_krule *a, struct pf_krule *b) { - MD5_CTX ctx[2]; - u_int8_t digest[2][PF_MD5_DIGEST_LENGTH]; - - MD5Init(&ctx[0]); - MD5Init(&ctx[1]); - pf_hash_rule(&ctx[0], a); - pf_hash_rule(&ctx[1], b); - MD5Final(digest[0], &ctx[0]); - MD5Final(digest[1], &ctx[1]); - return (memcmp(digest[0], digest[1], PF_MD5_DIGEST_LENGTH) == 0); + return (memcmp(a->md5sum, b->md5sum, PF_MD5_DIGEST_LENGTH) == 0); } static int @@ -1394,7 +1396,7 @@ pf_setup_pfsync_matching(struct pf_kruleset *rs) TAILQ_FOREACH(rule, rs->rules[rs_cnt].inactive.ptr, entries) { - pf_hash_rule(&ctx, rule); + pf_hash_rule_rolling(&ctx, rule); (rs->rules[rs_cnt].inactive.ptr_array)[rule->nr] = rule; } } @@ -2204,6 +2206,7 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, ruleset->rules[rs_num].inactive.rcount++; PF_RULES_WUNLOCK(); + pf_hash_rule(rule); PF_CONFIG_UNLOCK(); return (0);