Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Jakub Kicinski <kuba@kernel.org>
+14
-5
+1
-1
tools/testing/selftests/tc-testing/Makefile
+1
-1
tools/testing/selftests/tc-testing/Makefile
+9
tools/testing/selftests/tc-testing/config
+9
tools/testing/selftests/tc-testing/config
···
1
1
#
2
+
# Network
3
+
#
4
+
5
+
CONFIG_DUMMY=y
6
+
CONFIG_VETH=y
7
+
8
+
#
2
9
# Core Netfilter Configuration
3
10
#
11
+
CONFIG_NETFILTER_ADVANCED=y
4
12
CONFIG_NF_CONNTRACK=m
5
13
CONFIG_NF_CONNTRACK_MARK=y
6
14
CONFIG_NF_CONNTRACK_ZONES=y
7
15
CONFIG_NF_CONNTRACK_LABELS=y
8
16
CONFIG_NF_CONNTRACK_PROCFS=y
9
17
CONFIG_NF_FLOW_TABLE=m
18
+
CONFIG_NF_TABLES=m
10
19
CONFIG_NF_NAT=m
11
20
CONFIG_NETFILTER_XT_TARGET_LOG=m
12
21
tools/testing/selftests/tc-testing/taprio_wait_for_admin.sh
tools/testing/selftests/tc-testing/scripts/taprio_wait_for_admin.sh
tools/testing/selftests/tc-testing/taprio_wait_for_admin.sh
tools/testing/selftests/tc-testing/scripts/taprio_wait_for_admin.sh
+4
-4
tools/testing/selftests/tc-testing/tc-tests/qdiscs/taprio.json
+4
-4
tools/testing/selftests/tc-testing/tc-tests/qdiscs/taprio.json
···
170
170
"setup": [
171
171
"echo \"1 1 8\" > /sys/bus/netdevsim/new_device",
172
172
"$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",
173
-
"./taprio_wait_for_admin.sh $TC $ETH"
173
+
"./scripts/taprio_wait_for_admin.sh $TC $ETH"
174
174
],
175
175
"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",
176
176
"expExitCode": "2",
177
-
"verifyCmd": "bash -c \"./taprio_wait_for_admin.sh $TC $ETH && $TC -j qdisc show dev $ETH root | jq '.[].options.base_time'\"",
177
+
"verifyCmd": "bash -c \"./scripts/taprio_wait_for_admin.sh $TC $ETH && $TC -j qdisc show dev $ETH root | jq '.[].options.base_time'\"",
178
178
"matchPattern": "0",
179
179
"matchCount": "1",
180
180
"teardown": [
···
195
195
"setup": [
196
196
"echo \"1 1 8\" > /sys/bus/netdevsim/new_device",
197
197
"$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",
198
-
"./taprio_wait_for_admin.sh $TC $ETH"
198
+
"./scripts/taprio_wait_for_admin.sh $TC $ETH"
199
199
],
200
200
"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",
201
201
"expExitCode": "2",
202
-
"verifyCmd": "bash -c \"./taprio_wait_for_admin.sh $TC $ETH && $TC -j qdisc show dev $ETH root | jq '.[].options.base_time'\"",
202
+
"verifyCmd": "bash -c \"./scripts/taprio_wait_for_admin.sh $TC $ETH && $TC -j qdisc show dev $ETH root | jq '.[].options.base_time'\"",
203
203
"matchPattern": "0",
204
204
"matchCount": "1",
205
205
"teardown": [