selftests/tc-testing: match any qdisc type

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

We should not always presume all kernels use pfifo_fast as the default qdisc.

For example, a fq_codel qdisk could have below output:
qdisc fq_codel 0: parent 1:4 limit 10240p flows 1024 quantum 1514 target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 64

Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Peilin Ye <peilin.ye@bytedance.com>
Signed-off-by: Li Zhijian <zhijianx.li@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Li Zhijian and committed by

David S. Miller 4 years ago bdf1565f 65258b9d

+6 -6

1 changed file

expand all

tools

testing

selftests

tc-testing

tc-tests

qdiscs

mq.json

+6 -6

tools/testing/selftests/tc-testing/tc-tests/qdiscs/mq.json

··· 15 15 "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq", 16 16 "expExitCode": "0", 17 17 "verifyCmd": "$TC qdisc show dev $ETH", 18 - "matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", 18 + "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]", 19 19 "matchCount": "4", 20 20 "teardown": [ 21 21 "echo \"1\" > /sys/bus/netdevsim/del_device" ··· 37 37 "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq", 38 38 "expExitCode": "0", 39 39 "verifyCmd": "$TC qdisc show dev $ETH", 40 - "matchPattern": "qdisc pfifo_fast 0: parent 1:[1-9,a-f][0-9,a-f]{0,2} bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", 40 + "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-9,a-f][0-9,a-f]{0,2}", 41 41 "matchCount": "256", 42 42 "teardown": [ 43 43 "echo \"1\" > /sys/bus/netdevsim/del_device" ··· 60 60 "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq", 61 61 "expExitCode": "2", 62 62 "verifyCmd": "$TC qdisc show dev $ETH", 63 - "matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", 63 + "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]", 64 64 "matchCount": "4", 65 65 "teardown": [ 66 66 "echo \"1\" > /sys/bus/netdevsim/del_device" ··· 82 82 "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1: mq", 83 83 "expExitCode": "2", 84 84 "verifyCmd": "$TC qdisc show dev $ETH", 85 - "matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", 85 + "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]", 86 86 "matchCount": "0", 87 87 "teardown": [ 88 88 "echo \"1\" > /sys/bus/netdevsim/del_device" ··· 106 106 "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1: mq", 107 107 "expExitCode": "2", 108 108 "verifyCmd": "$TC qdisc show dev $ETH", 109 - "matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", 109 + "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]", 110 110 "matchCount": "0", 111 111 "teardown": [ 112 112 "echo \"1\" > /sys/bus/netdevsim/del_device" ··· 128 128 "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq", 129 129 "expExitCode": "2", 130 130 "verifyCmd": "$TC qdisc show dev $ETH", 131 - "matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", 131 + "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]", 132 132 "matchCount": "0", 133 133 "teardown": [ 134 134 "echo \"1\" > /sys/bus/netdevsim/del_device"