tools: ynl-gen: correct enum policies

Scalar range validation assumes enums start at 0.
Teach it to properly calculate the value range.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2023-06-12 08:59:19 -07:00
parent 6b5f9a87e1
commit 10c4d2a7b8
1 changed files with 13 additions and 2 deletions
tools/net/ynl

View File

@ -300,8 +300,10 @@ class TypeScalar(Type):
return f"NLA_POLICY_MIN({policy}, {self.checks['min']})"
elif 'enum' in self.attr:
enum = self.family.consts[self.attr['enum']]
cnt = len(enum['entries'])
return f"NLA_POLICY_MAX({policy}, {cnt - 1})"
low, high = enum.value_range()
if low == 0:
return f"NLA_POLICY_MAX({policy}, {high})"
return f"NLA_POLICY_RANGE({policy}, {low}, {high})"
return super()._attr_policy(policy)
def _attr_typol(self):
@ -676,6 +678,15 @@ class EnumSet(SpecEnumSet):
def new_entry(self, entry, prev_entry, value_start):
return EnumEntry(self, entry, prev_entry, value_start)
def value_range(self):
low = min([x.value for x in self.entries.values()])
high = max([x.value for x in self.entries.values()])
if high - low + 1 != len(self.entries):
raise Exception("Can't get value range for a noncontiguous enum")
return low, high
class AttrSet(SpecAttrSet):
def __init__(self, family, yaml):