From nobody Mon Mar 28 11:47:32 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 83A081A42725; Mon, 28 Mar 2022 11:47:33 +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 4KRrXj0dkVz4ShW; Mon, 28 Mar 2022 11:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648468053; 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=IbHiz5vm7irMTD2jMngbOq1bXyouLF4cwpjM51F9WAE=; b=RqSrssmrTmnDavTNMGbY1adrKPS06bbr9spwIKNNGEQGhkeIjOw6oW2cDrKYZZLaulV5Vb 29t/gKjLdHlNPd5yBRbQFSECr/iHR2L7qQSsOkyNgMLQ44w9roI0TlSA4LlzwGwY6LOZ+w IfTJ7b0HJfrYKGoIv6Lb+7OjiLWmCixyrntnnDQZ3Kw3VnzTt1bPl3rMFDNdDTWrZIgTGO jL4eNbNgahg9/TYZHRmsImqBCswFh1fv4dVPEhhiBCa9zzLRwXsFgs2WQ7l8IzeCgYn1FL sWUGtl/gHpUQR/tSu57vtJxBWrbgrFPK6tkhl8m/jgSx3VSeYcMR77U3RRAS2A== 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 D67361078; Mon, 28 Mar 2022 11:47:32 +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 22SBlWhJ090190; Mon, 28 Mar 2022 11:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SBlWxQ090189; Mon, 28 Mar 2022 11:47:32 GMT (envelope-from git) Date: Mon, 28 Mar 2022 11:47:32 GMT Message-Id: <202203281147.22SBlWxQ090189@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: bd7762c86986 - main - pf: add a rule rb tree 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: bd7762c86986537a5b393537b85de31b1556735b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648468053; 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=IbHiz5vm7irMTD2jMngbOq1bXyouLF4cwpjM51F9WAE=; b=hBpIJ8P+jTeVaW2bIYSOFPu5Vq2JfD14S/to5Te/ToWMz9wTDzEfCEuXyeZvpXKrd6AXva 9PZdAWCf4bVzytmAy5u4jUEh2fv3hYm4HHxLaY7ylTwrkkqzOE0m/3hNW3akXJhZsnn9WI oTyVah5PYTsVeIonE432nHxJA3xScZSCo55w7ePkCniXdfg+ZAzSMvLedV+5CXEnnnz0qI dkvUNGksJSufx/P+zDnUMaB9nKezV/rLdTZxveFkuvdzwXjh1xJj7aItaGsr48nBAH7Tc9 Z37KQL0lzMT/FBjoBtzhy0TRQC3uDdoEUmUKc27p1YkfU+PKaLgE4S4mEwwU2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648468053; a=rsa-sha256; cv=none; b=OZD1eN7Q/q8sc3V5BWEP3N2fQlUtVfcLeOju10zs47exWELzgpwDOz/JMaYPghbLZoFju/ 34xDL3nihb5TzVN53Cg4utUYgCjDeG0OkCgQKGeCSISlBFZWXFGmQB2LRHZVYrSK9fWiyu YJ/Kke9h/6HvUAf8/SuNxXO6dvEm0vb5a/LtK63BMB1L7b2xf4sOG3TClgjeYaDDRyMdEp XxbXt5cur4O8smqjFbvIlkVVKM4Rcq+Z9uAJJpbAUAI9mM+zYztnZg8VFtn8oBBZO8DTeK YoTHyAWDsGJrG6odCYEElxgUkjkdoMl5iz0eopmxZj5tFXVWyDaN3d9QX3m6LA== 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=bd7762c86986537a5b393537b85de31b1556735b commit bd7762c86986537a5b393537b85de31b1556735b Author: Mateusz Guzik AuthorDate: 2022-02-28 20:17:32 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-28 11:45:03 +0000 pf: add a rule rb tree with md5 sum used as key. This gets rid of the quadratic rule traversal when "keep_counters" is set. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 5 ++++ sys/netpfil/pf/pf_ioctl.c | 70 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index b83a6d90f8d6..ccc81ea137b9 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -673,6 +673,9 @@ union pf_krule_ptr { u_int32_t nr; }; +RB_HEAD(pf_krule_global, pf_krule); +RB_PROTOTYPE(pf_krule_global, pf_krule, entry_global, pf_krule_compare); + struct pf_krule { struct pf_rule_addr src; struct pf_rule_addr dst; @@ -770,6 +773,7 @@ struct pf_krule { u_int16_t port; } divert; u_int8_t md5sum[PF_MD5_DIGEST_LENGTH]; + RB_ENTRY(pf_krule) entry_global; #ifdef PF_WANT_32_TO_64_COUNTER LIST_ENTRY(pf_krule) allrulelist; @@ -1140,6 +1144,7 @@ struct pf_kruleset { u_int32_t rcount; u_int32_t ticket; int open; + struct pf_krule_global *tree; } active, inactive; } rules[PF_RULESET_MAX]; struct pf_kanchor *anchor; diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 724ca9b700db..ae07fe80fbf8 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -141,6 +141,11 @@ static int pf_import_kaltq(struct pfioc_altq_v1 *, VNET_DEFINE(struct pf_krule, pf_default_rule); +static __inline int pf_krule_compare(struct pf_krule *, + struct pf_krule *); + +RB_GENERATE(pf_krule_global, pf_krule, entry_global, pf_krule_compare); + #ifdef ALTQ VNET_DEFINE_STATIC(int, pf_altq_running); #define V_pf_altq_running VNET(pf_altq_running) @@ -530,6 +535,7 @@ pf_free_rule(struct pf_krule *rule) { PF_RULES_WASSERT(); + PF_CONFIG_ASSERT(); if (rule->tag) tag_unref(&V_pf_tags, rule->tag); @@ -1141,6 +1147,7 @@ out: static int pf_begin_rules(u_int32_t *ticket, int rs_num, const char *anchor) { + struct pf_krule_global *tree; struct pf_kruleset *rs; struct pf_krule *rule; @@ -1148,9 +1155,18 @@ pf_begin_rules(u_int32_t *ticket, int rs_num, const char *anchor) if (rs_num < 0 || rs_num >= PF_RULESET_MAX) return (EINVAL); + tree = malloc(sizeof(struct pf_krule_global), M_TEMP, M_NOWAIT); + if (tree == NULL) + return (ENOMEM); + RB_INIT(tree); rs = pf_find_or_create_kruleset(anchor); - if (rs == NULL) + if (rs == NULL) { + free(tree, M_TEMP); return (EINVAL); + } + free(rs->rules[rs_num].inactive.tree, M_TEMP); + rs->rules[rs_num].inactive.tree = tree; + while ((rule = TAILQ_FIRST(rs->rules[rs_num].inactive.ptr)) != NULL) { pf_unlink_rule(rs->rules[rs_num].inactive.ptr, rule); rs->rules[rs_num].inactive.rcount--; @@ -1275,19 +1291,20 @@ pf_hash_rule(struct pf_krule *rule) MD5Final(rule->md5sum, &ctx); } -static bool +static int pf_krule_compare(struct pf_krule *a, struct pf_krule *b) { - return (memcmp(a->md5sum, b->md5sum, PF_MD5_DIGEST_LENGTH) == 0); + return (memcmp(a->md5sum, b->md5sum, PF_MD5_DIGEST_LENGTH)); } static int pf_commit_rules(u_int32_t ticket, int rs_num, char *anchor) { struct pf_kruleset *rs; - struct pf_krule *rule, **old_array, *tail; + struct pf_krule *rule, **old_array, *old_rule; struct pf_krulequeue *old_rules; + struct pf_krule_global *old_tree; int error; u_int32_t old_rcount; @@ -1311,40 +1328,43 @@ pf_commit_rules(u_int32_t ticket, int rs_num, char *anchor) old_rules = rs->rules[rs_num].active.ptr; old_rcount = rs->rules[rs_num].active.rcount; old_array = rs->rules[rs_num].active.ptr_array; + old_tree = rs->rules[rs_num].active.tree; rs->rules[rs_num].active.ptr = rs->rules[rs_num].inactive.ptr; rs->rules[rs_num].active.ptr_array = rs->rules[rs_num].inactive.ptr_array; + rs->rules[rs_num].active.tree = + rs->rules[rs_num].inactive.tree; rs->rules[rs_num].active.rcount = rs->rules[rs_num].inactive.rcount; /* Attempt to preserve counter information. */ - if (V_pf_status.keep_counters) { + if (V_pf_status.keep_counters && old_tree != NULL) { TAILQ_FOREACH(rule, rs->rules[rs_num].active.ptr, entries) { - tail = TAILQ_FIRST(old_rules); - while ((tail != NULL) && ! pf_krule_compare(tail, rule)) - tail = TAILQ_NEXT(tail, entries); - if (tail != NULL) { - pf_counter_u64_critical_enter(); - pf_counter_u64_add_protected(&rule->evaluations, - pf_counter_u64_fetch(&tail->evaluations)); - pf_counter_u64_add_protected(&rule->packets[0], - pf_counter_u64_fetch(&tail->packets[0])); - pf_counter_u64_add_protected(&rule->packets[1], - pf_counter_u64_fetch(&tail->packets[1])); - pf_counter_u64_add_protected(&rule->bytes[0], - pf_counter_u64_fetch(&tail->bytes[0])); - pf_counter_u64_add_protected(&rule->bytes[1], - pf_counter_u64_fetch(&tail->bytes[1])); - pf_counter_u64_critical_exit(); + old_rule = RB_FIND(pf_krule_global, old_tree, rule); + if (old_rule == NULL) { + continue; } + pf_counter_u64_critical_enter(); + pf_counter_u64_add_protected(&rule->evaluations, + pf_counter_u64_fetch(&old_rule->evaluations)); + pf_counter_u64_add_protected(&rule->packets[0], + pf_counter_u64_fetch(&old_rule->packets[0])); + pf_counter_u64_add_protected(&rule->packets[1], + pf_counter_u64_fetch(&old_rule->packets[1])); + pf_counter_u64_add_protected(&rule->bytes[0], + pf_counter_u64_fetch(&old_rule->bytes[0])); + pf_counter_u64_add_protected(&rule->bytes[1], + pf_counter_u64_fetch(&old_rule->bytes[1])); + pf_counter_u64_critical_exit(); } } rs->rules[rs_num].inactive.ptr = old_rules; rs->rules[rs_num].inactive.ptr_array = old_array; + rs->rules[rs_num].inactive.tree = NULL; rs->rules[rs_num].inactive.rcount = old_rcount; rs->rules[rs_num].active.ticket = @@ -1362,6 +1382,7 @@ pf_commit_rules(u_int32_t ticket, int rs_num, char *anchor) rs->rules[rs_num].inactive.rcount = 0; rs->rules[rs_num].inactive.open = 0; pf_remove_if_empty_kruleset(rs); + free(old_tree, M_TEMP); return (0); } @@ -2207,6 +2228,13 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, PF_RULES_WUNLOCK(); pf_hash_rule(rule); + if (RB_INSERT(pf_krule_global, ruleset->rules[rs_num].inactive.tree, rule) != NULL) { + PF_RULES_WLOCK(); + pf_free_rule(rule); + rule = NULL; + error = EINVAL; + ERROUT(error); + } PF_CONFIG_UNLOCK(); return (0);