iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: ynl-gen: inherit policy in multi-attr

Browse Source 
Instead of reimplementing policies in MutliAttr for every
underlying type forward the calls to the base type.
This will be needed for DPLL which uses a multi-attr nest,
and currently gets an invalid NLA_NEST policy generated.

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:20 -07:00
parent 10c4d2a7b8
commit be093a80df
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tools/net/ynl/ynl-gen-c.py
View File

@ -462,6 +462,11 @@ class TypeNest(Type):
class TypeMultiAttr(Type):
def __init__(self, family, attr_set, attr, value, base_type):
super().__init__(family, attr_set, attr, value)
self.base_type = base_type
def is_multi_val(self):
return True
@ -497,13 +502,11 @@ class TypeMultiAttr(Type):
else:
raise Exception(f"Free of MultiAttr sub-type {self.attr['type']} not supported yet")
def _attr_policy(self, policy):
return self.base_type._attr_policy(policy)
def _attr_typol(self):
if 'type' not in self.attr or self.attr['type'] == 'nest':
return f'.type = YNL_PT_NEST, .nest = &{self.nested_render_name}_nest, '
elif self.attr['type'] in scalars:
return f".type = YNL_PT_U{self.attr['type'][1:]}, "
else:
raise Exception(f"Sub-type {self.attr['type']} not supported yet")
return self.base_type._attr_typol()
def _attr_get(self, ri, var):
return f'n_{self.c_name}++;', None, None
@ -717,29 +720,32 @@ class AttrSet(SpecAttrSet):
self.c_name = ''
def new_attr(self, elem, value):
if 'multi-attr' in elem and elem['multi-attr']:
return TypeMultiAttr(self.family, self, elem, value)
elif elem['type'] in scalars:
return TypeScalar(self.family, self, elem, value)
if elem['type'] in scalars:
t = TypeScalar(self.family, self, elem, value)
elif elem['type'] == 'unused':
return TypeUnused(self.family, self, elem, value)
t = TypeUnused(self.family, self, elem, value)
elif elem['type'] == 'pad':
return TypePad(self.family, self, elem, value)
t = TypePad(self.family, self, elem, value)
elif elem['type'] == 'flag':
return TypeFlag(self.family, self, elem, value)
t = TypeFlag(self.family, self, elem, value)
elif elem['type'] == 'string':
return TypeString(self.family, self, elem, value)
t = TypeString(self.family, self, elem, value)
elif elem['type'] == 'binary':
return TypeBinary(self.family, self, elem, value)
t = TypeBinary(self.family, self, elem, value)
elif elem['type'] == 'nest':
return TypeNest(self.family, self, elem, value)
t = TypeNest(self.family, self, elem, value)
elif elem['type'] == 'array-nest':
return TypeArrayNest(self.family, self, elem, value)
t = TypeArrayNest(self.family, self, elem, value)
elif elem['type'] == 'nest-type-value':
return TypeNestTypeValue(self.family, self, elem, value)
t = TypeNestTypeValue(self.family, self, elem, value)
else:
raise Exception(f"No typed class for type {elem['type']}")
if 'multi-attr' in elem and elem['multi-attr']:
t = TypeMultiAttr(self.family, self, elem, value, t)
return t
class Operation(SpecOperation):
def __init__(self, family, yaml, req_value, rsp_value):