Date: Thu, 27 May 2021 10:20:30 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 1f22359d3ff2 - stable/12 - pfctl tests: Test fairq configuration Message-ID: <202105271020.14RAKUeM055454@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1f22359d3ff22fe919cf3965eb32ece5de1be3c1 commit 1f22359d3ff22fe919cf3965eb32ece5de1be3c1 Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2021-05-19 07:52:50 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2021-05-27 10:09:04 +0000 pfctl tests: Test fairq configuration We used to have a bug where pfctl could crash setting fairq queues. Test this case and ensure it does not crash pfctl. Reviewed by: donner MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D30348 (cherry picked from commit 9938fcaa6565a660c555a0e9c712842ba1a2d31c) --- sbin/pfctl/tests/files/pf1006.in | 2 ++ sbin/pfctl/tests/files/pf1006.ok | 2 ++ sbin/pfctl/tests/files/pfctl_test_descr.sh | 1 + sbin/pfctl/tests/pfctl_test.sh | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/tests/files/pf1006.in b/sbin/pfctl/tests/files/pf1006.in new file mode 100644 index 000000000000..b50c16994cfc --- /dev/null +++ b/sbin/pfctl/tests/files/pf1006.in @@ -0,0 +1,2 @@ +altq on igb0 fairq bandwidth 1Gb queue { qLink } +queue qLink fairq(default) diff --git a/sbin/pfctl/tests/files/pf1006.ok b/sbin/pfctl/tests/files/pf1006.ok new file mode 100644 index 000000000000..be44b765c2e9 --- /dev/null +++ b/sbin/pfctl/tests/files/pf1006.ok @@ -0,0 +1,2 @@ +altq on igb0 fairq bandwidth 1Gb tbrsize 36000 queue { qLink } +queue qLink fairq( default ) diff --git a/sbin/pfctl/tests/files/pfctl_test_descr.sh b/sbin/pfctl/tests/files/pfctl_test_descr.sh index 1f164c8c2596..e26e7bbf943c 100755 --- a/sbin/pfctl/tests/files/pfctl_test_descr.sh +++ b/sbin/pfctl/tests/files/pfctl_test_descr.sh @@ -80,3 +80,4 @@ pf1002_descr () { echo "Set timeout interval" ; } pf1003_descr () { echo "ALTQ" ; } pf1004_descr () { echo "ALTQ with Codel" ; } pf1005_descr () { echo "PR 231323" ; } +pf1006_descr () { echo "pfctl crashes with certain fairq configurations" ; } diff --git a/sbin/pfctl/tests/pfctl_test.sh b/sbin/pfctl/tests/pfctl_test.sh index 23cc755f5db7..b231170afb2c 100755 --- a/sbin/pfctl/tests/pfctl_test.sh +++ b/sbin/pfctl/tests/pfctl_test.sh @@ -22,7 +22,7 @@ pftests="0001 0002 0003 0004 0005 0006 0007 0008 0009 0010 0011 0012 0032 0034 0035 0038 0039 0040 0041 0047 0048 0049 0050 0052 0053 0055 0056 0057 0060 0061 0065 0067 0069 0070 0071 0072 0074 0075 0077 0078 0079 0081 0082 0084 0085 0087 0088 0089 0090 0091 0092 0094 0095 0096 -0097 0098 0100 0101 0102 0104 1001 1002 1003 1004 1005" +0097 0098 0100 0101 0102 0104 1001 1002 1003 1004 1005 1006" . $(atf_get_srcdir)/files/pfctl_test_descr.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105271020.14RAKUeM055454>