From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE38135A391 for ; Mon, 16 Mar 2026 21:11:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773695478; cv=none; b=V0T9aXoeBHcxMciru3tEUDOFO9G4530Y0il1mRO5SDHwSHoei2NIrFosVAgzW1jKZ0yPmZuZo5dgHys6OEXCM6NZmj1kNRoCsA+mIduI5tYKUtvYRBObicKKxvuTdmIvXAlBLpL8tuzpK35WWOYa5z1eGQjjS0NMbIgFDpYxK0o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773695478; c=relaxed/simple; bh=qx55ooV+6T11EKr8LbEY4/9pXwPSeq3Qn7aMejeFIXc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Txx/TfDz5Z5ky1KI8bn4jNRehQpSkJeJbqkLgmubPRBTSPK8Kg9vdqLEjHcGdk7KO+T1WxJgZEGG5iB2LZ12Clshy8wPLnho+9Ic1h3sxzEVBtBq7ezQymm5w9Rw2k4KSLnzrHhLheZ+i9a1+UUkJUrDfa1Y8BU0UWpiWLJawFk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mojatatu.com; spf=none smtp.mailfrom=mojatatu.com; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b=RlmVCnAt; arc=none smtp.client-ip=209.85.219.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=mojatatu.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mojatatu-com.20230601.gappssmtp.com header.i=@mojatatu-com.20230601.gappssmtp.com header.b="RlmVCnAt" Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-89c43c4c383so22852696d6.1 for ; Mon, 16 Mar 2026 14:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20230601.gappssmtp.com; s=20230601; t=1773695476; x=1774300276; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NBtIV/EG4mn9wrmEQoCttsPhqLjU58BaxF1sqnJtk6U=; b=RlmVCnAtcg7T9nd+asr7AmOn5oa7qBtkf1vJeTc6Gm1cF685ncfNS9DQU217WV6IKf 3S7TNybc/TScK3Iw1XsA4cm84LQjvLuCq5vkuHHSiW/edQgkfr9yv6dhqpga4+YqLG41 6UqT55l7pUpSOtXXA7MgxnB4MbORvN/u97upMENf7zEw0BWYx7YdXpGmhSwYcOhx9ZkQ JTqTX9IWKSEUkBsR3NAkgvSUNsiWKea4FzizEkuMbtNk3ZKU1wDkBPvn9B45abZCG+60 dfmFgMvwRy/nPpXT2xvgG2uo7Og1JLfO8sY70PCJ++RWytRBkdPnK21XeW4I2MDUs2G3 buYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773695476; x=1774300276; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=NBtIV/EG4mn9wrmEQoCttsPhqLjU58BaxF1sqnJtk6U=; b=YCedMq+nP+eSLxVLiF4O2E93645YNvj22cLmX9kJfGQWXoFVEqeOUSgwVJDj3/aOl4 vDKcvgasJyRl/xpLLiwGz9T/Jvk0ioVx4Jehr/QighrEwPAA5AiRzc15W7MHDDp/cOI/ QOYyWVkG/gWgH8gTBs06PW7PrgAH8I1TUyIZTR31sOigm439L/dvLH4As774/vpBREmR Y1zFvpUQtffoCLRZKN1ijDsmyOwdIueZCbA05rQ+QHhJ9c650bzL+i/kI8tkfV6FQWLG CI3e+o2Up96RPr8J/oNjjhps96giU0ljBuw5Z4YmQWvo9i58hoeahDQI19hfM8Z+qFEe ZT7w== X-Gm-Message-State: AOJu0YzC9nuEJYwXd86m9tS69Vw3qVCseGyWUfVvpvK9e76C6XPOBVnE uY4XzUqZ9An2J3vNEzeIR3fdLlvmpGWqqhK8PmQXiTk50RWv7N02CUvbtCubHt5RT7tzXXsL6BK Ji8o= X-Gm-Gg: ATEYQzzK6KaWf98gxmpDO9sUOPBPNRfspfIhSskgmlq9we9X/W9sSpOBxR03O7lL8Rp uROhAMeE4MiivHyw80tLKBN2pOKXbkH8BIgnwGvMPVM03Sj3AdoDmYdU1VPa4qyC9wQRRpFm0kg L/rVgb0hdhQGIiWc6WT3JNs6dgwy3C9hMWNv8Fg4I3xe+Xgca5sSblPc9anIRQ1/sXmKtaNGE0+ V1yLHbLu1VdkuhQlSZeftcI4KhNtuwgPR14fhsRhN/TReBrLAlSAmESfdIUOXdB9B1M/1DXJM3c V+x7wHVbezMjX04XnENSKGxDpsBT1YL2UtzSx2eYkxl87OUjAlesHRealBJ41dKpM13PCSeKNwR y80gEt7OttnUhgAEmIzgDXzeoOdxTG26LldigL3/e5Way9vC0vjEnVbdzEHp02gmZsHFRVDw1zd KV7bPuG1t+q2cZLIMOZkvvwjg= X-Received: by 2002:a05:6214:1242:b0:89a:3ad:8bd9 with SMTP id 6a1803df08f44-89a81fe3deamr207543596d6.50.1773695476327; Mon, 16 Mar 2026 14:11:16 -0700 (PDT) Received: from majuu.waya ([70.50.89.69]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-89c53374573sm27356266d6.7.2026.03.16.14.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 14:11:15 -0700 (PDT) From: Jamal Hadi Salim To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, jiri@resnulli.us, stephen@networkplumber.org, victor@mojatatu.com, will@willsroot.io, xmei5@asu.edu, pctammela@mojatatu.com, savy@syst3mfailure.io, kuniyu@google.com, toke@toke.dk, willemdebruijnkernel@gmail.com, Jamal Hadi Salim Subject: [PATCH net v2 4/6] Revert "selftests/tc-testing: Add tests for restrictions on netem duplication" Date: Mon, 16 Mar 2026 17:10:50 -0400 Message-Id: <20260316211052.332383-5-jhs@mojatatu.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260316211052.332383-1-jhs@mojatatu.com> References: <20260316211052.332383-1-jhs@mojatatu.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This reverts commit ecdec65ec78d67d3ebd17edc88b88312054abe0d. Signed-off-by: Jamal Hadi Salim --- .../tc-testing/tc-tests/infra/qdiscs.json | 5 +- .../tc-testing/tc-tests/qdiscs/netem.json | 81 ------------------- 2 files changed, 3 insertions(+), 83 deletions(-) diff --git a/tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json b/tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json index 6a39640aa2a8..ceb993ed04b2 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json +++ b/tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json @@ -702,6 +702,7 @@ "$TC qdisc add dev $DUMMY parent 1:1 handle 2:0 netem duplicate 100%", "$TC filter add dev $DUMMY parent 1:0 protocol ip prio 1 u32 match ip dst 10.10.10.1/32 flowid 1:1", "$TC class add dev $DUMMY parent 1:0 classid 1:2 hfsc ls m2 10Mbit", + "$TC qdisc add dev $DUMMY parent 1:2 handle 3:0 netem duplicate 100%", "$TC filter add dev $DUMMY parent 1:0 protocol ip prio 2 u32 match ip dst 10.10.10.2/32 flowid 1:2", "ping -c 1 10.10.10.1 -I$DUMMY > /dev/null || true", "$TC filter del dev $DUMMY parent 1:0 protocol ip prio 1", @@ -714,8 +715,8 @@ { "kind": "hfsc", "handle": "1:", - "bytes": 294, - "packets": 3 + "bytes": 392, + "packets": 4 } ], "matchCount": "1", 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..3c4444961488 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json +++ b/tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json @@ -336,86 +336,5 @@ "teardown": [ "$TC qdisc del dev $DUMMY handle 1: root" ] - }, - { - "id": "d34d", - "name": "NETEM test qdisc duplication restriction in qdisc tree in netem_change root", - "category": ["qdisc", "netem"], - "plugins": { - "requires": "nsPlugin" - }, - "setup": [ - "$TC qdisc add dev $DUMMY root handle 1: netem limit 1", - "$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", - "verifyCmd": "$TC -s qdisc show dev $DUMMY", - "matchPattern": "qdisc netem", - "matchCount": "2", - "teardown": [ - "$TC qdisc del dev $DUMMY handle 1:0 root" - ] - }, - { - "id": "b33f", - "name": "NETEM test qdisc duplication restriction in qdisc tree in netem_change non-root", - "category": ["qdisc", "netem"], - "plugins": { - "requires": "nsPlugin" - }, - "setup": [ - "$TC qdisc add dev $DUMMY root handle 1: netem limit 1", - "$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", - "verifyCmd": "$TC -s qdisc show dev $DUMMY", - "matchPattern": "qdisc netem", - "matchCount": "2", - "teardown": [ - "$TC qdisc del dev $DUMMY handle 1:0 root" - ] - }, - { - "id": "cafe", - "name": "NETEM test qdisc duplication restriction in qdisc tree", - "category": ["qdisc", "netem"], - "plugins": { - "requires": "nsPlugin" - }, - "setup": [ - "$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", - "verifyCmd": "$TC -s qdisc show dev $DUMMY", - "matchPattern": "qdisc netem", - "matchCount": "1", - "teardown": [ - "$TC qdisc del dev $DUMMY handle 1:0 root" - ] - }, - { - "id": "1337", - "name": "NETEM test qdisc duplication restriction in qdisc tree across branches", - "category": ["qdisc", "netem"], - "plugins": { - "requires": "nsPlugin" - }, - "setup": [ - "$TC qdisc add dev $DUMMY parent root handle 1:0 hfsc", - "$TC class add dev $DUMMY parent 1:0 classid 1:1 hfsc rt m2 10Mbit", - "$TC qdisc add dev $DUMMY parent 1:1 handle 2:0 netem", - "$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", - "verifyCmd": "$TC -s qdisc show dev $DUMMY", - "matchPattern": "qdisc netem", - "matchCount": "1", - "teardown": [ - "$TC qdisc del dev $DUMMY handle 1:0 root" - ] } ] -- 2.34.1