git: 2f0a80794895 - stable/13 - pfctl tests: Test fairq configuration

Kristof Provost kp at FreeBSD.org
Thu May 27 10:20:39 UTC 2021


The branch stable/13 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=2f0a80794895a67c8b5882144c8b1e41c4fa8688

commit 2f0a80794895a67c8b5882144c8b1e41c4fa8688
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-05-19 07:52:50 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-05-27 07:10:53 +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/pfctl_test_list.inc | 1 +
 3 files changed, 5 insertions(+)

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/pfctl_test_list.inc b/sbin/pfctl/tests/pfctl_test_list.inc
index 337dff640f42..060a6019d05c 100644
--- a/sbin/pfctl/tests/pfctl_test_list.inc
+++ b/sbin/pfctl/tests/pfctl_test_list.inc
@@ -116,3 +116,4 @@ PFCTL_TEST(1002, "Set timeout interval")
 PFCTL_TEST(1003, "ALTQ")
 PFCTL_TEST(1004, "ALTQ with Codel")
 PFCTL_TEST(1005, "PR 231323")
+PFCTL_TEST(1006, "pfctl crashes with certain fairq configurations")


More information about the dev-commits-src-all mailing list