Add tc-testing case 83c0: create TBF + fq_pie on $DUMMY, inject traffic with ping, then verify 'tc -s class show' prints per-flow fq_pie stats (prob, delay, deficit) with matchCount 1. The test fails on a kernel without fq_pie class ops.
Update case 83be to expect failure for 'flows 65536' after patch 1/3 caps the flows parameter at 65535. Signed-off-by: Hemendra M. Naik <[email protected]> Signed-off-by: Vishal Kamath <[email protected]> Signed-off-by: Mohit P. Tahiliani <[email protected]> --- .../tc-testing/tc-tests/qdiscs/fq_pie.json | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json index 229fe1bf4a90..d4081fcb0933 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json @@ -1,7 +1,7 @@ [ { "id": "83be", - "name": "Create FQ-PIE with invalid number of flows", + "name": "FQ-PIE rejects flows above 65535", "category": [ "qdisc", "fq_pie" @@ -12,10 +12,10 @@ "setup": [ ], "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_pie flows 65536", - "expExitCode": "0", + "expExitCode": "2", "verifyCmd": "$TC qdisc show dev $DUMMY", "matchPattern": "qdisc fq_pie 1: root refcnt 2 limit 10240p flows 65536", - "matchCount": "1", + "matchCount": "0", "teardown": [ ] }, @@ -40,5 +40,32 @@ "matchPattern": "qdisc fq_pie 1: root refcnt [0-9]+ limit 1p", "matchCount": "1", "teardown": ["$TC qdisc del dev $DEV1 handle 1: root"] + }, + { + "id": "83c0", + "name": "FQ-PIE class stats accessible via tc class show", + "category": [ + "qdisc", + "fq_pie" + ], + "plugins": { + "requires": "nsPlugin" + }, + "setup": [ + "$IP link set dev $DUMMY up || true", + "$IP addr add 10.10.11.10/24 dev $DUMMY || true", + "$TC qdisc add dev $DUMMY root handle 1: tbf rate 8bit burst 100b latency 100ms", + "$TC qdisc add dev $DUMMY parent 1:1 handle 2: fq_pie limit 100 flows 1", + "ping -c 50 -i 0.001 -s 500 10.10.11.11 -I $DUMMY > /dev/null 2>&1 || true" + ], + "cmdUnderTest": "$TC -s class show dev $DUMMY", + "expExitCode": "0", + "verifyCmd": "$TC -s class show dev $DUMMY", + "matchPattern": "class fq_pie 2:[0-9]+ .*prob .*delay .*deficit", + "matchCount": "1", + "teardown": [ + "$TC qdisc del dev $DUMMY handle 1: root", + "$IP addr del 10.10.11.10/24 dev $DUMMY || true" + ] } ] -- 2.34.1
