Commit 18d574c8 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Paolo Abeni
Browse files

tools: ynl-gen: don't init enum checks for classic netlink 



rt-link has a vlan-protocols enum with:

   name: 8021q     value: 33024
   name: 8021ad    value: 34984

It's nice to have, since it converts the values to strings in Python.
For C, however, the codegen is trying to use enums to generate strict
policy checks. Parsing such sparse enums is not possible via policies.

Since for classic netlink we don't support kernel codegen and policy
generation - skip the auto-generation of checks from enums.

Reviewed-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/20250429154704.2613851-12-kuba@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 5f7804dd

tools/net/ynl/pyynl/ynl_gen_c.py

+26 −20
Original line number Diff line number Diff line
@@ -357,26 +357,10 @@ class TypeScalar(Type): 
        if 'byte-order' in attr:

            self.byte_order_comment = f" /* {attr['byte-order']} */"



        if 'enum' in self.attr:

            enum = self.family.consts[self.attr['enum']]

            low, high = enum.value_range()

            if 'min' not in self.checks:

                if low != 0 or self.type[0] == 's':

                    self.checks['min'] = low

            if 'max' not in self.checks:

                self.checks['max'] = high



        if 'min' in self.checks and 'max' in self.checks:

            if self.get_limit('min') > self.get_limit('max'):

                raise Exception(f'Invalid limit for "{self.name}" min: {self.get_limit("min")} max: {self.get_limit("max")}')

            self.checks['range'] = True



        low = min(self.get_limit('min', 0), self.get_limit('max', 0))

        high = max(self.get_limit('min', 0), self.get_limit('max', 0))

        if low < 0 and self.type[0] == 'u':

            raise Exception(f'Invalid limit for "{self.name}" negative limit for unsigned type')

        if low < -32768 or high > 32767:

            self.checks['full-range'] = True

        # Classic families have some funny enums, don't bother

        # computing checks, since we only need them for kernel policies

        if not family.is_classic():

            self._init_checks()



        # Added by resolve():

        self.is_bitfield = None
@@ -401,6 +385,28 @@ class TypeScalar(Type): 
        else:

            self.type_name = '__' + self.type



    def _init_checks(self):

        if 'enum' in self.attr:

            enum = self.family.consts[self.attr['enum']]

            low, high = enum.value_range()

            if 'min' not in self.checks:

                if low != 0 or self.type[0] == 's':

                    self.checks['min'] = low

            if 'max' not in self.checks:

                self.checks['max'] = high



        if 'min' in self.checks and 'max' in self.checks:

            if self.get_limit('min') > self.get_limit('max'):

                raise Exception(f'Invalid limit for "{self.name}" min: {self.get_limit("min")} max: {self.get_limit("max")}')

            self.checks['range'] = True



        low = min(self.get_limit('min', 0), self.get_limit('max', 0))

        high = max(self.get_limit('min', 0), self.get_limit('max', 0))

        if low < 0 and self.type[0] == 'u':

            raise Exception(f'Invalid limit for "{self.name}" negative limit for unsigned type')

        if low < -32768 or high > 32767:

            self.checks['full-range'] = True



    def _attr_policy(self, policy):

        if 'flags-mask' in self.checks or self.is_bitfield:

            if self.is_bitfield: