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, donald.hunter@gmail.com,
jacob.e.keller@intel.com, sdf@fomichev.me,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next 09/12] tools: ynl-gen: array-nest: support put for scalar
Date: Wed, 23 Apr 2025 19:12:04 -0700 [thread overview]
Message-ID: <20250424021207.1167791-10-kuba@kernel.org> (raw)
In-Reply-To: <20250424021207.1167791-1-kuba@kernel.org>
C codegen supports ArrayNest AKA indexed-array carrying scalars,
but only for the netlink -> struct parsing. Support rendering
from struct to netlink.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
tools/net/ynl/pyynl/ynl_gen_c.py | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/tools/net/ynl/pyynl/ynl_gen_c.py b/tools/net/ynl/pyynl/ynl_gen_c.py
index 14179b84d8ee..46d99b871d5c 100755
--- a/tools/net/ynl/pyynl/ynl_gen_c.py
+++ b/tools/net/ynl/pyynl/ynl_gen_c.py
@@ -747,6 +747,23 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S
'}']
return get_lines, None, local_vars
+ def attr_put(self, ri, var):
+ ri.cw.p(f'array = ynl_attr_nest_start(nlh, {self.enum_name});')
+ if self.sub_type in scalars:
+ put_type = self.sub_type
+ ri.cw.block_start(line=f'for (i = 0; i < {var}->n_{self.c_name}; i++)')
+ ri.cw.p(f"ynl_attr_put_{put_type}(nlh, i, {var}->{self.c_name}[i]);")
+ ri.cw.block_end()
+ else:
+ raise Exception(f"Put for ArrayNest sub-type {self.attr['sub-type']} not supported, yet")
+ ri.cw.p('ynl_attr_nest_end(nlh, array);')
+
+ def _setter_lines(self, ri, member, presence):
+ # For multi-attr we have a count, not presence, hack up the presence
+ presence = presence[:-(len('_present.') + len(self.c_name))] + "n_" + self.c_name
+ return [f"{member} = {self.c_name};",
+ f"{presence} = n_{self.c_name};"]
+
class TypeNestTypeValue(Type):
def _complex_member_type(self, ri):
@@ -1730,10 +1747,15 @@ _C_KW = {
local_vars.append('struct nlattr *nest;')
init_lines.append("nest = ynl_attr_nest_start(nlh, attr_type);")
+ has_anest = False
+ has_count = False
for _, arg in struct.member_list():
- if arg.presence_type() == 'count':
- local_vars.append('unsigned int i;')
- break
+ has_anest |= arg.type == 'indexed-array'
+ has_count |= arg.presence_type() == 'count'
+ if has_anest:
+ local_vars.append('struct nlattr *array;')
+ if has_count:
+ local_vars.append('unsigned int i;')
put_req_nested_prototype(ri, struct, suffix='')
ri.cw.block_start()
--
2.49.0
next prev parent reply other threads:[~2025-04-24 2:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-24 2:11 [PATCH net-next 00/12] tools: ynl-gen: additional C types and classic netlink handling Jakub Kicinski
2025-04-24 2:11 ` [PATCH net-next 01/12] tools: ynl-gen: fix comment about nested struct dict Jakub Kicinski
2025-04-24 15:40 ` Jacob Keller
2025-04-24 2:11 ` [PATCH net-next 02/12] tools: ynl-gen: factor out free_needs_iter for a struct Jakub Kicinski
2025-04-24 15:42 ` Jacob Keller
2025-04-24 2:11 ` [PATCH net-next 03/12] tools: ynl-gen: fill in missing empty attr lists Jakub Kicinski
2025-04-24 15:49 ` Jacob Keller
2025-04-25 2:36 ` Jakub Kicinski
2025-04-24 2:11 ` [PATCH net-next 04/12] tools: ynl: let classic netlink requests specify extra nlflags Jakub Kicinski
2025-04-24 15:51 ` Jacob Keller
2025-04-24 2:12 ` [PATCH net-next 05/12] tools: ynl-gen: support using dump types for ntf Jakub Kicinski
2025-04-24 15:51 ` Jacob Keller
2025-04-24 2:12 ` [PATCH net-next 06/12] tools: ynl-gen: support CRUD-like notifications for classic Netlink Jakub Kicinski
2025-04-24 15:52 ` Jacob Keller
2025-04-24 2:12 ` [PATCH net-next 07/12] tools: ynl-gen: multi-attr: type gen for string Jakub Kicinski
2025-04-24 15:54 ` Jacob Keller
2025-04-24 2:12 ` [PATCH net-next 08/12] tools: ynl-gen: mutli-attr: support binary types with struct Jakub Kicinski
2025-04-24 15:55 ` Jacob Keller
2025-04-24 2:12 ` Jakub Kicinski [this message]
2025-04-24 15:56 ` [PATCH net-next 09/12] tools: ynl-gen: array-nest: support put for scalar Jacob Keller
2025-04-24 2:12 ` [PATCH net-next 10/12] tools: ynl-gen: array-nest: support binary array with exact-len Jakub Kicinski
2025-04-24 15:57 ` Jacob Keller
2025-04-24 2:12 ` [PATCH net-next 11/12] tools: ynl-gen: don't init enum checks for classic netlink Jakub Kicinski
2025-04-24 15:59 ` Jacob Keller
2025-04-25 2:36 ` Jakub Kicinski
2025-04-24 2:12 ` [PATCH net-next 12/12] tools: ynl: allow fixed-header to be specified per op Jakub Kicinski
2025-04-24 16:00 ` Jacob Keller
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=20250424021207.1167791-10-kuba@kernel.org \
--to=kuba@kernel.org \
--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=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
/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;
as well as URLs for NNTP newsgroup(s).