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: <20231005065919.6001b7ca@kernel.org> Date: Thu, 5 Oct 2023 06:59:19 -0700 From: Jakub Kicinski <kuba@...nel.org> To: Lorenzo Bianconi <lorenzo@...nel.org> Cc: Lorenzo Bianconi <lorenzo.bianconi@...hat.com>, Jeff Layton <jlayton@...nel.org>, linux-nfs@...r.kernel.org, neilb@...e.de, chuck.lever@...cle.com, netdev@...r.kernel.org Subject: Re: [PATCH] NFSD: convert write_threads and write_v4_end_grace to netlink commands On Thu, 5 Oct 2023 10:52:30 +0200 Lorenzo Bianconi wrote: > running ynl-regen.sh, I got the following error for the get method: > > $ ./tools/net/ynl/ynl-regen.sh > GEN kernel fs/nfsd/netlink.h > Traceback (most recent call last): > File "/home/lorenzo/workspace/nfsd-next/tools/net/ynl/ynl-gen-c.py", line 2609, in <module> > main() > File "/home/lorenzo/workspace/nfsd-next/tools/net/ynl/ynl-gen-c.py", line 2445, in main > print_req_policy_fwd(cw, ri.struct['request'], ri=ri) > ~~~~~~~~~^^^^^^^^^^^ > KeyError: 'request' > > am I missing something? Not at all, the codegen was only handling dumps with no ops. This change seems to make it a little happier, at least it doesn't throw any exceptions. Will it work for your case? diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py index 168fe612b029..593be2632f23 100755 --- a/tools/net/ynl/ynl-gen-c.py +++ b/tools/net/ynl/ynl-gen-c.py @@ -645,6 +645,33 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S self.inherited = [c_lower(x) for x in sorted(self._inherited)] +class StructNone: + def __init__(self, family, space_name): + self.family = family + self.space_name = space_name + self.attr_set = family.attr_sets[space_name] + + if family.name == c_lower(space_name): + self.render_name = f"{family.name}" + else: + self.render_name = f"{family.name}_{c_lower(space_name)}" + + self.request = False + self.reply = False + + self.attr_list = [] + self.attrs = dict() + + def __iter__(self): + yield from self.attrs + + def __getitem__(self, key): + return self.attrs[key] + + def member_list(self): + return self.attr_list + + class EnumEntry(SpecEnumEntry): def __init__(self, enum_set, yaml, prev, value_start): super().__init__(enum_set, yaml, prev, value_start) @@ -1041,9 +1068,12 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S if op_mode == 'notify': op_mode = 'do' for op_dir in ['request', 'reply']: - if op and op_dir in op[op_mode]: - self.struct[op_dir] = Struct(family, self.attr_set, - type_list=op[op_mode][op_dir]['attributes']) + if op: + if op_dir in op[op_mode]: + self.struct[op_dir] = Struct(family, self.attr_set, + type_list=op[op_mode][op_dir]['attributes']) + else: + self.struct[op_dir] = StructNone(family, self.attr_set) if op_mode == 'event': self.struct['reply'] = Struct(family, self.attr_set, type_list=op['event']['attributes']) @@ -1752,6 +1782,8 @@ _C_KW = { def print_req_type_helpers(ri): + if isinstance(ri.struct["request"], StructNone): + return print_alloc_wrapper(ri, "request") print_type_helpers(ri, "request") @@ -1773,6 +1805,8 @@ _C_KW = { def print_req_type(ri): + if isinstance(ri.struct["request"], StructNone): + return print_type(ri, "request") @@ -2515,9 +2549,8 @@ _C_KW = { if 'dump' in op: cw.p(f"/* {op.enum_name} - dump */") ri = RenderInfo(cw, parsed, args.mode, op, 'dump') - if 'request' in op['dump']: - print_req_type(ri) - print_req_type_helpers(ri) + print_req_type(ri) + print_req_type_helpers(ri) if not ri.type_consistent: print_rsp_type(ri) print_wrapped_type(ri) -- 2.41.0
Powered by blists - more mailing lists