From: "Asbjørn Sloth Tønnesen" <ast@fiberby.net>
To: "Jason A. Donenfeld" <Jason@zx2c4.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: "Asbjørn Sloth Tønnesen" <ast@fiberby.net>,
"Donald Hunter" <donald.hunter@gmail.com>,
"Simon Horman" <horms@kernel.org>,
"Jacob Keller" <jacob.e.keller@intel.com>,
"Andrew Lunn" <andrew+netdev@lunn.ch>,
wireguard@lists.zx2c4.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next 08/11] tools: ynl: move nest packing to a helper function
Date: Thu, 4 Sep 2025 22:01:31 +0000 [thread overview]
Message-ID: <20250904220156.1006541-8-ast@fiberby.net> (raw)
In-Reply-To: <20250904-wg-ynl-prep@fiberby.net>
This patch moves nest packing into a helper function,
that can also be used for packing indexed arrays.
No behavioural changes intended.
Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
---
tools/net/ynl/pyynl/lib/ynl.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tools/net/ynl/pyynl/lib/ynl.py b/tools/net/ynl/pyynl/lib/ynl.py
index 8244a5f440b2..4928b41c636a 100644
--- a/tools/net/ynl/pyynl/lib/ynl.py
+++ b/tools/net/ynl/pyynl/lib/ynl.py
@@ -562,11 +562,8 @@ class YnlFamily(SpecFamily):
if attr["type"] == 'nest':
nl_type |= Netlink.NLA_F_NESTED
- attr_payload = b''
sub_space = attr['nested-attributes']
- sub_attrs = SpaceAttrs(self.attr_sets[sub_space], value, search_attrs)
- for subname, subvalue in value.items():
- attr_payload += self._add_attr(sub_space, subname, subvalue, sub_attrs)
+ attr_payload = self._add_nest_attrs(value, sub_space, search_attrs)
elif attr["type"] == 'flag':
if not value:
# If value is absent or false then skip attribute creation.
@@ -623,6 +620,14 @@ class YnlFamily(SpecFamily):
pad = b'\x00' * ((4 - len(attr_payload) % 4) % 4)
return struct.pack('HH', len(attr_payload) + 4, nl_type) + attr_payload + pad
+ def _add_nest_attrs(self, value, sub_space, search_attrs):
+ sub_attrs = SpaceAttrs(self.attr_sets[sub_space], value, search_attrs)
+ attr_payload = b''
+ for subname, subvalue in value.items():
+ attr_payload += self._add_attr(sub_space, subname, subvalue,
+ sub_attrs)
+ return attr_payload
+
def _get_enum_or_unknown(self, enum, raw):
try:
name = enum.entries_by_val[raw].name
--
2.51.0
next prev parent reply other threads:[~2025-09-04 22:03 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-04 22:01 [PATCH net-next 00/11] tools: ynl: prepare for wireguard Asbjørn Sloth Tønnesen
2025-09-04 22:01 ` [PATCH net-next 01/11] tools: ynl-gen: allow overriding name-prefix for constants Asbjørn Sloth Tønnesen
2025-09-05 10:36 ` Donald Hunter
2025-09-06 0:07 ` Jakub Kicinski
2025-09-06 0:15 ` Jacob Keller
2025-09-04 22:01 ` [PATCH net-next 02/11] tools: ynl-gen: generate nested array policies Asbjørn Sloth Tønnesen
2025-09-05 10:37 ` Donald Hunter
2025-09-06 0:09 ` Jakub Kicinski
2025-09-06 0:19 ` Jacob Keller
2025-09-06 14:13 ` Asbjørn Sloth Tønnesen
2025-09-08 7:54 ` Johannes Berg
2025-09-08 9:08 ` Asbjørn Sloth Tønnesen
2025-09-08 13:22 ` Johannes Berg
2025-09-09 23:02 ` Jacob Keller
2025-09-04 22:01 ` [PATCH net-next 03/11] tools: ynl-gen: add sub-type check Asbjørn Sloth Tønnesen
2025-09-05 10:37 ` Donald Hunter
2025-09-06 0:12 ` Jakub Kicinski
2025-09-06 0:20 ` Jacob Keller
2025-09-04 22:01 ` [PATCH net-next 04/11] tools: ynl-gen: define count iterator in print_dump() Asbjørn Sloth Tønnesen
2025-09-05 10:37 ` Donald Hunter
2025-09-06 0:13 ` Jakub Kicinski
2025-09-06 0:20 ` Jacob Keller
2025-09-04 22:01 ` [PATCH net-next 05/11] tools: ynl-gen: define nlattr *array in a block scope Asbjørn Sloth Tønnesen
2025-09-05 10:44 ` Donald Hunter
2025-09-06 0:18 ` Jakub Kicinski
2025-09-06 13:13 ` Asbjørn Sloth Tønnesen
2025-09-06 19:07 ` Jakub Kicinski
2025-09-11 0:01 ` Asbjørn Sloth Tønnesen
2025-09-11 0:27 ` Jakub Kicinski
2025-09-04 22:01 ` [PATCH net-next 06/11] tools: ynl-gen: don't validate nested array attribute types Asbjørn Sloth Tønnesen
2025-09-06 0:23 ` Jakub Kicinski
2025-09-06 13:22 ` Asbjørn Sloth Tønnesen
2025-09-06 19:29 ` Jakub Kicinski
2025-09-06 0:24 ` Jacob Keller
2025-09-06 15:10 ` Asbjørn Sloth Tønnesen
2025-09-08 7:55 ` Johannes Berg
2025-09-10 16:58 ` Jacob Keller
2025-09-04 22:01 ` [PATCH net-next 07/11] tools: ynl-gen: rename TypeArrayNest to TypeIndexedArray Asbjørn Sloth Tønnesen
2025-09-05 10:44 ` Donald Hunter
2025-09-06 0:25 ` Jakub Kicinski
2025-09-04 22:01 ` Asbjørn Sloth Tønnesen [this message]
2025-09-05 10:45 ` [PATCH net-next 08/11] tools: ynl: move nest packing to a helper function Donald Hunter
2025-09-04 22:01 ` [PATCH net-next 09/11] tools: ynl: encode indexed-array Asbjørn Sloth Tønnesen
2025-09-05 10:49 ` Donald Hunter
2025-09-05 15:34 ` Asbjørn Sloth Tønnesen
2025-09-04 22:01 ` [PATCH net-next 10/11] tools: ynl: decode hex input Asbjørn Sloth Tønnesen
2025-09-05 10:51 ` Donald Hunter
2025-09-06 0:27 ` Jacob Keller
2025-09-06 14:31 ` Asbjørn Sloth Tønnesen
2025-09-08 8:28 ` Donald Hunter
2025-09-09 18:10 ` Sabrina Dubroca
2025-09-09 20:18 ` Asbjørn Sloth Tønnesen
2025-09-04 22:01 ` [PATCH net-next 11/11] tools: ynl: add ipv4-or-v6 display hint Asbjørn Sloth Tønnesen
2025-09-05 10:53 ` Donald Hunter
2025-09-06 15:59 ` Asbjørn Sloth Tønnesen
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=20250904220156.1006541-8-ast@fiberby.net \
--to=ast@fiberby.net \
--cc=Jason@zx2c4.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=donald.hunter@gmail.com \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=wireguard@lists.zx2c4.com \
/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
all inboxes | Powered by JetHome®