Message ID | 20230324190356.2418748-1-kuba@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 4c6170d1ae2ccb20ed8d06d191868ed01e6bece0 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] tools: ynl: default to treating enums as flags for mask generation | expand |
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 24 Mar 2023 12:03:56 -0700 you wrote: > I was a bit too optimistic in commit bf51d27704c9 ("tools: ynl: fix > get_mask utility routine"), not every mask we use is necessarily > coming from an enum of type "flags". We also allow flipping an > enum into flags on per-attribute basis. That's done by > the 'enum-as-flags' property of an attribute. > > Restore this functionality, it's not currently used by any in-tree > family. > > [...] Here is the summary with links: - [net-next] tools: ynl: default to treating enums as flags for mask generation https://git.kernel.org/netdev/net-next/c/4c6170d1ae2c You are awesome, thank you!
diff --git a/tools/net/ynl/lib/nlspec.py b/tools/net/ynl/lib/nlspec.py index d04450c2a44a..dba70100124a 100644 --- a/tools/net/ynl/lib/nlspec.py +++ b/tools/net/ynl/lib/nlspec.py @@ -90,8 +90,8 @@ jsonschema = None def raw_value(self): return self.value - def user_value(self): - if self.enum_set['type'] == 'flags': + def user_value(self, as_flags=None): + if self.enum_set['type'] == 'flags' or as_flags: return 1 << self.value else: return self.value @@ -136,10 +136,10 @@ jsonschema = None return True return False - def get_mask(self): + def get_mask(self, as_flags=None): mask = 0 for e in self.entries.values(): - mask += e.user_value() + mask += e.user_value(as_flags) return mask diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py index 972b87c7aaaf..cc2f8c945340 100755 --- a/tools/net/ynl/ynl-gen-c.py +++ b/tools/net/ynl/ynl-gen-c.py @@ -254,7 +254,8 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S def _attr_policy(self, policy): if 'flags-mask' in self.checks or self.is_bitfield: if self.is_bitfield: - mask = self.family.consts[self.attr['enum']].get_mask() + enum = self.family.consts[self.attr['enum']] + mask = enum.get_mask(as_flags=True) else: flags = self.family.consts[self.checks['flags-mask']] flag_cnt = len(flags['entries'])
I was a bit too optimistic in commit bf51d27704c9 ("tools: ynl: fix get_mask utility routine"), not every mask we use is necessarily coming from an enum of type "flags". We also allow flipping an enum into flags on per-attribute basis. That's done by the 'enum-as-flags' property of an attribute. Restore this functionality, it's not currently used by any in-tree family. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- tools/net/ynl/lib/nlspec.py | 8 ++++---- tools/net/ynl/ynl-gen-c.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-)