• Jason Baron's avatar
    dyndbg: cleanup dynamic usage in ib_srp.c · 7ce93729
    Jason Baron authored
    Currently, in dynamic_debug.h we only provide
    DEFINE_DYNAMIC_DEBUG_METADATA() and DYNAMIC_DEBUG_BRANCH()
    definitions if CONFIG_DYNAMIC_CORE is enabled. Thus, drivers
    such as infiniband srp (see: drivers/infiniband/ulp/srp/ib_srp.c)
    must provide their own definitions for !CONFIG_DYNAMIC_CORE.
    
    Thus, let's move this !CONFIG_DYNAMIC_CORE case into dynamic_debug.h.
    However, the dynamic debug interfaces should really only be defined
    if CONFIG_DYNAMIC_DEBUG is set or CONFIG_DYNAMIC_CORE is set along
    with DYNAMIC_DEBUG_MODULE, (see:
    Documentation/admin-guide/dynamic-debug-howto.rst). Thus, the
    undefined case becomes: !((CONFIG_DYNAMIC_DEBUG ||
    (CONFIG_DYNAMIC_CORE && DYNAMIC_DEBUG_MODULE)).
    With those changes in place, we can remove the !CONFIG_DYNAMIC_CORE
    case from ib_srp.c
    
    This change was prompted by a build breakeage in ib_srp.c stemming
    from the inclusion of dynamic_debug.h unconditionally in module.h, due
    to commit 7deabd67 ("dyndbg: use the module notifier callbacks").
    In that case, if we have CONFIG_DYNAMIC_CORE=y and
    CONFIG_DYNAMIC_DEBUG=n then the definitions for
    DEFINE_DYNAMIC_DEBUG_METADATA() and DYNAMIC_DEBUG_BRANCH() are defined
    once in ib_srp.c and then again in the dynamic_debug.h. This had been
    working prior to the above referenced commit because dynamic_debug.h
    was only pulled into ib_srp.c conditinally via printk.h if
    CONFIG_DYNAMIC_DEBUG was set.
    
    Also, the exported functions in lib/dynamic_debug.c itself may
    not have a prototype if CONFIG_DYNAMIC_DEBUG=n and
    CONFIG_DYNAMIC_CORE=y. This would trigger the -Wmissing-prototypes
    warning.
    
    The exported functions are behind (include/linux/dynamic_debug.h):
    
    if defined(CONFIG_DYNAMIC_DEBUG) || \
     (defined(CONFIG_DYNAMIC_DEBUG_CORE) && defined(DYNAMIC_DEBUG_MODULE))
    
    Thus, by adding -DDYNAMIC_CONFIG_MODULE to the lib/Makefile we
    can ensure that the exported functions have a prototype in all cases,
    since lib/dynamic_debug.c is built whenever
    CONFIG_DYNAMIC_DEBUG_CORE=y.
    
    Fixes: 7deabd67 ("dyndbg: use the module notifier callbacks")
    Reported-by: default avatarkernel test robot <lkp@intel.com>
    Link: https://lore.kernel.org/oe-kbuild-all/202303071444.sIbZTDCy-lkp@intel.com/Signed-off-by: default avatarJason Baron <jbaron@akamai.com>
    [mcgrof: adjust commit log, and remove urldefense from URL]
    Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
    7ce93729
Makefile 14.7 KB