Add tests that check the DRR and ETS deficit refill, so a change to the refill loop can't silently alter the result.
The cases: - 3f3e: one DRR class, quantum 256, sends a 1514-byte packet; the deficit ends at 22. - 57a1: two DRR classes with 1514- and 514-byte packets; the 514-byte packet goes first. - 2177: the same as 57a1 under ETS. IPv6 is disabled on the device so its router solicitation doesn't land in a band. 57a1 and 2177 put netem under the classful qdisc, so they log the usual "non-work-conserving?" warning. All three pass with and without the previous patches. Reviewed-by: Jamal Hadi Salim <[email protected]> Signed-off-by: Victor Nogueira <[email protected]> --- v1 -> v2: - DRR cases reworded, ETS case added. .../tc-testing/tc-tests/qdiscs/drr.json | 82 +++++++++++++++++++ .../tc-testing/tc-tests/qdiscs/ets.json | 54 ++++++++++++ 2 files changed, 136 insertions(+) diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json index 2b61d8d79bde..d7ac32294738 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json @@ -86,5 +86,87 @@ "teardown": [ "$TC qdisc del dev $DUMMY root" ] + }, + { + "id": "3f3e", + "name": "DRR deficit after refilling a 1514-byte packet at quantum 256", + "category": [ + "qdisc", + "drr" + ], + "plugins": { + "requires": "nsPlugin" + }, + "setup": [ + "$IP addr add 10.10.11.10/24 dev $DUMMY", + "$TC qdisc add dev $DUMMY root handle 1: drr", + "$TC class add dev $DUMMY parent 1: classid 1:1 drr quantum 256", + "$TC qdisc add dev $DUMMY parent 1:1 handle 10: netem delay 2s limit 10", + "$TC filter add dev $DUMMY parent 1: protocol ip prio 1 u32 match u32 0 0 flowid 1:1", + "ping -c 2 -s 1472 -i 1 10.10.11.11 -I $DUMMY -W 0.01 >/dev/null 2>&1 &" + ], + "cmdUnderTest": "sleep 2.5", + "expExitCode": "0", + "verifyCmd": "$TC -s class show dev $DUMMY", + "matchPattern": "deficit 22b", + "matchCount": "1", + "teardown": [ + "$TC qdisc del dev $DUMMY root" + ] + }, + { + "id": "57a1", + "name": "DRR serves the class that fits its deficit first", + "category": [ + "qdisc", + "drr" + ], + "plugins": { + "requires": "nsPlugin" + }, + "setup": [ + "$IP addr add 10.10.11.10/24 dev $DUMMY", + "$TC qdisc add dev $DUMMY root handle 1: drr", + "$TC class add dev $DUMMY parent 1: classid 1:1 drr quantum 256", + "$TC class add dev $DUMMY parent 1: classid 1:2 drr quantum 256", + "$TC qdisc add dev $DUMMY parent 1:1 handle 10: netem delay 3s limit 10", + "$TC qdisc add dev $DUMMY parent 1:2 handle 20: netem delay 3s limit 10", + "$TC filter add dev $DUMMY parent 1: protocol ip prio 1 u32 match ip dport 1111 0xffff flowid 1:1", + "$TC filter add dev $DUMMY parent 1: protocol ip prio 1 u32 match ip dport 2222 0xffff flowid 1:2", + "python3 -c \"import socket; a=socket.socket(socket.AF_INET,socket.SOCK_DGRAM); b=socket.socket(socket.AF_INET,socket.SOCK_DGRAM); a.sendto(b'A'*1472,('10.10.11.11',1111)); b.sendto(b'B'*472,('10.10.11.11',2222))\" >/dev/null 2>&1 &", + "sleep 1", + "python3 -c \"import socket; a=socket.socket(socket.AF_INET,socket.SOCK_DGRAM); b=socket.socket(socket.AF_INET,socket.SOCK_DGRAM); a.sendto(b'A'*1472,('10.10.11.11',1111)); b.sendto(b'B'*472,('10.10.11.11',2222))\" >/dev/null 2>&1 &" + ], + "cmdUnderTest": "sleep 2.5", + "expExitCode": "0", + "verifyCmd": "$TC -j -s class show dev $DUMMY", + "matchJSON": [ + { + "class": "drr", + "handle": "1:1", + "root": true, + "stats": { + "bytes": 0, + "packets": 0, + "backlog": 3028, + "qlen": 2 + } + }, + { + "class": "drr", + "handle": "1:2", + "root": true, + "stats": { + "bytes": 514, + "packets": 1, + "backlog": 514, + "qlen": 1 + } + } + ], + "matchCount": "1", + "teardown": [ + "$TC qdisc del dev $DUMMY root" + ] } ] diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/ets.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/ets.json index d2eab61c099a..ea3adba2f06c 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/ets.json +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/ets.json @@ -1007,5 +1007,59 @@ "teardown": [ "echo \"1\" > /sys/bus/netdevsim/del_device" ] + }, + { + "id": "2177", + "name": "ETS serves the band that fits its deficit first", + "category": [ + "qdisc", + "ets" + ], + "plugins": { + "requires": "nsPlugin" + }, + "setup": [ + "$IP addr add 10.10.11.10/24 dev $DUMMY", + "sh -c 'echo 1 > /proc/sys/net/ipv6/conf/$DUMMY/disable_ipv6' || true", + "$TC qdisc add dev $DUMMY root handle 1: ets bands 2 quanta 256 256", + "$TC qdisc add dev $DUMMY parent 1:1 handle 10: netem delay 3s limit 10", + "$TC qdisc add dev $DUMMY parent 1:2 handle 20: netem delay 3s limit 10", + "$TC filter add dev $DUMMY parent 1: protocol ip prio 1 u32 match ip dport 1111 0xffff flowid 1:1", + "$TC filter add dev $DUMMY parent 1: protocol ip prio 1 u32 match ip dport 2222 0xffff flowid 1:2", + "python3 -c \"import socket; a=socket.socket(socket.AF_INET,socket.SOCK_DGRAM); b=socket.socket(socket.AF_INET,socket.SOCK_DGRAM); a.sendto(b'A'*1472,('10.10.11.11',1111)); b.sendto(b'B'*472,('10.10.11.11',2222))\" >/dev/null 2>&1 &", + "sleep 1", + "python3 -c \"import socket; a=socket.socket(socket.AF_INET,socket.SOCK_DGRAM); b=socket.socket(socket.AF_INET,socket.SOCK_DGRAM); a.sendto(b'A'*1472,('10.10.11.11',1111)); b.sendto(b'B'*472,('10.10.11.11',2222))\" >/dev/null 2>&1 &" + ], + "cmdUnderTest": "sleep 2.5", + "expExitCode": "0", + "verifyCmd": "$TC -j -s class show dev $DUMMY", + "matchJSON": [ + { + "class": "ets", + "handle": "1:1", + "root": true, + "stats": { + "bytes": 1514, + "packets": 1, + "backlog": 3028, + "qlen": 2 + } + }, + { + "class": "ets", + "handle": "1:2", + "root": true, + "stats": { + "bytes": 514, + "packets": 1, + "backlog": 514, + "qlen": 1 + } + } + ], + "matchCount": "1", + "teardown": [ + "$TC qdisc del dev $DUMMY root" + ] } ] -- 2.43.0
