Commit db4ea3ba authored by Asbjørn Sloth Tønnesen's avatar Asbjørn Sloth Tønnesen Committed by Jakub Kicinski
Browse files

tools: ynl-gen: refactor local vars for .attr_put() callers 



Refactor the generation of local variables needed when building
requests, by moving the logic from put_req_nested() into a new
helper put_local_vars(), and use the helper before .attr_put() is
called, thus generating the local variables assumed by .attr_put().

Previously only put_req_nested() generated the variables assumed
by .attr_put(),  print_req() only generated the count iterator `i`,
and print_dump() neither generated `i` nor `array`.

This patch fixes the build errors below:
$ make -C tools/net/ynl/generated/
[...]
-e      GEN wireguard-user.c
-e      GEN wireguard-user.h
-e      CC wireguard-user.o
wireguard-user.c: In function ‘wireguard_get_device_dump’:
wireguard-user.c:480:9: error: ‘array’ undeclared (first use in func)
  480 |         array = ynl_attr_nest_start(nlh, WGDEVICE_A_PEERS);
      |         ^~~~~
wireguard-user.c:480:9: note: each undeclared identifier is reported
                        only once for each function it appears in
wireguard-user.c:481:14: error: ‘i’ undeclared (first use in func)
  481 |         for (i = 0; i < req->_count.peers; i++)
      |              ^
wireguard-user.c: In function ‘wireguard_set_device’:
wireguard-user.c:533:9: error: ‘array’ undeclared (first use in func)
  533 |         array = ynl_attr_nest_start(nlh, WGDEVICE_A_PEERS);
      |         ^~~~~
make: *** [Makefile:52: wireguard-user.o] Error 1
make: Leaving directory '/usr/src/linux/tools/net/ynl/generated'

Signed-off-by: default avatarAsbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/20250915144301.725949-5-ast@fiberby.net


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

tools/net/ynl/pyynl/ynl_gen_c.py

+19 −13
Original line number Diff line number Diff line
@@ -2040,6 +2040,20 @@ def put_enum_to_str(family, cw, enum): 
    _put_enum_to_str_helper(cw, enum.render_name, map_name, 'value', enum=enum)





def put_local_vars(struct):

    local_vars = []

    has_array = False

    has_count = False

    for _, arg in struct.member_list():

        has_array |= arg.type == 'indexed-array'

        has_count |= arg.presence_type() == 'count'

    if has_array:

        local_vars.append('struct nlattr *array;')

    if has_count:

        local_vars.append('unsigned int i;')

    return local_vars





def put_req_nested_prototype(ri, struct, suffix=';'):

    func_args = ['struct nlmsghdr *nlh',

                 'unsigned int attr_type',
@@ -2062,15 +2076,7 @@ def put_req_nested(ri, struct): 
        init_lines.append(f"hdr = ynl_nlmsg_put_extra_header(nlh, {struct_sz});")

        init_lines.append(f"memcpy(hdr, &obj->_hdr, {struct_sz});")



    has_anest = False

    has_count = False

    for _, arg in struct.member_list():

        has_anest |= arg.type == 'indexed-array'

        has_count |= arg.presence_type() == 'count'

    if has_anest:

        local_vars.append('struct nlattr *array;')

    if has_count:

        local_vars.append('unsigned int i;')

    local_vars += put_local_vars(struct)



    put_req_nested_prototype(ri, struct, suffix='')

    ri.cw.block_start()
@@ -2354,10 +2360,7 @@ def print_req(ri): 
        local_vars += ['size_t hdr_len;',

                       'void *hdr;']



    for _, attr in ri.struct["request"].member_list():

        if attr.presence_type() == 'count':

            local_vars += ['unsigned int i;']

            break

    local_vars += put_local_vars(ri.struct['request'])



    print_prototype(ri, direction, terminate=False)

    ri.cw.block_start()
@@ -2424,6 +2427,9 @@ def print_dump(ri): 
        local_vars += ['size_t hdr_len;',

                       'void *hdr;']



    if 'request' in ri.op[ri.op_mode]:

        local_vars += put_local_vars(ri.struct['request'])



    ri.cw.write_func_lvar(local_vars)



    ri.cw.p('yds.yarg.ys = ys;')