Commit 50ee052b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'selftests-tc-testing-fixes-for-kselftest' 

Pedro Tammela says:

====================
selftests: tc-testing: fixes for kselftest

While playing around with TuxSuite, we noticed a couple of things were
broken for strict CI/automated builds. We had a script that didn't make into
the kselftest tarball and a couple of missing Kconfig knobs in our
minimal config.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 48e44287 35027c79

tools/testing/selftests/tc-testing/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -28,4 +28,4 @@ $(OUTPUT)/%.o: %.c 
	$(LLC) -march=bpf -mcpu=$(CPU) $(LLC_FLAGS) -filetype=obj -o $@



TEST_PROGS += ./tdc.sh

TEST_FILES := tdc*.py Tdc*.py plugins plugin-lib tc-tests
 
TEST_FILES := tdc*.py Tdc*.py plugins plugin-lib tc-tests scripts

tools/testing/selftests/tc-testing/config

+9 −0
Original line number Diff line number Diff line 
#

# Network

#



CONFIG_DUMMY=y

CONFIG_VETH=y



#

# Core Netfilter Configuration

#

CONFIG_NETFILTER_ADVANCED=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_MARK=y

CONFIG_NF_CONNTRACK_ZONES=y

CONFIG_NF_CONNTRACK_LABELS=y

CONFIG_NF_CONNTRACK_PROCFS=y

CONFIG_NF_FLOW_TABLE=m

CONFIG_NF_TABLES=m

CONFIG_NF_NAT=m

CONFIG_NETFILTER_XT_TARGET_LOG=m

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

+4 −4
Original line number Diff line number Diff line
@@ -170,11 +170,11 @@ 
        "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",

            "./taprio_wait_for_admin.sh $TC $ETH"

            "./scripts/taprio_wait_for_admin.sh $TC $ETH"

        ],

        "cmdUnderTest": "$TC qdisc replace dev $ETH parent 8001:7 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 200 sched-entry S ff 20000000 clockid CLOCK_TAI",

        "expExitCode": "2",

        "verifyCmd": "bash -c \"./taprio_wait_for_admin.sh $TC $ETH && $TC -j qdisc show dev $ETH root | jq '.[].options.base_time'\"",

        "verifyCmd": "bash -c \"./scripts/taprio_wait_for_admin.sh $TC $ETH && $TC -j qdisc show dev $ETH root | jq '.[].options.base_time'\"",

        "matchPattern": "0",

        "matchCount": "1",

        "teardown": [
@@ -195,11 +195,11 @@ 
        "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",

            "./taprio_wait_for_admin.sh $TC $ETH"

            "./scripts/taprio_wait_for_admin.sh $TC $ETH"

        ],

        "cmdUnderTest": "$TC qdisc replace dev $ETH parent 8001:7 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 200 sched-entry S ff 20000000 flags 0x2",

        "expExitCode": "2",

        "verifyCmd": "bash -c \"./taprio_wait_for_admin.sh $TC $ETH && $TC -j qdisc show dev $ETH root | jq '.[].options.base_time'\"",

        "verifyCmd": "bash -c \"./scripts/taprio_wait_for_admin.sh $TC $ETH && $TC -j qdisc show dev $ETH root | jq '.[].options.base_time'\"",

        "matchPattern": "0",

        "matchCount": "1",

        "teardown": [