• Andrii Nakryiko's avatar
    libbpf: better fix for handling nulled-out struct_ops program · 0737df6d
    Andrii Nakryiko authored
    Previous attempt to fix the handling of nulled-out (from skeleton)
    struct_ops program is working well only if struct_ops program is defined
    as non-autoloaded by default (i.e., has SEC("?struct_ops") annotation,
    with question mark).
    
    Unfortunately, that fix is incomplete due to how
    bpf_object_adjust_struct_ops_autoload() is marking referenced or
    non-referenced struct_ops program as autoloaded (or not). Because
    bpf_object_adjust_struct_ops_autoload() is run after
    bpf_map__init_kern_struct_ops() step, which sets program slot to NULL,
    such programs won't be considered "referenced", and so its autoload
    property won't be changed.
    
    This all sounds convoluted and it is, but the desire is to have as
    natural behavior (as far as struct_ops usage is concerned) as possible.
    
    This fix is redoing the original fix but makes it work for
    autoloaded-by-default struct_ops programs as well. We achieve this by
    forcing prog->autoload to false if prog was declaratively set for some
    struct_ops map, but then nulled-out from skeleton (programmatically).
    This achieves desired effect of not autoloading it. If such program is
    still referenced somewhere else (different struct_ops map or different
    callback field), it will get its autoload property adjusted by
    bpf_object_adjust_struct_ops_autoload() later.
    
    We also fix selftest, which accidentally used SEC("?struct_ops")
    annotation. It was meant to use autoload-by-default program from the
    very beginning.
    
    Fixes: f973fccd ("libbpf: handle nulled-out program in struct_ops correctly")
    Cc: Kui-Feng Lee <thinker.li@gmail.com>
    Cc: Eduard Zingerman <eddyz87@gmail.com>
    Cc: Martin KaFai Lau <martin.lau@kernel.org>
    Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
    Link: https://lore.kernel.org/r/20240501041706.3712608-1-andrii@kernel.orgSigned-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
    0737df6d
struct_ops_module.c 1.75 KB