Commit fa29d467 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'tools-ynl-gen-fix-parse-multi-attr-enum-attribute' 

Arkadiusz Kubalewski says:

====================
tools: ynl-gen: fix parse multi-attr enum attribute

Fix the issues with parsing enums in ynl.py script.
====================

Link: https://lore.kernel.org/r/20230725101642.267248-1-arkadiusz.kubalewski@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d4a7ce64 df15c15e

tools/net/ynl/lib/ynl.py

+8 −8
Original line number Diff line number Diff line
@@ -417,11 +417,10 @@ class YnlFamily(SpecFamily): 
        pad = b'\x00' * ((4 - len(attr_payload) % 4) % 4)

        return struct.pack('HH', len(attr_payload) + 4, nl_type) + attr_payload + pad



    def _decode_enum(self, rsp, attr_spec):

        raw = rsp[attr_spec['name']]

    def _decode_enum(self, raw, attr_spec):

        enum = self.consts[attr_spec['enum']]

        i = attr_spec.get('value-start', 0)

        if 'enum-as-flags' in attr_spec and attr_spec['enum-as-flags']:

            i = 0

            value = set()

            while raw:

                if raw & 1:
@@ -429,8 +428,8 @@ class YnlFamily(SpecFamily): 
                raw >>= 1

                i += 1

        else:

            value = enum.entries_by_val[raw - i].name

        rsp[attr_spec['name']] = value

            value = enum.entries_by_val[raw].name

        return value



    def _decode_binary(self, attr, attr_spec):

        if attr_spec.struct_name:
@@ -438,7 +437,7 @@ class YnlFamily(SpecFamily): 
            decoded = attr.as_struct(members)

            for m in members:

                if m.enum:

                    self._decode_enum(decoded, m)

                    decoded[m.name] = self._decode_enum(decoded[m.name], m)

        elif attr_spec.sub_type:

            decoded = attr.as_c_array(attr_spec.sub_type)

        else:
@@ -466,6 +465,9 @@ class YnlFamily(SpecFamily): 
            else:

                raise Exception(f'Unknown {attr_spec["type"]} with name {attr_spec["name"]}')



            if 'enum' in attr_spec:

                decoded = self._decode_enum(decoded, attr_spec)



            if not attr_spec.is_multi:

                rsp[attr_spec['name']] = decoded

            elif attr_spec.name in rsp:
@@ -473,8 +475,6 @@ class YnlFamily(SpecFamily): 
            else:

                rsp[attr_spec.name] = [decoded]



            if 'enum' in attr_spec:

                self._decode_enum(rsp, attr_spec)

        return rsp



    def _decode_extack_path(self, attrs, attr_set, offset, target):