File systemtap-module_kallsyms_on_each_symbol-not-ex... of Package systemtap-headers

Overview Repositories Revisions Requests Users Attributes Meta

File systemtap-module_kallsyms_on_each_symbol-not-exported.patch of Package systemtap-headers

From: Tony Jones <tonyj@suse.de>
Subject: fix module_kallsyms_on_each_symbol undefined regression
Date: Tue Jun 18 09:52:15 2024 -0700
Git-commit: 121ad229fb0baa13bed8cdac59b09accfe9ddcfe
References: bsc#1226019

sym.c: fix module_kallsyms_on_each_symbol not exported
    
    module_kallsyms_on_each_symbol has never been exported (as noted by
    33fae2d0107f ("This one seems simply like a non-export").
    
    If kallsyms_on_each_symbol is exported (a revert of upstream in our
    SLES case) then '!defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL_EXPORTED)'
    is false and the local definition of module_kallsyms_on_each_symbol is
    skipped.
    
    This results in:
    ERROR: modpost: "module_kallsyms_on_each_symbol" undefined!
    
    Fixes: 33fae2d0107fb6166b4eac3fdffd277829849ab0
    Signed-off-by: Tony Jones <tonyj@suse.de>

diff --git a/runtime/sym.c b/runtime/sym.c
index 23dd3be30..102257965 100644
--- a/runtime/sym.c
+++ b/runtime/sym.c
@@ -1180,7 +1180,8 @@ unsigned long kallsyms_lookup_name (const char *name)
 }
 #endif
 
-#if defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL) && !defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL_EXPORTED)
+#if defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL)
+#if !defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL_EXPORTED)
 #ifndef KALLSYMS_H_INCLUDED
 #include <linux/kallsyms.h>
 #endif
@@ -1209,11 +1210,12 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,
         _stp_error("BUG: attempting to use unavailable kallsyms_on_each_symbol!!\n");
         return 0;
 }
+#endif // !defined(STAPCONF_KALLSYMS_ON_EACH_SYMBOL_EXPORTED)
 
+// XXX module_kallsyms_on_each_symbol has never been exported
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,12,0)
 typedef typeof(&module_kallsyms_on_each_symbol) module_kallsyms_on_each_symbol_fn;
 
-// XXX Will be linked in place of the kernel's module_kallsyms_on_each_symbol:
 #if defined(STAPCONF_KALLSYMS_6_4)
 int module_kallsyms_on_each_symbol(const char *modname,
                                    int (*fn)(void *, const char *,

Places

File systemtap-module_kallsyms_on_each_symbol-not-exported.patch of Package systemtap-headers

Places