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 11/12] net: shaper: enforce singleton NETDEV scope with id 0
Date: Tue, 5 May 2026 17:06:27 -0700 [thread overview]
Message-ID: <20260506000628.1501691-12-kuba@kernel.org> (raw)
In-Reply-To: <20260506000628.1501691-1-kuba@kernel.org>
The NETDEV scope represents a singleton root shaper in the per-device
hierarchy. All code assumes NETDEV shapers have id 0:
net_shaper_default_parent() hardcodes parent->id = 0 when returning
the NETDEV parent for QUEUE/NODE children, and the UAPI documentation
describes NETDEV scope as "the main shaper" (singular, not plural).
Make sure we reject non-0 IDs like we reject out of range queues.
Fixes: 4b623f9f0f59 ("net-shapers: implement NL get operation")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
net/shaper/shaper.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
index 16bf24d9e3ca..2adf8b0e1105 100644
--- a/net/shaper/shaper.c
+++ b/net/shaper/shaper.c
@@ -535,6 +535,13 @@ static int net_shaper_validate_caps(struct net_shaper_binding *binding,
return -EOPNOTSUPP;
}
+ if (shaper->handle.scope == NET_SHAPER_SCOPE_NETDEV &&
+ shaper->handle.id != 0) {
+ NL_SET_ERR_MSG(info->extack,
+ "Netdev scope is a singleton, must use ID 0");
+ return -EINVAL;
+ }
+
if (shaper->handle.scope == NET_SHAPER_SCOPE_QUEUE &&
binding->type == NET_SHAPER_BINDING_TYPE_NETDEV &&
shaper->handle.id >= binding->netdev->real_num_tx_queues) {
--
2.54.0
next prev 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 ` [PATCH net 06/12] selftests: drv-net: add shaper test for duplicate leaves Jakub Kicinski
2026-05-06 16:40 ` 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 ` Jakub Kicinski [this message]
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-12-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