Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
tools: ynl: use ident name for Family, too.
This allow consistent naming convention between Family and others
element's name.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Link: https://patch.msgid.link/9bbcab3094970b371bd47aa18481ae6ca5a93687.1719930479.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
authored by
Paolo Abeni
and committed by
Jakub Kicinski
8c5a9f29
cda91d5b
+26
-26
+26
-26
tools/net/ynl/ynl-gen-c.py
+26
-26
tools/net/ynl/ynl-gen-c.py
···
59
59
if 'nested-attributes' in attr:
60
60
self.nested_attrs = attr['nested-attributes']
61
61
if self.nested_attrs == family.name:
62
-
self.nested_render_name = c_lower(f"{family.name}")
62
+
self.nested_render_name = c_lower(f"{family.ident_name}")
63
63
else:
64
-
self.nested_render_name = c_lower(f"{family.name}_{self.nested_attrs}")
64
+
self.nested_render_name = c_lower(f"{family.ident_name}_{self.nested_attrs}")
65
65
66
66
if self.nested_attrs in self.family.consts:
67
67
self.nested_struct_type = 'struct ' + self.nested_render_name + '_'
···
693
693
694
694
self.nested = type_list is None
695
695
if family.name == c_lower(space_name):
696
-
self.render_name = c_lower(family.name)
696
+
self.render_name = c_lower(family.ident_name)
697
697
else:
698
-
self.render_name = c_lower(family.name + '-' + space_name)
698
+
self.render_name = c_lower(family.ident_name + '-' + space_name)
699
699
self.struct_name = 'struct ' + self.render_name
700
700
if self.nested and space_name in family.consts:
701
701
self.struct_name += '_'
···
761
761
762
762
class EnumSet(SpecEnumSet):
763
763
def __init__(self, family, yaml):
764
-
self.render_name = c_lower(family.name + '-' + yaml['name'])
764
+
self.render_name = c_lower(family.ident_name + '-' + yaml['name'])
765
765
766
766
if 'enum-name' in yaml:
767
767
if yaml['enum-name']:
···
777
777
else:
778
778
self.user_type = 'int'
779
779
780
-
self.value_pfx = yaml.get('name-prefix', f"{family.name}-{yaml['name']}-")
780
+
self.value_pfx = yaml.get('name-prefix', f"{family.ident_name}-{yaml['name']}-")
781
781
782
782
super().__init__(family, yaml)
783
783
···
802
802
if 'name-prefix' in yaml:
803
803
pfx = yaml['name-prefix']
804
804
elif self.name == family.name:
805
-
pfx = family.name + '-a-'
805
+
pfx = family.ident_name + '-a-'
806
806
else:
807
-
pfx = f"{family.name}-a-{self.name}-"
807
+
pfx = f"{family.ident_name}-a-{self.name}-"
808
808
self.name_prefix = c_upper(pfx)
809
809
self.max_name = c_upper(self.yaml.get('attr-max-name', f"{self.name_prefix}max"))
810
810
self.cnt_name = c_upper(self.yaml.get('attr-cnt-name', f"__{self.name_prefix}max"))
···
861
861
def __init__(self, family, yaml, req_value, rsp_value):
862
862
super().__init__(family, yaml, req_value, rsp_value)
863
863
864
-
self.render_name = c_lower(family.name + '_' + self.name)
864
+
self.render_name = c_lower(family.ident_name + '_' + self.name)
865
865
866
866
self.dual_policy = ('do' in yaml and 'request' in yaml['do']) and \
867
867
('dump' in yaml and 'request' in yaml['dump'])
···
911
911
if 'uapi-header' in self.yaml:
912
912
self.uapi_header = self.yaml['uapi-header']
913
913
else:
914
-
self.uapi_header = f"linux/{self.name}.h"
914
+
self.uapi_header = f"linux/{self.ident_name}.h"
915
915
if self.uapi_header.startswith("linux/") and self.uapi_header.endswith('.h'):
916
916
self.uapi_header_name = self.uapi_header[6:-2]
917
917
else:
918
-
self.uapi_header_name = self.name
918
+
self.uapi_header_name = self.ident_name
919
919
920
920
def resolve(self):
921
921
self.resolve_up(super())
···
923
923
if self.yaml.get('protocol', 'genetlink') not in {'genetlink', 'genetlink-c', 'genetlink-legacy'}:
924
924
raise Exception("Codegen only supported for genetlink")
925
925
926
-
self.c_name = c_lower(self.name)
926
+
self.c_name = c_lower(self.ident_name)
927
927
if 'name-prefix' in self.yaml['operations']:
928
928
self.op_prefix = c_upper(self.yaml['operations']['name-prefix'])
929
929
else:
···
2173
2173
exported = not kernel_can_gen_family_struct(family)
2174
2174
2175
2175
if not terminate or exported:
2176
-
cw.p(f"/* Ops table for {family.name} */")
2176
+
cw.p(f"/* Ops table for {family.ident_name} */")
2177
2177
2178
2178
pol_to_struct = {'global': 'genl_small_ops',
2179
2179
'per-op': 'genl_ops',
···
2225
2225
continue
2226
2226
2227
2227
if 'do' in op:
2228
-
name = c_lower(f"{family.name}-nl-{op_name}-doit")
2228
+
name = c_lower(f"{family.ident_name}-nl-{op_name}-doit")
2229
2229
cw.write_func_prot('int', name,
2230
2230
['struct sk_buff *skb', 'struct genl_info *info'], suffix=';')
2231
2231
2232
2232
if 'dump' in op:
2233
-
name = c_lower(f"{family.name}-nl-{op_name}-dumpit")
2233
+
name = c_lower(f"{family.ident_name}-nl-{op_name}-dumpit")
2234
2234
cw.write_func_prot('int', name,
2235
2235
['struct sk_buff *skb', 'struct netlink_callback *cb'], suffix=';')
2236
2236
cw.nl()
···
2256
2256
for x in op['dont-validate']])), )
2257
2257
for op_mode in ['do', 'dump']:
2258
2258
if op_mode in op:
2259
-
name = c_lower(f"{family.name}-nl-{op_name}-{op_mode}it")
2259
+
name = c_lower(f"{family.ident_name}-nl-{op_name}-{op_mode}it")
2260
2260
members.append((op_mode + 'it', name))
2261
2261
if family.kernel_policy == 'per-op':
2262
2262
struct = Struct(family, op['attribute-set'],
2263
2263
type_list=op['do']['request']['attributes'])
2264
2264
2265
-
name = c_lower(f"{family.name}-{op_name}-nl-policy")
2265
+
name = c_lower(f"{family.ident_name}-{op_name}-nl-policy")
2266
2266
members.append(('policy', name))
2267
2267
members.append(('maxattr', struct.attr_max_val.enum_name))
2268
2268
if 'flags' in op:
···
2294
2294
members.append(('validate',
2295
2295
' | '.join([c_upper('genl-dont-validate-' + x)
2296
2296
for x in dont_validate])), )
2297
-
name = c_lower(f"{family.name}-nl-{op_name}-{op_mode}it")
2297
+
name = c_lower(f"{family.ident_name}-nl-{op_name}-{op_mode}it")
2298
2298
if 'pre' in op[op_mode]:
2299
2299
members.append((cb_names[op_mode]['pre'], c_lower(op[op_mode]['pre'])))
2300
2300
members.append((op_mode + 'it', name))
···
2305
2305
type_list=op[op_mode]['request']['attributes'])
2306
2306
2307
2307
if op.dual_policy:
2308
-
name = c_lower(f"{family.name}-{op_name}-{op_mode}-nl-policy")
2308
+
name = c_lower(f"{family.ident_name}-{op_name}-{op_mode}-nl-policy")
2309
2309
else:
2310
-
name = c_lower(f"{family.name}-{op_name}-nl-policy")
2310
+
name = c_lower(f"{family.ident_name}-{op_name}-nl-policy")
2311
2311
members.append(('policy', name))
2312
2312
members.append(('maxattr', struct.attr_max_val.enum_name))
2313
2313
flags = (op['flags'] if 'flags' in op else []) + ['cmd-cap-' + op_mode]
···
2326
2326
2327
2327
cw.block_start('enum')
2328
2328
for grp in family.mcgrps['list']:
2329
-
grp_id = c_upper(f"{family.name}-nlgrp-{grp['name']},")
2329
+
grp_id = c_upper(f"{family.ident_name}-nlgrp-{grp['name']},")
2330
2330
cw.p(grp_id)
2331
2331
cw.block_end(';')
2332
2332
cw.nl()
···
2339
2339
cw.block_start('static const struct genl_multicast_group ' + family.c_name + '_nl_mcgrps[] =')
2340
2340
for grp in family.mcgrps['list']:
2341
2341
name = grp['name']
2342
-
grp_id = c_upper(f"{family.name}-nlgrp-{name}")
2342
+
grp_id = c_upper(f"{family.ident_name}-nlgrp-{name}")
2343
2343
cw.p('[' + grp_id + '] = { "' + name + '", },')
2344
2344
cw.block_end(';')
2345
2345
cw.nl()
···
2361
2361
if not kernel_can_gen_family_struct(family):
2362
2362
return
2363
2363
2364
-
cw.block_start(f"struct genl_family {family.name}_nl_family __ro_after_init =")
2364
+
cw.block_start(f"struct genl_family {family.ident_name}_nl_family __ro_after_init =")
2365
2365
cw.p('.name\t\t= ' + family.fam_key + ',')
2366
2366
cw.p('.version\t= ' + family.ver_key + ',')
2367
2367
cw.p('.netnsok\t= true,')
···
2429
2429
cw.p(' */')
2430
2430
2431
2431
uapi_enum_start(family, cw, const, 'name')
2432
-
name_pfx = const.get('name-prefix', f"{family.name}-{const['name']}-")
2432
+
name_pfx = const.get('name-prefix', f"{family.ident_name}-{const['name']}-")
2433
2433
for entry in enum.entries.values():
2434
2434
suffix = ','
2435
2435
if entry.value_change:
···
2451
2451
cw.nl()
2452
2452
elif const['type'] == 'const':
2453
2453
defines.append([c_upper(family.get('c-define-name',
2454
-
f"{family.name}-{const['name']}")),
2454
+
f"{family.ident_name}-{const['name']}")),
2455
2455
const['value']])
2456
2456
2457
2457
if defines:
···
2529
2529
defines = []
2530
2530
for grp in family.mcgrps['list']:
2531
2531
name = grp['name']
2532
-
defines.append([c_upper(grp.get('c-define-name', f"{family.name}-mcgrp-{name}")),
2532
+
defines.append([c_upper(grp.get('c-define-name', f"{family.ident_name}-mcgrp-{name}")),
2533
2533
f'{name}'])
2534
2534
cw.nl()
2535
2535
if defines: