Merge pull request #14320 from yuwata/network-tc-fq_codel-more

network: tc: introduce more FQ-CoDel settings

test/fuzz/fuzz-network-parser/directives.network

@@ -279,4 +279,11 @@ TokenBufferFilterPeakRate=
 TokenBufferFilterLatencySec=
 StochasticFairnessQueueingPerturbPeriodSec=
 FairQueuingControlledDelayPacketLimit=
+FairQueuingControlledDelayMemoryLimit=
+FairQueuingControlledDelayFlows=
+FairQueuingControlledDelayQuantum=
+FairQueuingControlledDelayTargetSec=
+FairQueuingControlledDelayIntervalSec=
+FairQueuingControlledDelayCEThresholdSec=
+FairQueuingControlledDelayECN=
 FairQueueTrafficPolicingPacketLimit=

test/test-network/conf/25-qdisc-netem-and-fqcodel.network

@@ -15,3 +15,10 @@ NetworkEmulatorPacketLimit=100
 [TrafficControlQueueingDiscipline]
 Parent=ingress
 FairQueuingControlledDelayPacketLimit=20480
+FairQueuingControlledDelayMemoryLimit=64M
+FairQueuingControlledDelayFlows=2048
+FairQueuingControlledDelayTargetSec=10ms
+FairQueuingControlledDelayIntervalSec=200ms
+FairQueuingControlledDelayQuantum=1400
+FairQueuingControlledDelayECN=yes
+FairQueuingControlledDelayCEThresholdSec=100ms

test/test-network/systemd-networkd-tests.py

@@ -2095,7 +2095,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
         self.assertRegex(output, 'qdisc netem')
         self.assertRegex(output, 'limit 100 delay 50.0ms  10.0ms loss 20%')
         self.assertRegex(output, 'qdisc fq_codel')
-        self.assertRegex(output, 'limit 20480p')
+        self.assertRegex(output, 'limit 20480p flows 2048 quantum 1400 target 10.0ms ce_threshold 100.0ms interval 200.0ms memory_limit 64Mb ecn')
         output = check_output('tc qdisc show dev test1')
         print(output)
         self.assertRegex(output, 'qdisc tbf')