Commit 85da9d9f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'selftests-tc-testing-misc-changes-for-tdc' 

Pedro Tammela says:

====================
selftests: tc-testing: misc changes for tdc

Patches 1 and 3 are fixes for tdc that were discovered when running it
using defconfig + tc-testing config and against the latest iproute2.

Patch 2 improves the taprio tests.

Patch 4 enables all tdc tests.

Patch 5 fixes the return code of tdc for when a test fails
setup/teardown.
====================

Link: https://lore.kernel.org/r/20240124181933.75724-1-pctammela@mojatatu.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 06f609b3 8981a85e

tools/testing/selftests/tc-testing/config

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_VETH=y 
#

# Core Netfilter Configuration

#

CONFIG_NETFILTER=y

CONFIG_NETFILTER_ADVANCED=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_MARK=y

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

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq quantum 9000",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc fq 1: root refcnt [0-9]+ limit 10000p flow_limit 100p buckets.*orphan_mask 1023 quantum 9000b",

        "matchPattern": "qdisc fq 1: root refcnt [0-9]+ limit 10000p flow_limit 100p.*quantum 9000b",

        "matchCount": "1",

        "teardown": [

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

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

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
        "plugins": {

            "requires": "nsPlugin"

        },

        "dependsOn": "echo '' | jq",

        "setup": [

            "echo \"1 1 8\" > /sys/bus/netdevsim/new_device",

            "$TC qdisc replace dev $ETH handle 8001: parent root stab overhead 24 taprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 0 sched-entry S ff 20000000 clockid CLOCK_TAI",
@@ -192,6 +193,7 @@ 
        "plugins": {

            "requires": "nsPlugin"

        },

        "dependsOn": "echo '' | jq",

        "setup": [

            "echo \"1 1 8\" > /sys/bus/netdevsim/new_device",

            "$TC qdisc replace dev $ETH handle 8001: parent root stab overhead 24 taprio num_tc 8 map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 0 sched-entry S ff 20000000 flags 0x2",

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

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ def test_runner(pm, args, filtered_tests): 
            message = pmtf.message

            output = pmtf.output

            res = TestResult(tidx['id'], tidx['name'])

            res.set_result(ResultState.skip)

            res.set_result(ResultState.fail)

            res.set_errormsg(pmtf.message)

            res.set_failmsg(pmtf.output)

            tsr.add_resultdata(res)

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

+1 −2
Original line number Diff line number Diff line
@@ -63,5 +63,4 @@ try_modprobe sch_hfsc 
try_modprobe sch_hhf

try_modprobe sch_htb

try_modprobe sch_teql

./tdc.py -J`nproc` -c actions

./tdc.py -J`nproc` -c qdisc
 
./tdc.py -J`nproc`