Linux Kernel Selftest development
 help / color / mirror / Atom feed
From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
	andrew+netdev@lunn.ch, horms@kernel.org, shuah@kernel.org,
	linux-kselftest@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net 06/12] selftests: drv-net: add shaper test for duplicate leaves
Date: Tue,  5 May 2026 17:06:22 -0700	[thread overview]
Message-ID: <20260506000628.1501691-7-kuba@kernel.org> (raw)
In-Reply-To: <20260506000628.1501691-1-kuba@kernel.org>

Add test exercising duplicate leaves.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 tools/testing/selftests/drivers/net/shaper.py | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/drivers/net/shaper.py b/tools/testing/selftests/drivers/net/shaper.py
index 11310f19bfa0..f7872c931bf6 100755
--- a/tools/testing/selftests/drivers/net/shaper.py
+++ b/tools/testing/selftests/drivers/net/shaper.py
@@ -1,7 +1,10 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-2.0
 
-from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_true, KsftSkipEx
+import errno
+
+from lib.py import ksft_run, ksft_exit
+from lib.py import ksft_eq, ksft_raises, ksft_true, KsftSkipEx
 from lib.py import EthtoolFamily, NetshaperFamily
 from lib.py import NetDrvEnv
 from lib.py import NlError
@@ -438,6 +441,21 @@ from lib.py import cmd
         nl_shaper.delete({'ifindex': cfg.ifindex,
                           'handle': {'scope': 'queue', 'id': i}})
 
+def dup_leaves(cfg, nl_shaper) -> None:
+    """ Ensure that the kernel rejects duplicate leaves. """
+    if not cfg.groups:
+        raise KsftSkipEx("device does not support node scope")
+
+    with ksft_raises(NlError) as cm:
+        nl_shaper.group({
+                   'ifindex': cfg.ifindex,
+                   'leaves':[{'handle': {'scope': 'queue', 'id': 0}},
+                             {'handle': {'scope': 'queue', 'id': 0}}],
+                   'handle': {'scope':'node'},
+                   'metric': 'bps',
+                   'bw-max': 10000})
+    ksft_eq(cm.exception.error, errno.EINVAL)
+
 def main() -> None:
     with NetDrvEnv(__file__, queue_count=4) as cfg:
         cfg.queues = False
@@ -453,7 +471,10 @@ from lib.py import cmd
                   basic_groups,
                   qgroups,
                   delegation,
-                  queue_update], args=(cfg, NetshaperFamily()))
+                  queue_update,
+                  dup_leaves
+                  ],
+                 args=(cfg, NetshaperFamily()))
     ksft_exit()
 
 
-- 
2.54.0


  parent reply	other threads:[~2026-05-06  0:06 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-06  0:06 [PATCH net 00/12] net: shaper: fix various minor bugs Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 01/12] net: shaper: drop redundant xa_lock() bracketing Jakub Kicinski
2026-05-06 15:30   ` Paolo Abeni
2026-05-06 22:33     ` Jakub Kicinski
2026-05-07  7:10       ` Paolo Abeni
2026-05-06  0:06 ` [PATCH net 02/12] net: shaper: flip the polarity of the valid flag Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 03/12] net: shaper: fix trivial ordering issue in net_shaper_commit() Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 04/12] net: shaper: try to avoid violating RCU Jakub Kicinski
2026-05-06 15:22   ` Paolo Abeni
2026-05-06 15:32     ` Paolo Abeni
2026-05-06 22:35       ` Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 05/12] net: shaper: reject duplicate leaves in GROUP request Jakub Kicinski
2026-05-06  0:06 ` Jakub Kicinski [this message]
2026-05-06 16:40   ` [PATCH net 06/12] selftests: drv-net: add shaper test for duplicate leaves Breno Leitao
2026-05-06 22:35     ` Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 07/12] net: shaper: set ret to -ENOMEM when genlmsg_new() fails in group_doit Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 08/12] net: shaper: fix undersized reply skb allocation in GROUP command Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 09/12] tools: ynl: add scope qualifier for definitions Jakub Kicinski
2026-05-06  2:32   ` Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 10/12] net: shaper: reject handle IDs exceeding internal bit-width Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 11/12] net: shaper: enforce singleton NETDEV scope with id 0 Jakub Kicinski
2026-05-06  0:06 ` [PATCH net 12/12] net: shaper: reject QUEUE scope handle with missing id Jakub Kicinski

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=20260506000628.1501691-7-kuba@kernel.org \
    --to=kuba@kernel.org \
    --cc=andrew+netdev@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=horms@kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=shuah@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