Moving find_kallsyms_symbol_value from kernel/module/internal.h to include/linux/module.h. The reason is that internal.h is not prepared to be included when CONFIG_MODULES=n. find_kallsyms_symbol_value is used by kernel/bpf/verifier.c and including internal.h from it (without modules) leads into a compilation error: In file included from ../include/linux/container_of.h:5, from ../include/linux/list.h:5, from ../include/linux/timer.h:5, from ../include/linux/workqueue.h:9, from ../include/linux/bpf.h:10, from ../include/linux/bpf-cgroup.h:5, from ../kernel/bpf/verifier.c:7: ../kernel/bpf/../module/internal.h: In function 'mod_find': ../include/linux/container_of.h:20:54: error: invalid use of undefined type 'struct module' 20 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \ | ^~ [...] This patch fixes the above error.
Unified · Split
| @@ -616,6 +616,8 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, · 615 unmodified lines | ||
| 616 | 616 | /* Look for this name: can be of form module:name. */ |
| 617 | 617 | unsigned long module_kallsyms_lookup_name(const char *name); |
| 618 | 618 | |
| 619 | +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name); | |
| 620 | + | |
| 619 | 621 | extern void __noreturn __module_put_and_kthread_exit(struct module *mod, |
| 620 | 622 | long code); |
| 621 | 623 | #define module_put_and_kthread_exit(code) __module_put_and_kthread_exit(THIS_MODULE, code) |
| @@ -796,6 +798,12 @@ static inline unsigned long module_kallsyms_lookup_name(const char *name) · 174 unmodified lines | ||
| 796 | 798 | return 0; |
| 797 | 799 | } |
| 798 | 800 | |
| 801 | +static inline unsigned long find_kallsyms_symbol_value(struct module *mod, | |
| 802 | + const char *name) | |
| 803 | +{ | |
| 804 | + return 0; | |
| 805 | +} | |
| 806 | + | |
| 799 | 807 | static inline int register_module_notifier(struct notifier_block *nb) |
| 800 | 808 | { |
| 801 | 809 | /* no events will happen anyway, so this can always succeed */ |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/bpf_lsm.h> |
| 25 | 25 | #include <linux/btf_ids.h> |
| 26 | 26 | #include <linux/poison.h> |
| 27 | −#include "../module/internal.h" | |
| 27 | +#include <linux/module.h> | |
| 28 | 28 | |
| 29 | 29 | #include "disasm.h" |
| 30 | 30 | |
| @@ -246,7 +246,6 @@ static inline void kmemleak_load_module(const struct module *mod, · 245 unmodified lines | ||
| 246 | 246 | void init_build_id(struct module *mod, const struct load_info *info); |
| 247 | 247 | void layout_symtab(struct module *mod, struct load_info *info); |
| 248 | 248 | void add_kallsyms(struct module *mod, const struct load_info *info); |
| 249 | −unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name); | |
| 250 | 249 | |
| 251 | 250 | static inline bool sect_empty(const Elf_Shdr *sect) |
| 252 | 251 | { |
| @@ -256,11 +255,6 @@ static inline bool sect_empty(const Elf_Shdr *sect) · 3 unmodified lines | ||
| 256 | 255 | static inline void init_build_id(struct module *mod, const struct load_info *info) { } |
| 257 | 256 | static inline void layout_symtab(struct module *mod, struct load_info *info) { } |
| 258 | 257 | static inline void add_kallsyms(struct module *mod, const struct load_info *info) { } |
| 259 | −static inline unsigned long find_kallsyms_symbol_value(struct module *mod, | |
| 260 | − const char *name) | |
| 261 | −{ | |
| 262 | − return 0; | |
| 263 | −} | |
| 264 | 258 | #endif /* CONFIG_KALLSYMS */ |
| 265 | 259 | |
| 266 | 260 | #ifdef CONFIG_SYSFS |