From nobody Mon Jul 3 19:32:52 2023 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 4Qvx0N45Fvz4lVbw; Mon, 3 Jul 2023 19:32:52 +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 4Qvx0N2lpjz4Cj2; Mon, 3 Jul 2023 19:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688412772; 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=XcxWFBzni8CW11xaQgJmUU2ZYymrajSCEiE2rzrNTA0=; b=gvNHu/G9LKjA7JoAnyqtf8Ge+2CLnvsgzS+3SjAME1uXkRvwCmgLWT+1NS8hadRffRVjig ccPQghLLwgLM7a3LsQ0VymGG+TOpjwGx+G6U0a93pLvtlaY2EAcOXeC2mGorvq9L0TEnHB IQgmVyz9XJkxc1HubTbvkZsoTV98+ZJ7ZL65pyDQGhugmBhNMT/3go7ZldQsawjoUErDqi rRxGDi5q870YCoZGNuy8XZiLuJ1NRiRkbYqW3kBaGXpC1ZK7nqZBAHcwB+7U7RM/iM6NPA mT2Ky3w7vI4+i6xGk/0NbHWqZIPl3p3jzOHXryV478HObjyRbD0yQUewo2Q73g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688412772; 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=XcxWFBzni8CW11xaQgJmUU2ZYymrajSCEiE2rzrNTA0=; b=g1qwY7FpLG++BX0YdSi1wx5mFf2xnIz6RDk1nfbsJsSoWPbGkmZtf8oW8i5bqK93rOZ53R Ab/EEafU2uiJ8dVmRNPKr0kYPW6WFzxpzyKa9phhZ+6lBYREvZM0ZTW4/cPel6Arny3QNo oppwkTwiPWTczXQza8gCUOkg53vl9gCilRzf1RnAp843js0nYWjd/Uv0oWWFux3EYaKkLu T3w2Rzbf71a3d9JfUWpsF4GqiSycCCV+K1IW3AQTxPldfR0HuYfr3sxNV5JEhwRfVEtFxT 24xN2cRyNqL7mHW5aMCdAysorldBiNd7cADi58IGOmj+Zo3Mi55FQnvNlGNVEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688412772; a=rsa-sha256; cv=none; b=lpp28OBYwS48ilsW6+CV/bcWLVLn4NJ53bu+S4Ax8HSpCLaqmPYZRsBSNfkr+Gz5ttF3Z5 //Se37omcJTRhjUKob5e+PoZSswU9ZhOfI42iigJsyL84bs0jBH1XkbZlKiOcGIYtbMpmf e99l0lFv/r+FQbH88gf9bNcjOZVTteoOxtnjZejv2qbb1u6F9rGpyaYR7MaL4eaZaNSeYI ksKAQ8GFQZlotUmMyeYXg+lWF75QzAVvbF0S009sQ6afgpkQ48UoZPtf/GHFvhB2gGtICI 3d1dJviGfm3hsGo2B8DQiU1bBl4GaslibiaMRu1IMjA+1md5qfgEt/8/dEKGww== 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 4Qvx0N1q76z12Z7; Mon, 3 Jul 2023 19:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 363JWq1g048026; Mon, 3 Jul 2023 19:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 363JWqhD048025; Mon, 3 Jul 2023 19:32:52 GMT (envelope-from git) Date: Mon, 3 Jul 2023 19:32:52 GMT Message-Id: <202307031932.363JWqhD048025@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: e8423423737e - main - pf tests: test double-pass codel 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8423423737ec0c08fc021d58795d5d34a55dda2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e8423423737ec0c08fc021d58795d5d34a55dda2 commit e8423423737ec0c08fc021d58795d5d34a55dda2 Author: Kristof Provost AuthorDate: 2023-07-03 17:06:06 +0000 Commit: Kristof Provost CommitDate: 2023-07-03 19:32:33 +0000 pf tests: test double-pass codel Build a setup where a given packet will be passed through the codel code twice. This used to trigger issues with double-free on mtags. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/altq.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/sys/netpfil/pf/altq.sh b/tests/sys/netpfil/pf/altq.sh index 0ced82a3a942..57a9edf11366 100644 --- a/tests/sys/netpfil/pf/altq.sh +++ b/tests/sys/netpfil/pf/altq.sh @@ -288,6 +288,55 @@ prioritise_cleanup() altq_cleanup } +atf_test_case "codel_vlan" "cleanup" +codel_vlan_head() +{ + atf_set descr 'Test double-pass through ALTQ with codel' + atf_set require.user root +} + +codel_vlan_body() +{ + altq_init + is_altq_supported priq + is_altq_supported codel + + j=altq_vlan_codel + epair=$(vnet_mkepair) + + vnet_mkjail ${j}a ${epair}a + va=$(jexec ${j}a ifconfig vlan create) + jexec ${j}a ifconfig ${epair}a up + jexec ${j}a ifconfig ${va} vlan 42 vlandev ${epair}a up + jexec ${j}a ifconfig ${va} inet 192.0.2.1/24 + + vnet_mkjail ${j}b ${epair}b + vb=$(jexec ${j}b ifconfig vlan create) + jexec ${j}b ifconfig ${epair}b up + jexec ${j}b ifconfig ${vb} vlan 42 vlandev ${epair}b up + jexec ${j}b ifconfig ${vb} inet 192.0.2.2/24 + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}a ping -c 1 192.0.2.2 + + jexec ${j}a pfctl -e + pft_set_rules ${j}a \ + "altq on ${epair}a priq bandwidth 10Mb queue { slow }" \ + "queue slow priority 6 qlimit 50 priq ( default codel )" \ + "altq on ${va} priq bandwidth 10Mb queue { vslow }" \ + "queue vslow priority 6 qlimit 50 priq ( default codel )" \ + "pass queue (slow)" + + atf_check -s exit:0 -o ignore \ + jexec ${j}a ping -c 1 192.0.2.2 +} + +codel_vlan_cleanup() +{ + altq_cleanup +} + atf_init_test_cases() { atf_add_test_case "hfsc" @@ -295,4 +344,5 @@ atf_init_test_cases() atf_add_test_case "cbq_vlan" atf_add_test_case "codel_bridge" atf_add_test_case "prioritise" + atf_add_test_case "codel_vlan" }