Commit 07b1cc84 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

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: default avatarJakub Kicinski <kuba@kernel.org>
parents 374283a1 11b8b2e7

tools/testing/selftests/tc-testing/config

+1 −5
Original line number Diff line number Diff line
@@ -6,20 +6,18 @@ CONFIG_NF_CONNTRACK_MARK=y 
CONFIG_NF_CONNTRACK_ZONES=y

CONFIG_NF_CONNTRACK_LABELS=y

CONFIG_NF_NAT=m

CONFIG_NETFILTER_XT_TARGET_LOG=m



CONFIG_NET_SCHED=y



#

# Queueing/Scheduling

#

CONFIG_NET_SCH_ATM=m

CONFIG_NET_SCH_CAKE=m

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_CBS=m

CONFIG_NET_SCH_CHOKE=m

CONFIG_NET_SCH_CODEL=m

CONFIG_NET_SCH_DRR=m

CONFIG_NET_SCH_DSMARK=m

CONFIG_NET_SCH_ETF=m

CONFIG_NET_SCH_FQ=m

CONFIG_NET_SCH_FQ_CODEL=m
@@ -57,8 +55,6 @@ CONFIG_NET_CLS_FLOW=m 
CONFIG_NET_CLS_FLOWER=m

CONFIG_NET_CLS_MATCHALL=m

CONFIG_NET_CLS_ROUTE4=m

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_TCINDEX=m

CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_STACK=32

CONFIG_NET_EMATCH_CMP=m

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

+2 −2
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ 
        "setup": [

            "$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",

        "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",

        "teardown": [

            "$TC qdisc del dev $DUMMY handle 1: root",

tools/testing/selftests/tc-testing/tdc.sh

+1 −0
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ 
# SPDX-License-Identifier: GPL-2.0



modprobe netdevsim

modprobe sch_teql

./tdc.py -c actions --nobuildebpf

./tdc.py -c qdisc