Commit 4e2846fd authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

tools: ynl-gen: introduce support for bitfield32 attribute type 



Introduce support for attribute type bitfield32.
Note that since the generated code works with struct nla_bitfield32,
the generator adds netlink.h to the list of includes for userspace
headers in case any bitfield32 is present.

Note that this is added only to genetlink-legacy scheme as requested
by Jakub Kicinski.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20231021112711.660606-3-jiri@resnulli.us


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f862ed2d

Documentation/netlink/genetlink-legacy.yaml

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ properties: 
                type: string

              type: &attr-type

                description: The netlink attribute type

                enum: [ unused, pad, flag, binary,

                enum: [ unused, pad, flag, binary, bitfield32,

                        uint, sint, u8, u16, u32, u64, s32, s64,

                        string, nest, array-nest, nest-type-value ]

              doc:

Documentation/userspace-api/netlink/genetlink-legacy.rst

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ members 


 - ``name`` - The attribute name of the struct member

 - ``type`` - One of the scalar types ``u8``, ``u16``, ``u32``, ``u64``, ``s8``,

   ``s16``, ``s32``, ``s64``, ``string`` or ``binary``.

   ``s16``, ``s32``, ``s64``, ``string``, ``binary`` or ``bitfield32``.

 - ``byte-order`` - ``big-endian`` or ``little-endian``

 - ``doc``, ``enum``, ``enum-as-flags``, ``display-hint`` - Same as for

   :ref:`attribute definitions <attribute_properties>`

tools/net/ynl/lib/ynl.c

+6 −0
Original line number Diff line number Diff line
@@ -379,6 +379,12 @@ int ynl_attr_validate(struct ynl_parse_arg *yarg, const struct nlattr *attr) 
		yerr(yarg->ys, YNL_ERROR_ATTR_INVALID,

		     "Invalid attribute (string %s)", policy->name);

		return -1;

	case YNL_PT_BITFIELD32:

		if (len == sizeof(struct nla_bitfield32))

			break;

		yerr(yarg->ys, YNL_ERROR_ATTR_INVALID,

		     "Invalid attribute (bitfield32 %s)", policy->name);

		return -1;

	default:

		yerr(yarg->ys, YNL_ERROR_ATTR_INVALID,

		     "Invalid attribute (unknown %s)", policy->name);

tools/net/ynl/lib/ynl.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ enum ynl_policy_type { 
	YNL_PT_U64,

	YNL_PT_UINT,

	YNL_PT_NUL_STR,

	YNL_PT_BITFIELD32,

};



struct ynl_policy_attr {

tools/net/ynl/lib/ynl.py

+10 −3
Original line number Diff line number Diff line
@@ -478,6 +478,8 @@ class YnlFamily(SpecFamily): 
        elif attr['type'] in NlAttr.type_formats:

            format = NlAttr.get_format(attr['type'], attr.byte_order)

            attr_payload = format.pack(int(value))

        elif attr['type'] in "bitfield32":

            attr_payload = struct.pack("II", int(value["value"]), int(value["selector"]))

        else:

            raise Exception(f'Unknown type at {space} {name} {value} {attr["type"]}')
@@ -545,14 +547,19 @@ class YnlFamily(SpecFamily): 
                decoded = attr.as_auto_scalar(attr_spec['type'], attr_spec.byte_order)

            elif attr_spec["type"] in NlAttr.type_formats:

                decoded = attr.as_scalar(attr_spec['type'], attr_spec.byte_order)

                if 'enum' in attr_spec:

                    decoded = self._decode_enum(decoded, attr_spec)

            elif attr_spec["type"] == 'array-nest':

                decoded = self._decode_array_nest(attr, attr_spec)

            elif attr_spec["type"] == 'bitfield32':

                value, selector = struct.unpack("II", attr.raw)

                if 'enum' in attr_spec:

                    value = self._decode_enum(value, attr_spec)

                    selector = self._decode_enum(selector, attr_spec)

                decoded = {"value": value, "selector": selector}

            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: