[PATCH 2/4] tools: ynl-gen-c: optionally emit structs and helpers
Christoph Böhmwalder
christoph.boehmwalder at linbit.com
Tue Apr 7 19:33:54 CEST 2026
Add a "emit-structs" option to the genetlink-legacy spec.
Enabling "emit-structs" adds struct declarations for nested attribute
sets to the generated kernel headers.
It also adds some useful serialization helpers:
- from_attrs() with 'required' attribute enforcement
- to_skb() for struct-to-netlink serialization
- set_defaults() driven by the 'default' YAML key
The motivation is to replace the existing deprecated genl_magic system.
Some genl_magic features are dropped entirely because they had no
significant users, some are carried over to YNL (the genetlink-legacy
spec).
The new flags in the genetlink-legacy spec that are required for
existing consumers to keep working are:
"default": a literal value or C define that sets the default value
for an attribute, consumed by set_defaults().
"required": if true, from_attrs() returns an error when this
attribute is missing from the request message.
"nla-policy-type": can be used to override the NLA type used in
policy arrays. This is needed when the semantic type differs from
the wire type for backward compatibility: genl_magic maps s32 fields
to NLA_U32/nla_get_u32, and existing userspace might depend on this
encoding. The immediate motivation is DRBD, whose genl spec
definition predates the addition of signed types in genl. However,
this is a generic issue that potentially affects multiple families:
for example, nftables has NFTA_HOOK_PRIORITY as s32 in the spec but
NLA_U32 in the actual kernel policy.
All new properties are backward-compatible; existing specs that do not
use them are unaffected.
Signed-off-by: Christoph Böhmwalder <christoph.boehmwalder at linbit.com>
---
Documentation/netlink/genetlink-legacy.yaml | 23 ++
tools/net/ynl/pyynl/ynl_gen_c.py | 293 +++++++++++++++++++-
2 files changed, 313 insertions(+), 3 deletions(-)
diff --git a/Documentation/netlink/genetlink-legacy.yaml b/Documentation/netlink/genetlink-legacy.yaml
index 66fb8653a344..8e87e1c7915e 100644
--- a/Documentation/netlink/genetlink-legacy.yaml
+++ b/Documentation/netlink/genetlink-legacy.yaml
@@ -270,6 +270,23 @@ properties:
For string attributes, do not check whether attribute
contains the terminating null character.
type: boolean
+ default:
+ description: |
+ Default value expression (C macro or literal) for this attribute.
+ Used to generate set_defaults() initialization functions.
+ type: [ string, integer ]
+ required:
+ description: |
+ If true, from_attrs() returns an error when this attribute is
+ missing from the request message.
+ type: boolean
+ nla-policy-type:
+ description: |
+ Override the NLA type used in kernel policy arrays. Use this when
+ the semantic type differs from the wire type for backward compat
+ (e.g., s32 fields that must use NLA_U32 on the wire because
+ userspace predates NLA_S32 support).
+ enum: [ u8, u16, u32, u64, s8, s16, s32, s64 ]
sub-type: *attr-type
display-hint: *display-hint
# Start genetlink-c
@@ -471,3 +488,9 @@ properties:
to store the socket state. The type / structure is internal
to the kernel, and is not defined in the spec.
type: string
+ emit-structs:
+ description: |
+ Generate C struct declarations and serialization helpers
+ (from_attrs, to_skb, set_defaults) in the kernel header
+ and source.
+ type: boolean
diff --git a/tools/net/ynl/pyynl/ynl_gen_c.py b/tools/net/ynl/pyynl/ynl_gen_c.py
index 0e1e486c1185..fc20b05f1c95 100755
--- a/tools/net/ynl/pyynl/ynl_gen_c.py
+++ b/tools/net/ynl/pyynl/ynl_gen_c.py
@@ -225,10 +225,11 @@ class Type(SpecAttr):
return '{ .type = ' + policy + ', }'
def attr_policy(self, cw):
- policy = f'NLA_{c_upper(self.type)}'
+ policy_type = self.attr.get('nla-policy-type', self.type)
+ policy = f'NLA_{c_upper(policy_type)}'
if self.attr.get('byte-order') == 'big-endian':
- if self.type in {'u16', 'u32'}:
- policy = f'NLA_BE{self.type[1:]}'
+ if policy_type in {'u16', 'u32'}:
+ policy = f'NLA_BE{policy_type[1:]}'
spec = self._attr_policy(policy)
cw.p(f"\t[{self.enum_name}] = {spec},")
@@ -3415,6 +3416,255 @@ def find_kernel_root(full_path):
return full_path, sub_path[:-1]
+def _struct_c_type(attr_type):
+ """Map YNL attribute type to C type for struct field declarations."""
+ type_map = {
+ 'u8': 'unsigned char', 'u16': '__u16', 'u32': '__u32', 'u64': '__u64',
+ 's8': '__s8', 's16': '__s16', 's32': '__s32', 's64': '__s64',
+ }
+ return type_map.get(attr_type)
+
+
+def _nested_attr_sets(family):
+ """Yield (name, attr_set) for non-root attr-sets in spec order.
+
+ The root attr-set (same name as family) contains nest-type attributes
+ that point to the nested sets. Only the nested sets have scalar/array
+ fields that translate to struct members.
+ """
+ root_name = family['name']
+ for name, attr_set in family.attr_sets.items():
+ if name == root_name or attr_set.subset_of:
+ continue
+ yield name, attr_set
+
+
+def render_struct_decl(family, cw):
+ """Generate C struct declarations from nested attribute sets."""
+ for set_name, attr_set in _nested_attr_sets(family):
+ s_name = c_lower(set_name)
+ cw.p(f"struct {s_name} {{")
+ for _, attr in attr_set.items():
+ c_name = c_lower(attr.name)
+ c_type = _struct_c_type(attr['type'])
+ if c_type:
+ cw.p(f"\t{c_type} {c_name};")
+ elif attr['type'] in ('string', 'binary'):
+ maxlen = attr.get('checks', {}).get('max-len', 0)
+ cw.p(f"\tchar {c_name}[{maxlen}];")
+ cw.p(f"\t__u32 {c_name}_len;")
+ cw.p('};')
+ cw.nl()
+
+
+def _nla_get_fn(attr_type):
+ """Return the nla_get function name for a scalar type."""
+ fn_map = {
+ 'u8': 'nla_get_u8', 'u16': 'nla_get_u16',
+ 'u32': 'nla_get_u32', 'u64': 'nla_get_u64',
+ 's8': 'nla_get_s8', 's16': 'nla_get_s16',
+ 's32': 'nla_get_s32', 's64': 'nla_get_s64',
+ }
+ return fn_map.get(attr_type)
+
+
+def _nla_put_fn(attr_type):
+ """Return (function_name, extra_args) for a scalar nla_put."""
+ fn_map = {
+ 'u8': ('nla_put_u8', ''),
+ 'u16': ('nla_put_u16', ''),
+ 'u32': ('nla_put_u32', ''),
+ 'u64': ('nla_put_u64_64bit', ', 0'),
+ 's8': ('nla_put_s8', ''),
+ 's16': ('nla_put_s16', ''),
+ 's32': ('nla_put_s32', ''),
+ 's64': ('nla_put_s64', ''),
+ }
+ return fn_map.get(attr_type)
+
+
+def render_from_attrs(family, cw):
+ """Generate from_attrs() deserialization functions."""
+ root_set = family.attr_sets.get(family['name'])
+
+ for set_name, attr_set in _nested_attr_sets(family):
+ s_name = c_lower(set_name)
+ struct = family.pure_nested_structs.get(set_name)
+ if not struct or not struct.request:
+ continue
+ tla_name = None
+ if root_set:
+ for _, tla_attr in root_set.items():
+ if tla_attr.attr.get('nested-attributes') == set_name:
+ tla_name = tla_attr.enum_name
+ break
+ if tla_name is None:
+ continue
+
+ policy_name = f"{struct.render_name}_nl_policy"
+ max_attr = struct.attr_max_val.enum_name
+ cw.p(f"static int __{s_name}_from_attrs(struct {s_name} *s,")
+ cw.p(f"\t\tstruct nlattr ***ret_nested_attribute_table,")
+ cw.p(f"\t\tstruct genl_info *info)")
+ cw.block_start()
+ cw.p(f"const int maxtype = {max_attr};")
+ cw.p(f"struct nlattr *tla = info->attrs[{tla_name}];")
+ cw.p('struct nlattr **ntb;')
+ cw.p('struct nlattr *nla;')
+ cw.p('int err = 0;')
+ cw.nl()
+ cw.p('if (ret_nested_attribute_table)')
+ cw.p('*ret_nested_attribute_table = NULL;')
+ cw.p('if (!tla)')
+ cw.p('return -ENOMSG;')
+ cw.p(f"ntb = kcalloc({max_attr} + 1, sizeof(*ntb), GFP_KERNEL);")
+ cw.p('if (!ntb)')
+ cw.p('return -ENOMEM;')
+ cw.p(f"err = nla_parse_nested_deprecated(ntb, maxtype, tla, {policy_name}, NULL);")
+ cw.p('if (err)')
+ cw.p('goto out;')
+ cw.nl()
+
+ for _, attr in attr_set.items():
+ c_name = c_lower(attr.name)
+ is_required = attr.attr.get('required', False)
+ get_fn = _nla_get_fn(attr['type'])
+
+ cw.p(f"nla = ntb[{attr.enum_name}];")
+ if is_required:
+ cw.block_start(line='if (nla)')
+ if get_fn:
+ cw.p('if (s)')
+ cw.p(f"s->{c_name} = {get_fn}(nla);")
+ elif attr['type'] == 'string':
+ maxlen = attr.get('checks', {}).get('max-len', 0)
+ cw.p('if (s)')
+ cw.p(f"s->{c_name}_len = nla_strscpy(s->{c_name}, nla, {maxlen});")
+ elif attr['type'] == 'binary':
+ maxlen = attr.get('checks', {}).get('max-len', 0)
+ cw.p('if (s)')
+ cw.p(f"s->{c_name}_len = nla_memcpy(s->{c_name}, nla, {maxlen});")
+ cw.block_end()
+ cw.block_start(line='else')
+ cw.p(f'pr_info("<< missing required attr: {c_name}\\n");')
+ cw.p('err = -ENOMSG;')
+ cw.block_end()
+ else:
+ if get_fn:
+ cw.p('if (nla && s)')
+ cw.p(f"s->{c_name} = {get_fn}(nla);")
+ elif attr['type'] == 'string':
+ maxlen = attr.get('checks', {}).get('max-len', 0)
+ cw.p('if (nla && s)')
+ cw.p(f"s->{c_name}_len = nla_strscpy(s->{c_name}, nla, {maxlen});")
+ elif attr['type'] == 'binary':
+ maxlen = attr.get('checks', {}).get('max-len', 0)
+ cw.p('if (nla && s)')
+ cw.p(f"s->{c_name}_len = nla_memcpy(s->{c_name}, nla, {maxlen});")
+ cw.nl()
+
+ cw.p('out:')
+ cw.p('if (ret_nested_attribute_table && (!err || err == -ENOMSG))')
+ cw.p('*ret_nested_attribute_table = ntb;')
+ cw.p('else')
+ cw.p('kfree(ntb);')
+ cw.p('return err;')
+ cw.block_end()
+ cw.nl()
+
+ cw.p(f"int {s_name}_from_attrs(struct {s_name} *s,")
+ cw.p(f"\t\t\t\tstruct genl_info *info)")
+ cw.block_start()
+ cw.p(f"return __{s_name}_from_attrs(s, NULL, info);")
+ cw.block_end()
+ cw.nl()
+
+ cw.p(f"int {s_name}_ntb_from_attrs(")
+ cw.p(f"\t\t\tstruct nlattr ***ret_nested_attribute_table,")
+ cw.p(f"\t\t\tstruct genl_info *info)")
+ cw.block_start()
+ cw.p(f"return __{s_name}_from_attrs(NULL, ret_nested_attribute_table, info);")
+ cw.block_end()
+ cw.nl()
+
+
+def render_to_skb(family, cw):
+ """Generate to_skb() serialization functions."""
+ root_set = family.attr_sets.get(family['name'])
+
+ for set_name, attr_set in _nested_attr_sets(family):
+ s_name = c_lower(set_name)
+ tla_name = None
+ if root_set:
+ for _, tla_attr in root_set.items():
+ if tla_attr.attr.get('nested-attributes') == set_name:
+ tla_name = tla_attr.enum_name
+ break
+ if tla_name is None:
+ continue
+
+ cw.p(f"int {s_name}_to_skb(struct sk_buff *skb, struct {s_name} *s)")
+ cw.block_start()
+ cw.p(f"struct nlattr *tla = nla_nest_start(skb, {tla_name});")
+ cw.nl()
+ cw.p('if (!tla)')
+ cw.p('goto nla_put_failure;')
+ cw.nl()
+
+ for _, attr in attr_set.items():
+ c_name = c_lower(attr.name)
+ put = _nla_put_fn(attr['type'])
+
+ if put:
+ fn, extra = put
+ cw.p(f"if ({fn}(skb, {attr.enum_name}, s->{c_name}{extra}))")
+ cw.p('goto nla_put_failure;')
+ elif attr['type'] in ('string', 'binary'):
+ maxlen = attr.get('checks', {}).get('max-len', 0)
+ nul_adj = f" + (s->{c_name}_len < {maxlen})" if attr['type'] == 'string' else ''
+ cw.p(f"if (nla_put(skb, {attr.enum_name}, min_t(int, {maxlen},")
+ cw.p(f"\t\ts->{c_name}_len{nul_adj}), s->{c_name}))")
+ cw.p('goto nla_put_failure;', add_ind=1)
+
+ cw.nl()
+ cw.p('nla_nest_end(skb, tla);')
+ cw.p('return 0;')
+ cw.nl()
+ cw.p('nla_put_failure:')
+ cw.p('if (tla)')
+ cw.p('nla_nest_cancel(skb, tla);')
+ cw.p('return -EMSGSIZE;')
+ cw.block_end()
+ cw.nl()
+
+
+def render_set_defaults(family, cw):
+ """Generate set_defaults() initialization functions."""
+ for set_name, attr_set in _nested_attr_sets(family):
+ s_name = c_lower(set_name)
+ has_defaults = any(
+ 'default' in attr.attr for _, attr in attr_set.items()
+ )
+ if not has_defaults:
+ continue
+
+ cw.p(f"void set_{s_name}_defaults(struct {s_name} *x)")
+ cw.block_start()
+ for _, attr in attr_set.items():
+ c_name = c_lower(attr.name)
+ default = attr.attr.get('default')
+ if default is None:
+ continue
+
+ if attr['type'] in ('string', 'binary'):
+ cw.p(f"memset(x->{c_name}, 0, sizeof(x->{c_name}));")
+ cw.p(f"x->{c_name}_len = 0;")
+ else:
+ cw.p(f"x->{c_name} = {default};")
+ cw.block_end()
+ cw.nl()
+
+
def main():
parser = argparse.ArgumentParser(description='Netlink simple parsing generator')
parser.add_argument('--mode', dest='mode', type=str, required=True,
@@ -3487,6 +3737,9 @@ def main():
cw.p('#include <net/genetlink.h>')
cw.nl()
if not args.header:
+ if parsed.kernel_family.get('emit-structs'):
+ cw.p('#include <linux/kernel.h>')
+ cw.p('#include <linux/slab.h>')
if args.out_file:
cw.p(f'#include "{hdr_file}"')
cw.nl()
@@ -3555,6 +3808,31 @@ def main():
print_kernel_op_table_hdr(parsed, cw)
print_kernel_mcgrp_hdr(parsed, cw)
print_kernel_family_struct_hdr(parsed, cw)
+
+ if parsed.kernel_family.get('emit-structs'):
+ cw.nl()
+ render_struct_decl(parsed, cw)
+ # Function prototypes
+ root_set = parsed.attr_sets.get(parsed['name'])
+ for set_name, attr_set in _nested_attr_sets(parsed):
+ s_name = c_lower(set_name)
+ struct = parsed.pure_nested_structs.get(set_name)
+ has_tla = False
+ if root_set:
+ for _, tla_attr in root_set.items():
+ if tla_attr.attr.get('nested-attributes') == set_name:
+ has_tla = True
+ break
+ if not has_tla:
+ continue
+ if struct and struct.request:
+ cw.p(f"int {s_name}_from_attrs(struct {s_name} *s, struct genl_info *info);")
+ cw.p(f"int {s_name}_ntb_from_attrs(struct nlattr ***ret_nested_attribute_table, struct genl_info *info);")
+ cw.p(f"int {s_name}_to_skb(struct sk_buff *skb, struct {s_name} *s);")
+ has_defaults = any('default' in a.attr for _, a in attr_set.items())
+ if has_defaults:
+ cw.p(f"void set_{s_name}_defaults(struct {s_name} *x);")
+ cw.nl()
else:
print_kernel_policy_ranges(parsed, cw)
print_kernel_policy_sparse_enum_validates(parsed, cw)
@@ -3588,6 +3866,15 @@ def main():
print_kernel_mcgrp_src(parsed, cw)
print_kernel_family_struct_src(parsed, cw)
+ if parsed.kernel_family.get('emit-structs'):
+ cw.nl()
+ render_from_attrs(parsed, cw)
+ render_to_skb(parsed, cw)
+ render_set_defaults(parsed, cw)
+ if cw._block_end:
+ cw._block_end = False
+ cw._out.write('}\n')
+
if args.mode == "user":
if args.header:
cw.p('/* Enums */')
--
2.53.0
More information about the drbd-dev
mailing list