| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251018151737.365485-5-zahari.doychev@linux.com>
Date: Sat, 18 Oct 2025 17:17:37 +0200
From: Zahari Doychev <zahari.doychev@...ux.com>
To: donald.hunter@...il.com,
kuba@...nel.org
Cc: davem@...emloft.net,
edumazet@...gle.com,
pabeni@...hat.com,
horms@...nel.org,
jacob.e.keller@...el.com,
ast@...erby.net,
matttbe@...nel.org,
netdev@...r.kernel.org,
linux-kernel@...r.kernel.org,
jhs@...atatu.com,
xiyou.wangcong@...il.com,
jiri@...nulli.us,
johannes@...solutions.net,
zahari.doychev@...ux.com
Subject: [PATCH 4/4] tools: ynl: add start-index property for indexed arrays
The Linux tc actions expect that the action order starts from index
one. To accommodate this, add a start-index property to the ynl spec
for indexed arrays. This property allows the starting index to be
specified, ensuring compatibility with consumers that require a
non-zero-based index.
For example if we have "start_index = 1" then we get the following
diff.
ynl_attr_put_str(nlh, TCA_FLOWER_INDEV, obj->indev);
array = ynl_attr_nest_start(nlh, TCA_FLOWER_ACT);
for (i = 0; i < obj->_count.act; i++)
- tc_act_attrs_put(nlh, i, &obj->act[i]);
+ tc_act_attrs_put(nlh, i + 1, &obj->act[i]);
ynl_attr_nest_end(nlh, array);
Signed-off-by: Zahari Doychev <zahari.doychev@...ux.com>
---
Documentation/netlink/netlink-raw.yaml | 13 +++++++++++++
Documentation/netlink/specs/tc.yaml | 7 +++++++
tools/net/ynl/pyynl/lib/nlspec.py | 1 +
tools/net/ynl/pyynl/ynl_gen_c.py | 6 +++++-
4 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/Documentation/netlink/netlink-raw.yaml b/Documentation/netlink/netlink-raw.yaml
index 246fa07bccf6..aafb7cb16beb 100644
--- a/Documentation/netlink/netlink-raw.yaml
+++ b/Documentation/netlink/netlink-raw.yaml
@@ -260,6 +260,9 @@ properties:
Sometimes, however, both forms are necessary, in which case header contains the enum
form while specific attributes may request to convert the values into a bitfield.
type: boolean
+ start-index:
+ description: For indexed arrays the first index value.
+ type: integer
checks:
description: Kernel input validation.
type: object
@@ -308,6 +311,16 @@ properties:
type: string
# End netlink-raw
+ # allow start index only for indexed arrays
+ if:
+ properties:
+ type:
+ const: indexed-array
+ then: {}
+ else:
+ not:
+ required: [ start-index ]
+
# Make sure name-prefix does not appear in subsets (subsets inherit naming)
dependencies:
name-prefix:
diff --git a/Documentation/netlink/specs/tc.yaml b/Documentation/netlink/specs/tc.yaml
index b398f7a46dae..459aa51059ec 100644
--- a/Documentation/netlink/specs/tc.yaml
+++ b/Documentation/netlink/specs/tc.yaml
@@ -2044,6 +2044,7 @@ attribute-sets:
type: indexed-array
sub-type: nest
nested-attributes: act-attrs
+ start-index: 1
-
name: police
type: nest
@@ -2303,6 +2304,7 @@ attribute-sets:
type: indexed-array
sub-type: nest
nested-attributes: act-attrs
+ start-index: 1
-
name: police
type: nest
@@ -2493,6 +2495,7 @@ attribute-sets:
type: indexed-array
sub-type: nest
nested-attributes: act-attrs
+ start-index: 1
-
name: key-eth-dst
type: binary
@@ -3020,6 +3023,7 @@ attribute-sets:
type: indexed-array
sub-type: nest
nested-attributes: act-attrs
+ start-index: 1
-
name: mask
type: u32
@@ -3180,6 +3184,7 @@ attribute-sets:
type: indexed-array
sub-type: nest
nested-attributes: act-attrs
+ start-index: 1
-
name: flags
type: u32
@@ -3566,6 +3571,7 @@ attribute-sets:
type: indexed-array
sub-type: nest
nested-attributes: act-attrs
+ start-index: 1
-
name: taprio-attrs
name-prefix: tca-taprio-attr-
@@ -3798,6 +3804,7 @@ attribute-sets:
type: indexed-array
sub-type: nest
nested-attributes: act-attrs
+ start-index: 1
-
name: indev
type: string
diff --git a/tools/net/ynl/pyynl/lib/nlspec.py b/tools/net/ynl/pyynl/lib/nlspec.py
index 85c17fe01e35..08660602da9d 100644
--- a/tools/net/ynl/pyynl/lib/nlspec.py
+++ b/tools/net/ynl/pyynl/lib/nlspec.py
@@ -181,6 +181,7 @@ class SpecAttr(SpecElement):
self.display_hint = yaml.get('display-hint')
self.sub_message = yaml.get('sub-message')
self.selector = yaml.get('selector')
+ self.start_index = yaml.get('start-index', 0)
self.is_auto_scalar = self.type == "sint" or self.type == "uint"
diff --git a/tools/net/ynl/pyynl/ynl_gen_c.py b/tools/net/ynl/pyynl/ynl_gen_c.py
index aadeb3abcad8..698d6089a856 100755
--- a/tools/net/ynl/pyynl/ynl_gen_c.py
+++ b/tools/net/ynl/pyynl/ynl_gen_c.py
@@ -852,7 +852,11 @@ class TypeIndexedArray(Type):
ri.cw.p(f"ynl_attr_put(nlh, i, {var}->{self.c_name}[i], {self.checks['exact-len']});")
elif self.sub_type == 'nest':
ri.cw.p(f'for (i = 0; i < {var}->_count.{self.c_name}; i++)')
- ri.cw.p(f"{self.nested_render_name}_put(nlh, i, &{var}->{self.c_name}[i]);")
+ ri.cw.p(
+ f"{self.nested_render_name}_put(nlh, "
+ f"i{f' + {self.start_index}' if self.start_index > 0 else ''}, "
+ f"&{var}->{self.c_name}[i]);"
+ )
else:
raise Exception(f"Put for IndexedArray sub-type {self.attr['sub-type']} not supported, yet")
ri.cw.p('ynl_attr_nest_end(nlh, array);')
--
2.51.0
Powered by blists - more mailing lists