From nobody Wed Mar 26 22:56:56 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 4ZNMc94qhfz5rKxZ; Wed, 26 Mar 2025 22:56:57 +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 4ZNMc90WXRz3KNK; Wed, 26 Mar 2025 22:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743029817; 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=fyWJd2T8qUrlHFZo8osSTtK8FbPx0wn90duLO9Fmm+M=; b=dt0sDsiwJtng7FrNDnGkW2euu9XZYs+i6J5dJIaO+oABc4kaR4d0Tv1u1dH9jOwxHU4S5h GPA+xVfqp4puv0383hDPyg1UXaqHsnuGWNPLC2+l7uDyaP6OqySgIC6wndXu+nAZtqSo3f P61T/9eEeKzbUHkaR26omHnvJYfvLPl8aq0/iZWjiYAezrcV6SOCE51c3KrZMxWvx250Kr YFhRekc1j98QF7YlmQRixEKbGg+9tkrCUD2fUuK9USvdd7X88uFXPbA1eIIPFEB8hM4EPU moydJJTkQY1K31S0Ui4MxmRe3JjMvv1osfI6Xy/TR7G54eVtIYhcb4I/Nf9dGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743029817; a=rsa-sha256; cv=none; b=hfUZRBZM69d9dvEvE13nirlkYDE1IOqDHWTBEgtYRsfFTCn+v/vfJClhPIpMnRenC7QD+t Emka4koYmfUC5gMESZCmMquVnYE508m/eCO8aAjLAbnwpUKF5MgvvzV/Ha9KDcjBY2P7BU JbqiYoBJkSuxwlLD+oIR0AkrxAZRZW/GA8tmts+yTdJgWhKjiT0dnNu63xoDTq6QxKyi4f X5BT9cLpcHphHx3MBq1XmisvfTV6gvSvHIXzBlUKudV40N3G08BlwJoAyWAK1N79T9bHjb Mhfypb68Y88slnv6ql6tB/lxoJrKfR8UCKrslUWzivLzR6f3nAvREo8rLpWqkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743029817; 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=fyWJd2T8qUrlHFZo8osSTtK8FbPx0wn90duLO9Fmm+M=; b=e9R7L3R0EtgkDQsclK0dZkfCxY2ffXa+BpRJIDlRP1QgkSe482pL/NYXmCqB72WiRWIsbj 7ovp49tOEtt9TRWn0Mn2c446kqSpBC6jKjLrUs5MPCtKI1D1t+nMcOmpK9Fx0PHFGimN0t +3yNaoNU66cqt6WMi3hOMcz5pBxzIqENlU6ECdShpccwWuJ5lTaNDEI16iZVNwKJXju45s rpak+0jl9AhTxSshNRZLpRSE+iZ1CsAwlwSxyPbwwMySkbuRg1xd3+bp+oYUXi0+2ZIIOX UU7RyNyqJp7siCn9NterShNL1wuVNZfmI+jfpeStonhL4ITFADlss/eobqPn4g== 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 4ZNMc86xxzzWGf; Wed, 26 Mar 2025 22:56:56 +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 52QMuuql057671; Wed, 26 Mar 2025 22:56:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52QMuuaK057668; Wed, 26 Mar 2025 22:56:56 GMT (envelope-from git) Date: Wed, 26 Mar 2025 22:56:56 GMT Message-Id: <202503262256.52QMuuaK057668@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: fd52a9e11c52 - main - pf tests: test clearing counters for all addresses in a table 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: fd52a9e11c5250c196f5ec7fd2cefa64094621c4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd52a9e11c5250c196f5ec7fd2cefa64094621c4 commit fd52a9e11c5250c196f5ec7fd2cefa64094621c4 Author: Kristof Provost AuthorDate: 2025-03-26 10:53:26 +0000 Commit: Kristof Provost CommitDate: 2025-03-26 22:54:36 +0000 pf tests: test clearing counters for all addresses in a table Basic test case so we exercise the DIOCRCLRTSTATS call. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/table.sh | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index a3d00f8cdb14..78320375db7c 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -236,6 +236,60 @@ zero_one_cleanup() pft_cleanup } +atf_test_case "zero_all" "cleanup" +zero_all_head() +{ + atf_set descr 'Test zeroing all table entries' + atf_set require.user root +} + +zero_all_body() +{ + pft_init + + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + ifconfig ${epair_send}a inet alias 192.0.2.3/24 + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "table counters { 192.0.2.1, 192.0.2.3 }" \ + "block all" \ + "pass in from to any" \ + "pass out from any to " \ + "set skip on lo" + + atf_check -s exit:0 -o ignore ping -c 3 -S 192.0.2.1 192.0.2.2 + atf_check -s exit:0 -o ignore ping -c 3 -S 192.0.2.3 192.0.2.2 + + jexec alcatraz pfctl -t foo -T show -vv + atf_check -s exit:0 -e ignore \ + -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'Out/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv + + atf_check -s exit:0 -e ignore \ + jexec alcatraz pfctl -t foo -T zero + + jexec alcatraz pfctl -t foo -T show -vv + atf_check -s exit:0 -e ignore \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv +} + +zero_all_cleanup() +{ + pft_cleanup +} + atf_test_case "reset_nonzero" "cleanup" reset_nonzero_head() { @@ -534,6 +588,7 @@ atf_init_test_cases() atf_add_test_case "v6_counters" atf_add_test_case "match_counters" atf_add_test_case "zero_one" + atf_add_test_case "zero_all" atf_add_test_case "reset_nonzero" atf_add_test_case "pr251414" atf_add_test_case "automatic"