From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
jiri@resnulli.us, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next 04/11] tools: ynl-gen: enable code gen for directional specs
Date: Wed, 7 Jun 2023 13:23:56 -0700 [thread overview]
Message-ID: <20230607202403.1089925-5-kuba@kernel.org> (raw)
In-Reply-To: <20230607202403.1089925-1-kuba@kernel.org>
I think that user space code gen for directional specs
works after recent changes. Let them through.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
tools/net/ynl/lib/nlspec.py | 7 ++++---
tools/net/ynl/ynl-gen-c.py | 10 +++++++---
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/tools/net/ynl/lib/nlspec.py b/tools/net/ynl/lib/nlspec.py
index bd5da8aaeac7..9f7ad87d69af 100644
--- a/tools/net/ynl/lib/nlspec.py
+++ b/tools/net/ynl/lib/nlspec.py
@@ -324,6 +324,7 @@ jsonschema = None
Attributes:
proto protocol type (e.g. genetlink)
+ msg_id_model enum-model for operations (unified, directional etc.)
license spec license (loaded from an SPDX tag on the spec)
attr_sets dict of attribute sets
@@ -349,6 +350,7 @@ jsonschema = None
super().__init__(self, spec)
self.proto = self.yaml.get('protocol', 'genetlink')
+ self.msg_id_model = self.yaml['operations'].get('enum-model', 'unified')
if schema_path is None:
schema_path = os.path.dirname(os.path.dirname(spec_path)) + f'/{self.proto}.yaml'
@@ -477,10 +479,9 @@ jsonschema = None
attr_set = self.new_attr_set(elem)
self.attr_sets[elem['name']] = attr_set
- msg_id_model = self.yaml['operations'].get('enum-model', 'unified')
- if msg_id_model == 'unified':
+ if self.msg_id_model == 'unified':
self._dictify_ops_unified()
- elif msg_id_model == 'directional':
+ elif self.msg_id_model == 'directional':
self._dictify_ops_directional()
for op in self.msgs.values():
diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py
index efcf91675dfa..7b3e79e17c01 100755
--- a/tools/net/ynl/ynl-gen-c.py
+++ b/tools/net/ynl/ynl-gen-c.py
@@ -709,9 +709,6 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S
def __init__(self, family, yaml, req_value, rsp_value):
super().__init__(family, yaml, req_value, rsp_value)
- if req_value != rsp_value:
- raise Exception("Directional messages not supported by codegen")
-
self.render_name = family.name + '_' + c_lower(self.name)
self.dual_policy = ('do' in yaml and 'request' in yaml['do']) and \
@@ -2243,6 +2240,13 @@ _C_KW = {
os.sys.exit(1)
return
+ supported_models = ['unified']
+ if args.mode == 'user':
+ supported_models += ['directional']
+ if parsed.msg_id_model not in supported_models:
+ print(f'Message enum-model {parsed.msg_id_model} not supported for {args.mode} generation')
+ os.sys.exit(1)
+
cw = CodeWriter(BaseNlLib(), out_file)
_, spec_kernel = find_kernel_root(args.spec)
--
2.40.1
next prev parent reply other threads:[~2023-06-07 20:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 20:23 [PATCH net-next 00/11] tools: ynl: generate code for the devlink family Jakub Kicinski
2023-06-07 20:23 ` [PATCH net-next 01/11] netlink: specs: devlink: fill in some details important for C Jakub Kicinski
2023-06-07 20:23 ` [PATCH net-next 02/11] tools: ynl-gen: use enum names in op strmap more carefully Jakub Kicinski
2023-06-07 20:23 ` [PATCH net-next 03/11] tools: ynl-gen: refactor strmap helper generation Jakub Kicinski
2023-06-07 20:23 ` Jakub Kicinski [this message]
2023-06-07 20:23 ` [PATCH net-next 05/11] tools: ynl-gen: try to sort the types more intelligently Jakub Kicinski
2023-06-07 20:23 ` [PATCH net-next 06/11] tools: ynl-gen: inherit struct use info Jakub Kicinski
2023-06-07 20:23 ` [PATCH net-next 07/11] tools: ynl-gen: walk nested types in depth Jakub Kicinski
2023-06-07 20:24 ` [PATCH net-next 08/11] tools: ynl-gen: don't generate forward declarations for policies Jakub Kicinski
2023-06-07 20:24 ` [PATCH net-next 09/11] tools: ynl-gen: don't generate forward declarations for policies - regen Jakub Kicinski
2023-06-07 20:24 ` [PATCH net-next 10/11] tools: ynl: generate code for the devlink family Jakub Kicinski
2023-06-08 11:48 ` Simon Horman
2023-06-08 15:53 ` Jakub Kicinski
2023-06-09 7:46 ` Simon Horman
2023-06-07 20:24 ` [PATCH net-next 11/11] tools: ynl: add sample for devlink Jakub Kicinski
2023-06-08 21:10 ` [PATCH net-next 00/11] tools: ynl: generate code for the devlink family patchwork-bot+netdevbpf
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=20230607202403.1089925-5-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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;
as well as URLs for NNTP newsgroup(s).