From nobody Mon Jul 07 15:08:02 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 4bbSKb5cWNz61wLn; Mon, 07 Jul 2025 15:08:03 +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 4bbSKZ5cBRz3wfj; Mon, 07 Jul 2025 15:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751900882; 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=EvjGQMKSjvVaqUf3MDIifr2EfwFi+wuQWKuEflmFx3k=; b=huVuN/I5LRFI6FILceTE1BXbrZfmofYC5u+z4ZDZkr70vjNd7sP4Q/qzEvS/fR8NlfKW6t AcM+sqVwa/BW4dsMyri6h9wjJ5HwkeYzx5vUxNlVq26MBNTpfGQ9F5vd4jgnYBMe3NWBdn Yt8zsa0P1f6ws9NG4JomMjETAcDse1WmJMVLqq7BrTJNE/fZvi0eQZFAt5Vy4DovBvXU7w yhz7SDNkXmr0rIposGm8Ym55xo9AeE7SdnYynDfdDT1RRYWxcY4/KdQjRaH+pCmLKe90Tu vWBd39rmB7hif8c/l/6rltcKP2LBTm4RbargDYvz2mGIpeetu7Vwdc7U3wY42g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751900882; 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=EvjGQMKSjvVaqUf3MDIifr2EfwFi+wuQWKuEflmFx3k=; b=ppwBI8oWFSzN2TTTA5ExLvehH8/BSRCWslixP5rVnw8hKnXd3tL7q4z3c7+7fS40s6+yxx GAJ2CKa1xD/clj3NryDUJleEOonTzv0HgO833FFlPsyGE436a8boLsTVPDVLRz0ppNGPjq swX+avNCbNTrV4yyDzG13uma9Ow8V24uYnPrYleIB63gRUGLKY1NUw+5tRl2PzsH/Y0Ktl v5ECYkLQXVjl7nUqcPDMaaf8fyaNsmz58qoeXEBDXeVUVC4kCHYgSjPbvT5UWnn793CdYu epLBxp6fGE8/pQ+7umJMWVJ8dvrp98qp3Lr8MCoZ6pwFyAMPPwmoSTcuXbXhqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751900882; a=rsa-sha256; cv=none; b=m/ZzIDTMKls58SjCeNodpzdvFMPjnW37QiciuIVnKfZKj75l7N7BRghaTYc0C6u3db1aws QTLNTnxkjal1Ox2XvGk77uaW35AoCPn3qLncImwuvlJzdeMBTPEhGOy8E3xbYo9AKbd2Hl 644J7fmqHEKMQBRDBa/lHYX8h1y8hds8vPczHgaL1Ktt9vlOo6nW+Kd8cgQREQXgKD/RC4 h7UBUDSpS21qQxw1yVyBJOuMFTKLthw1YOLX64InbaLUEahs20YvirjxDT/b1TTncLO+cD 318eKc4JNW8/u+7nVoBku1DH4zbocmIO7USe0CD2Vy7Y+YPNwf4rDhgW+xU7jg== 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 4bbSKZ58VRzvGW; Mon, 07 Jul 2025 15:08:02 +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 567F82Mq016848; Mon, 7 Jul 2025 15:08:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567F82SD016845; Mon, 7 Jul 2025 15:08:02 GMT (envelope-from git) Date: Mon, 7 Jul 2025 15:08:02 GMT Message-Id: <202507071508.567F82SD016845@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: 95d1b98db164 - main - pf tests: verify the new reset functionality 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: 95d1b98db164f1e99622b2425cf39d96ddab44bc Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=95d1b98db164f1e99622b2425cf39d96ddab44bc commit 95d1b98db164f1e99622b2425cf39d96ddab44bc Author: Kristof Provost AuthorDate: 2025-07-02 15:00:16 +0000 Commit: Kristof Provost CommitDate: 2025-07-07 15:06:51 +0000 pf tests: verify the new reset functionality We can now reset state limit, debug level and others. Verify reset for at least some of these. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/debug.sh | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/sys/netpfil/pf/debug.sh b/tests/sys/netpfil/pf/debug.sh index 18a7febfbb5b..404d37ab8932 100644 --- a/tests/sys/netpfil/pf/debug.sh +++ b/tests/sys/netpfil/pf/debug.sh @@ -50,7 +50,57 @@ basic_cleanup() pft_cleanup } +atf_test_case "reset" "cleanup" +reset_head() +{ + atf_set descr 'Test resetting debug level' + atf_set require.user root +} + +reset_body() +{ + pft_init + + vnet_mkjail debug + + # Default is Urgent + atf_check -s exit:0 -o match:'Debug: Urgent' \ + jexec debug pfctl -sa + state_limit=$(jexec debug pfctl -sa | grep 'states.*hard limit' | awk '{ print $4; }') + + # Change defaults + pft_set_rules debug \ + "set limit states 42" + atf_check -s exit:0 -e ignore \ + jexec debug pfctl -x loud + + atf_check -s exit:0 -o match:'Debug: Loud' \ + jexec debug pfctl -sa + new_state_limit=$(jexec debug pfctl -sa | grep 'states.*hard limit' | awk '{ print $4; }') + if [ $state_limit -eq $new_state_limit ]; then + jexec debug pfctl -sa + atf_fail "Failed to change state limit" + fi + + # Reset + atf_check -s exit:0 -o ignore -e ignore \ + jexec debug pfctl -FR + atf_check -s exit:0 -o match:'Debug: Urgent' \ + jexec debug pfctl -sa + new_state_limit=$(jexec debug pfctl -sa | grep 'states.*hard limit' | awk '{ print $4; }') + if [ $state_limit -ne $new_state_limit ]; then + jexec debug pfctl -sa + atf_fail "Failed to reset state limit" + fi +} + +reset_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic" + atf_add_test_case "reset" }