stuartl/linux-stable
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git synced 2025-09-21 15:40:53 +10:00
Code Issues Releases Wiki Activity

Merge branch 'fix-small-bugs-and-annoyances-in-tc-testing'

Browse Source 
Vlad Buslov says:

====================
Fix small bugs and annoyances in tc-testing
====================

Link: https://lore.kernel.org/r/20230612075712.2861848-1-vladbu@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2023-06-13 20:49:16 -07:00
commit 07b1cc841b
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/testing/selftests/tc-testing/config
View File

@ -6,20 +6,18 @@ CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_ZONES=y
CONFIG_NF_CONNTRACK_LABELS=y CONFIG_NF_CONNTRACK_LABELS=y
CONFIG_NF_NAT=m CONFIG_NF_NAT=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
CONFIG_NET_SCHED=y CONFIG_NET_SCHED=y
# #
# Queueing/Scheduling # Queueing/Scheduling
# #
CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CAKE=m
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CBS=m
CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_DRR=m
CONFIG_NET_SCH_DSMARK=m
CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETF=m
CONFIG_NET_SCH_FQ=m CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_FQ_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m
@ -57,8 +55,6 @@ CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_FLOWER=m CONFIG_NET_CLS_FLOWER=m
CONFIG_NET_CLS_MATCHALL=m CONFIG_NET_CLS_MATCHALL=m
CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_CMP=m

4
tools/testing/selftests/tc-testing/tc-tests/qdiscs/sfb.json
View File

@ -58,10 +58,10 @@
"setup": [ "setup": [
"$IP link add dev $DUMMY type dummy || /bin/true" "$IP link add dev $DUMMY type dummy || /bin/true"
], ],
"cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root sfb db 10", "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root sfb db 100",
"expExitCode": "0", "expExitCode": "0",
"verifyCmd": "$TC qdisc show dev $DUMMY", "verifyCmd": "$TC qdisc show dev $DUMMY",
"matchPattern": "qdisc sfb 1: root refcnt [0-9]+ rehash 600s db 10ms", "matchPattern": "qdisc sfb 1: root refcnt [0-9]+ rehash 600s db 100ms",
"matchCount": "1", "matchCount": "1",
"teardown": [ "teardown": [
"$TC qdisc del dev $DUMMY handle 1: root", "$TC qdisc del dev $DUMMY handle 1: root",

1
tools/testing/selftests/tc-testing/tdc.sh
View File

@ -2,5 +2,6 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
modprobe netdevsim modprobe netdevsim
modprobe sch_teql
./tdc.py -c actions --nobuildebpf ./tdc.py -c actions --nobuildebpf
./tdc.py -c qdisc ./tdc.py -c qdisc