From: Stephen Hemminger <stephen@networkplumber.org>
To: netdev@vger.kernel.org
Cc: Stephen Hemminger <stephen@networkplumber.org>, stable@kernel.org
Subject: [PATCH net v2 03/10] selftests/tc-testing: update netem tests after check_netem_in_tree revert
Date: Sat, 14 Mar 2026 17:14:07 -0700 [thread overview]
Message-ID: <20260315001649.23931-4-stephen@networkplumber.org> (raw)
In-Reply-To: <20260315001649.23931-1-stephen@networkplumber.org>
Update four tdc tests (d34d, b33f, cafe, 1337) to reflect that
nested/sibling netem configurations are no longer rejected.
Adjust expected exit codes and match counts accordingly.
Fixes: ecdec65ec78d ("selftests/tc-testing: Add tests for restrictions on netem duplication")
Cc: stable@kernel.org
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
.../tc-testing/tc-tests/qdiscs/netem.json | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
index 718d2df2aafa..7985b5215853 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
@@ -339,7 +339,7 @@
},
{
"id": "d34d",
- "name": "NETEM test qdisc duplication restriction in qdisc tree in netem_change root",
+ "name": "NETEM allow duplication with nested netem via change",
"category": ["qdisc", "netem"],
"plugins": {
"requires": "nsPlugin"
@@ -349,7 +349,7 @@
"$TC qdisc add dev $DUMMY parent 1: handle 2: netem limit 1"
],
"cmdUnderTest": "$TC qdisc change dev $DUMMY handle 1: netem duplicate 50%",
- "expExitCode": "2",
+ "expExitCode": "0",
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
"matchPattern": "qdisc netem",
"matchCount": "2",
@@ -359,7 +359,7 @@
},
{
"id": "b33f",
- "name": "NETEM test qdisc duplication restriction in qdisc tree in netem_change non-root",
+ "name": "NETEM allow duplication on child netem via change",
"category": ["qdisc", "netem"],
"plugins": {
"requires": "nsPlugin"
@@ -369,7 +369,7 @@
"$TC qdisc add dev $DUMMY parent 1: handle 2: netem limit 1"
],
"cmdUnderTest": "$TC qdisc change dev $DUMMY handle 2: netem duplicate 50%",
- "expExitCode": "2",
+ "expExitCode": "0",
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
"matchPattern": "qdisc netem",
"matchCount": "2",
@@ -379,7 +379,7 @@
},
{
"id": "cafe",
- "name": "NETEM test qdisc duplication restriction in qdisc tree",
+ "name": "NETEM allow adding child netem when parent duplicates",
"category": ["qdisc", "netem"],
"plugins": {
"requires": "nsPlugin"
@@ -388,17 +388,17 @@
"$TC qdisc add dev $DUMMY root handle 1: netem limit 1 duplicate 100%"
],
"cmdUnderTest": "$TC qdisc add dev $DUMMY parent 1: handle 2: netem duplicate 100%",
- "expExitCode": "2",
+ "expExitCode": "0",
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
"matchPattern": "qdisc netem",
- "matchCount": "1",
+ "matchCount": "2",
"teardown": [
"$TC qdisc del dev $DUMMY handle 1:0 root"
]
},
{
"id": "1337",
- "name": "NETEM test qdisc duplication restriction in qdisc tree across branches",
+ "name": "NETEM allow duplicating netem on separate HFSC branches",
"category": ["qdisc", "netem"],
"plugins": {
"requires": "nsPlugin"
@@ -410,10 +410,10 @@
"$TC class add dev $DUMMY parent 1:0 classid 1:2 hfsc rt m2 10Mbit"
],
"cmdUnderTest": "$TC qdisc add dev $DUMMY parent 1:2 handle 3:0 netem duplicate 100%",
- "expExitCode": "2",
+ "expExitCode": "0",
"verifyCmd": "$TC -s qdisc show dev $DUMMY",
"matchPattern": "qdisc netem",
- "matchCount": "1",
+ "matchCount": "2",
"teardown": [
"$TC qdisc del dev $DUMMY handle 1:0 root"
]
--
2.51.0
next prev parent reply other threads:[~2026-03-15 0:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-15 0:14 [PATCH net v2 00/10] netem: fixes and selftests Stephen Hemminger
2026-03-15 0:14 ` [PATCH net v2 01/10] Revert "net/sched: Restrict conditions for adding duplicating netems to qdisc tree" Stephen Hemminger
2026-03-15 0:14 ` [PATCH net v2 02/10] net/sched: netem: add per-CPU recursion guard for duplication Stephen Hemminger
2026-03-15 0:14 ` Stephen Hemminger [this message]
2026-03-15 0:14 ` [PATCH net v2 04/10] net/sched: netem: restructure dequeue to avoid re-entrancy with child qdisc Stephen Hemminger
2026-03-15 0:14 ` [PATCH net v2 05/10] net/sched: netem: fix probability gaps in 4-state loss model Stephen Hemminger
2026-03-15 0:14 ` [PATCH net v2 06/10] net/sched: netem: fix slot delay calculation overflow Stephen Hemminger
2026-03-15 0:14 ` [PATCH net v2 07/10] net/sched: netem: fix queue limit check to include reordered packets Stephen Hemminger
2026-03-15 0:14 ` [PATCH net v2 08/10] net/sched: netem: null-terminate tfifo linear queue tail Stephen Hemminger
2026-03-15 0:14 ` [PATCH net v2 09/10] net/sched: netem: only reseed PRNG when seed is explicitly provided Stephen Hemminger
2026-03-15 0:14 ` [PATCH net v2 10/10] selftests/tc-testing: add netem configuration and traffic tests Stephen Hemminger
2026-03-15 15:19 ` [PATCH net v2 00/10] netem: fixes and selftests Jakub Kicinski
2026-03-15 16:09 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260315001649.23931-4-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=netdev@vger.kernel.org \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox