From: tonyj@suse.de
To: systemtap@sourceware.org
Cc: mcermak@redhat.com, wcohen@redhat.com
Subject: [PATCH] sym.c: fix module_kallsyms_on_each_symbol not exported
Date: Tue, 18 Jun 2024 09:52:15 -0700 [thread overview]
Message-ID: <ZnG7P64kLXfETa3s@suse.de> (raw)
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 *,
next reply other threads:[~2024-06-18 16:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-18 16:52 tonyj [this message]
2024-06-20 1:37 ` William Cohen
2024-06-20 18:32 ` tonyj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZnG7P64kLXfETa3s@suse.de \
--to=tonyj@suse.de \
--cc=mcermak@redhat.com \
--cc=systemtap@sourceware.org \
--cc=wcohen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).