From nobody Sat Jul 12 13:38:53 2025 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 4bfV6Q0Zb6z61sTp; Sat, 12 Jul 2025 13:38:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfV6P4Vlkz3CX0; Sat, 12 Jul 2025 13:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327533; 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=0GSLK4zHRbKynMxwxhqhX/RF5/suLGOdsqsTnYIrXWs=; b=gJSfPuK7dXcJ3flCkOajpoGk2O94Wsrycmm6gbuQstaVTXjet1zhCiKrjqV3Bf3QWtrKVe C2LHNAKQDOi0SmtRHPoHmE3oqRis3GAUaPnQeYzZJhBWceez17WKJt/Jov3WmGH1leHZzN TXM/ge/te1gA3GS7n+MMg+vL+EAjhNPO7rWC4NH/tVVftfTxA0Web0Z7EE5OXG6u3HFKaf YDhOayovv6hm614Lo9V4fEiv8Vu/D5qcg7PSPRAHVGRMBjUekMj+3rajxM+wR62MIRi4XF 8L6N3qn6BVeBJe2+k1xTaM/Qt4yYYu06qfjs2a/QIVhysOq+LOfWgkfCYDMKqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327533; 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=0GSLK4zHRbKynMxwxhqhX/RF5/suLGOdsqsTnYIrXWs=; b=uuyeHorGQuo1MRW0iipy8Sa2RvBkMY2KfqMXUb6nPDDLu9DaRNWCbq6HEW/cjdi4kTMDOL PA1XkYOt2BvOqQys1B0bHF+mDVgqYAUp8ulNm5PZMzrTy1U/quMfnMV+ZxjeFKN82huKWs Q9hULE+Pjd4TraVGYOGtRqLEYALLcOQ2hO2dEitoiPP1K6Jefc60vj1LuUmHBmgc9/Sp1P WCxB2c3qHlIc2UVdXiK4jGFOaUCkIs9ar7ERltayvakySPEs7JlS28XraqqSOqKn2EUO8X 8cX32aKVDAzWThJUDH2TBwmoOpXxF1Jt8lUoLcN+sTn+7x7I//8CxUCp+RnmWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752327533; a=rsa-sha256; cv=none; b=oaPNqWNUsvqLypaXkDtXyKGqvn+nZ3k0EHroY8ziwmDeM8HmjOIejSnd2n6VQV9zdvoUa8 IuI2g3Z3nDF8orhT0ca7QjC3gbVaQk4UG05YCOM8LwTRFKkDkmGWNXZHmi2b2QtfEDaxa+ 7TTOmogCHAWSpaVxgMuqQNU8Ay06BHfucHQBLw8WFIDRC+psbLa40HMCDpQ0w81h4+RwqS HR/2bdPO/wFxQMHBwcC+7X9P8cGrBpS2PjUjZgoOZa/2gYQGJjUMnJYTAnm+Sx32k4/1zb o50OqI0d57yBZF8tIjQe7IhXdt7N3VKpcgeHXG2j1LsOQmibrxSgVKUpCFfy7w== 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 4bfV6P3x0Gz9H1; Sat, 12 Jul 2025 13:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56CDcrnF088995; Sat, 12 Jul 2025 13:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56CDcrKV088992; Sat, 12 Jul 2025 13:38:53 GMT (envelope-from git) Date: Sat, 12 Jul 2025 13:38:53 GMT Message-Id: <202507121338.56CDcrKV088992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a9706d78bddf - main - pfctl: replace TAILQ concatenation loop with TAILQ_CONCAT 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9706d78bddf3e002d108d7ceb189cf40064fea2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a9706d78bddf3e002d108d7ceb189cf40064fea2 commit a9706d78bddf3e002d108d7ceb189cf40064fea2 Author: Kristof Provost AuthorDate: 2025-07-07 07:16:56 +0000 Commit: Kristof Provost CommitDate: 2025-07-12 09:57:51 +0000 pfctl: replace TAILQ concatenation loop with TAILQ_CONCAT OK kn@, sashan@, florian@ Obtained from: OpenBSD, bket , c8d5c2349e Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 14 +++----------- sbin/pfctl/pfctl_optimize.c | 17 +++-------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 2188324c15cb..9a917d1d8464 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -7202,19 +7202,11 @@ mv_rules(struct pfctl_ruleset *src, struct pfctl_ruleset *dst) struct pfctl_rule *r; for (i = 0; i < PF_RULESET_MAX; ++i) { - while ((r = TAILQ_FIRST(src->rules[i].active.ptr)) - != NULL) { - TAILQ_REMOVE(src->rules[i].active.ptr, r, entries); - TAILQ_INSERT_TAIL(dst->rules[i].active.ptr, r, entries); + TAILQ_FOREACH(r, src->rules[i].active.ptr, entries) dst->anchor->match++; - } + TAILQ_CONCAT(dst->rules[i].active.ptr, src->rules[i].active.ptr, entries); src->anchor->match = 0; - while ((r = TAILQ_FIRST(src->rules[i].inactive.ptr)) - != NULL) { - TAILQ_REMOVE(src->rules[i].inactive.ptr, r, entries); - TAILQ_INSERT_TAIL(dst->rules[i].inactive.ptr, - r, entries); - } + TAILQ_CONCAT(dst->rules[i].inactive.ptr, src->rules[i].inactive.ptr, entries); } } diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index d65503a3efb3..b82e88652f86 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -723,11 +723,7 @@ reorder_rules(struct pfctl *pf, struct superblock *block, int depth) * it based on a more optimal skipstep order. */ TAILQ_INIT(&head); - while ((por = TAILQ_FIRST(&block->sb_rules))) { - TAILQ_REMOVE(&block->sb_rules, por, por_entry); - TAILQ_INSERT_TAIL(&head, por, por_entry); - } - + TAILQ_CONCAT(&head, &block->sb_rules, por_entry); while (!TAILQ_EMPTY(&head)) { largest = 1; @@ -748,11 +744,7 @@ reorder_rules(struct pfctl *pf, struct superblock *block, int depth) * Nothing useful left. Leave remaining rules in order. */ DEBUG("(%d) no more commonality for skip steps", depth); - while ((por = TAILQ_FIRST(&head))) { - TAILQ_REMOVE(&head, por, por_entry); - TAILQ_INSERT_TAIL(&block->sb_rules, por, - por_entry); - } + TAILQ_CONCAT(&block->sb_rules, &head, por_entry); } else { /* * There is commonality. Extract those common rules @@ -863,10 +855,7 @@ block_feedback(struct pfctl *pf, struct superblock *block) */ TAILQ_INIT(&queue); - while ((por1 = TAILQ_FIRST(&block->sb_rules)) != NULL) { - TAILQ_REMOVE(&block->sb_rules, por1, por_entry); - TAILQ_INSERT_TAIL(&queue, por1, por_entry); - } + TAILQ_CONCAT(&queue, &block->sb_rules, por_entry); while ((por1 = TAILQ_FIRST(&queue)) != NULL) { TAILQ_REMOVE(&queue, por1, por_entry);