Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL(), faster TRIM_UNUSED_KSYMS
Subsystems (3)
v2 cover Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL(), faster TRIM_UNUSED_KSYMS
This patch set refactors EXPORT_SYMBOL, <linux/export.h> and <asm/export.h>. Also, re-implement TRIM_UNUSED_KSYMS in one-pass.
You can still put EXPORT_SYMBOL() in *.S file, very close to the definition, but you do not need to care about whether it is a function or a data. Remove EXPORT_DATA_SYMBOL().
In v1, I broke ia64 because of missing distinction between functions and data.
V2 handles it correctly.
If the exported symbols is a function, KSYMTAB_FUNC is output. Otherwise, KSYMTAB_DATA is output.
Masahiro Yamada (7):
kbuild: generate KSYMTAB entries by modpost
ia64,export.h: replace EXPORT_DATA_SYMBOL* with EXPORT_SYMBOL*
modpost: merge sym_update_namespace() into sym_add_exported()
modpost: use null string instead of NULL pointer for default namespace
modpost: squash report_sec_mismatch() and remove enum mismatch
kbuild: implement CONFIG_TRIM_UNUSED_KSYMS without recursion
kbuild: move modules.builtin(.modinfo) rules to Makefile.vmlinux_o
.gitignore | 1 - Makefile | 24 +--- arch/ia64/include/asm/Kbuild | 1 + arch/ia64/include/asm/export.h | 3 - arch/ia64/kernel/head.S | 2 +- arch/ia64/kernel/ivt.S | 2 +- include/asm-generic/export.h | 83 +----------- include/linux/export-internal.h | 67 +++++++++- include/linux/export.h | 114 +++------------- kernel/module/internal.h | 1 + kernel/module/main.c | 1 - scripts/Makefile.build | 15 +-- scripts/Makefile.modpost | 8 +- scripts/Makefile.vmlinux_o | 26 +++- scripts/adjust_autoksyms.sh | 73 ---------- scripts/basic/fixdep.c | 3 +- scripts/check-local-export | 4 +- scripts/gen_autoksyms.sh | 62 --------- scripts/gen_ksymdeps.sh | 30 ----- scripts/link-vmlinux.sh | 12 +- scripts/mod/modpost.c | 228 ++++++++++++++++---------------- scripts/mod/modpost.h | 1 + scripts/remove-stale-files | 2 + 23 files changed, 258 insertions(+), 505 deletions(-) delete mode 100644 arch/ia64/include/asm/export.h delete mode 100755 scripts/adjust_autoksyms.sh delete mode 100755 scripts/gen_autoksyms.sh delete mode 100755 scripts/gen_ksymdeps.sh
Signature · 1 line
2.34.1
PATCH v2 1/7 kbuild: generate KSYMTAB entries by modpost
Commit 7b4537199a4a ("kbuild: link symbol CRCs at final link, removing CONFIG_MODULE_REL_CRCS") made modpost output CRCs in the same way whether the EXPORT_SYMBOL() is placed in *.c or *.S.
This commit applies a similar approach to the entire data structure of EXPORT_SYMBOL() for further cleanups. The EXPORT_SYMBOL() compilation is split into two stages.
When a source file is compiled, EXPORT_SYMBOL() is converted into a dummy symbol in the .discard.export_symbol section.
For example,
EXPORT_SYMBOL(foo);
EXPORT_SYMBOL_NS_GPL(bar, BAR_NAMESPACE);will be encoded into the following assembly code:
.section .discard.export_symbol
__export_symbol.foo:
.asciz ""
.previous
.section .discard.export_symbol
__export_symbol_gpl.bar:
.asciz "BAR_NAMESPACE"
.previousThey are just markers to tell modpost the name, license, and namespace of the symbols. They will be dropped from the final vmlinux and modules because the section name starts with ".discard.".
Then, modpost extracts all the information about EXPORT_SYMBOL() from the .discard.export_symbol section, then generates C code:
KSYMTAB_FUNC(foo, "", "");
KSYMTAB_FUNC(bar, "_gpl", "BAR_NAMESPACE");KSYMTAB_FUNC() (or KSYMTAB_DATA() if it is data) is expanded to struct kernel_symbol that will be linked to the vmlinux or a module.
With this change, EXPORT_SYMBOL() works in the same way for *.c and *.S files, providing the following benefits.
[1] Deprecate EXPORT_DATA_SYMBOL()
In the old days, EXPORT_SYMBOL() was only available in C files. To export a symbol in *.S, EXPORT_SYMBOL() was placed in a separate *.c file. arch/arm/kernel/armksyms.c is one example written in the classic manner.
Commit 22823ab419d8 ("EXPORT_SYMBOL() for asm") removed this limitation. Since then, EXPORT_SYMBOL() can be placed close to the symbol definition in *.S files. It was a nice improvement.
However, as that commit mentioned, you need to use EXPORT_DATA_SYMBOL() for data objects on some architectures.
In the new approach, modpost checks symbol's type (STT_FUNC or not), and outputs KSYMTAB_FUNC() or KSYMTAB_DATA() accordingly.
There are only two users of EXPORT_DATA_SYMBOL:
EXPORT_DATA_SYMBOL_GPL(empty_zero_page) (arch/ia64/kernel/head.S)
EXPORT_DATA_SYMBOL(ia64_ivt) (arch/ia64/kernel/ivt.S)
They are transformed as follows and output into .vmlinux.export.c
KSYMTAB_DATA(empty_zero_page, "_gpl", ""); KSYMTAB_DATA(ia64_ivt, "", "");
The other EXPORT_SYMBOL users in ia64 assembly are output as KSYMTAB_FUNC().
EXPORT_DATA_SYMBOL() is now deprecated.
[2] merge <linux/export.h> and <asm-generic/export.h>
There are two similar header implementations:
include/linux/export.h for .c files
include/asm-generic/export.h for .S files
Ideally, the functionality should be consistent between them, but they tend to diverge.
Commit 8651ec01daed ("module: add support for symbol namespaces.") did not support the namespace for *.S files.
This commit shifts the essential implementation part to C, which supports EXPORT_SYMBOL_NS() for *.S files.
<asm/export.h> and <asm-generic/export.h> will remain as a wrapper of <linux/export.h> for a while.
They will be removed after #include <asm/export.h> directives are all replaced with #include <linux/export.h>.
[3] Implement CONFIG_TRIM_UNUSED_KSYMS in one-pass algorithm
When CONFIG_TRIM_UNUSED_KSYMS is enabled, Kbuild recursively traverses the directory tree to determine which EXPORT_SYMBOL to trim. If an EXPORT_SYMBOL turns out to be unused by anyone, Kbuild begins the second traverse, where some source files are recompiled with their EXPORT_SYMBOL() tuned into a no-op.
We can do this better now; modpost can selectively emit KSYMTAB entries that are really referenced by modules.
---
Changes in v2:
- Use KSYMTAB_FUNC and KSYMTAB_DATA for functions and data, respectively This distinction is needed for ia64.
arch/ia64/include/asm/Kbuild | 1 + arch/ia64/include/asm/export.h | 3 - include/asm-generic/export.h | 84 ++-------------------------- include/linux/export-internal.h | 67 ++++++++++++++++++++++- include/linux/export.h | 97 +++++++++++---------------------- kernel/module/internal.h | 1 + kernel/module/main.c | 1 - scripts/Makefile.build | 8 +-- scripts/check-local-export | 4 +- scripts/mod/modpost.c | 81 +++++++++++++++++---------- scripts/mod/modpost.h | 1 + 11 files changed, 164 insertions(+), 184 deletions(-) delete mode 100644 arch/ia64/include/asm/export.h
arch/ia64/include/asm/Kbuild +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 generated-y += syscall_table.h +generic-y += export.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += vtime.h
arch/ia64/include/asm/export.h deleted +0 -3
@@ -1,3 +0,0 @@ -/* EXPORT_DATA_SYMBOL != EXPORT_SYMBOL here */ -#define KSYM_FUNC (name) @fptr(name) -#include <asm-generic/export.h>
include/asm-generic/export.h +5 -79
91 lines not on this page · raw message
include/linux/export-internal.h +66 -1
78 lines not on this page · raw message
include/linux/export.h +32 -65
130 lines not on this page · raw message
kernel/module/internal.h +1 -0
@@ -7,6 +7,7 @@#include <linux/elf.h> #include <linux/compiler.h> +#include <linux/export-internal.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/rculist.h>
kernel/module/main.c +0 -1
@@ -6,7 +6,6 @@#define INCLUDE_VERMAGIC -#include <linux/export.h> #include <linux/extable.h> #include <linux/moduleloader.h> #include <linux/module_signature.h>
scripts/Makefile.build +3 -5
@@ -164,7 +164,7 @@ quiet_cmd_cc_o_c = CC $(quiet_modtag) $@ ifdef CONFIG_MODVERSIONS # When module versioning is enabled the following steps are executed: # o compile a <file>.o from <file>.c -# o if <file>.o doesn't contain a __ksymtab version, i.e. does +# o if <file>.o doesn't contain a __export_symbol*, i.e. does # not export symbols, it's done. # o otherwise, we calculate symbol versions using the good old # genksyms on the preprocessed source and dump them into the .cmd file.
@@ -172,7 +172,7 @@ ifdef CONFIG_MODVERSIONS # be compiled and linked to the kernel and/or modules. gen_symversions = \ - if $(NM) $@ 2>/dev/null | grep -q __ksymtab; then \ + if $(NM) $@ 2>/dev/null | grep -q '__export_symbol.*\.'; then \ $(call cmd_gensymtypes_$(1),$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \ >> $(dot-target).cmd; \ fi
@@ -288,9 +288,7 @@ $(obj)/%.lst: $(src)/%.c FORCE cmd_gensymtypes_S = \ { echo "\#include <linux/kernel.h>" ; \ echo "\#include <asm/asm-prototypes.h>" ; \ - $(CPP) $(a_flags) $< | \ - grep "\<___EXPORT_SYMBOL\>" | \ - sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ; } | \ + $(NM) $@ | sed -n 's/.*__export_symbol.*\.\(.*\)/EXPORT_SYMBOL(\1);/p' ; } | \ $(CPP) -D__GENKSYMS__ $(c_flags) -xc - | $(genksyms) quiet_cmd_cc_symtypes_S = SYM $(quiet_modtag) $@
scripts/check-local-export +2 -2
@@ -45,9 +45,9 @@ BEGIN { { symbol_types[$3]=$2 } # append the exported symbol to the array -($3 ~ /^__ksymtab_/) { +($3 ~ /^__export_symbol.*\..*/) { export_symbols[i] = $3 - sub(/^__ksymtab_/, "", export_symbols[i]) + sub(/^__export_symbol.*\./, "", export_symbols[i]) i++ }
scripts/mod/modpost.c +53 -28
139 lines not on this page · raw message
scripts/mod/modpost.h +1 -0
@@ -137,6 +137,7 @@ struct elf_info {Elf_Shdr *sechdrs;Elf_Sym *symtab_start;Elf_Sym *symtab_stop; +unsigned int export_symbol_sec;/* .discard.export_symbol section */ char *strtab;char *modinfo;unsigned int modinfo_len;
Signature · 1 line
2.34.1
PATCH v2 2/7 ia64,export.h: replace EXPORT_DATA_SYMBOL* with EXPORT_SYMBOL*
In reply to Masahiro YamadaWith the previous refactoring, you can always use EXPORT_SYMBOL*.
Replace two instances in ia64, then remove EXPORT_DATA_SYMBOL*.
---
(no changes since v1)
arch/ia64/kernel/head.S | 2 +- arch/ia64/kernel/ivt.S | 2 +- include/asm-generic/export.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-)
arch/ia64/kernel/head.S +1 -1
@@ -170,7 +170,7 @@ RestRR: \ __PAGE_ALIGNED_DATA .global empty_zero_page -EXPORT_DATA_SYMBOL_GPL(empty_zero_page) +EXPORT_SYMBOL_GPL(empty_zero_page) empty_zero_page: .skip PAGE_SIZE
arch/ia64/kernel/ivt.S +1 -1
@@ -87,7 +87,7 @@ .align 32768 // align on 32KB boundary .global ia64_ivt - EXPORT_DATA_SYMBOL(ia64_ivt) + EXPORT_SYMBOL(ia64_ivt) ia64_ivt: ///////////////////////////////////////////////////////////////////////////////////////// // 0x0000 Entry 0 (size 64 bundles) VHPT Translation (8,20,47)
include/asm-generic/export.h +0 -3
@@ -8,7 +8,4 @@*/ #include <linux/export.h> -#define EXPORT_DATA_SYMBOL (name) EXPORT_SYMBOL(name) -#define EXPORT_DATA_SYMBOL_GPL (name) EXPORT_SYMBOL_GPL(name) -#endif
Signature · 1 line
2.34.1
PATCH v2 3/7 modpost: merge sym_update_namespace() into sym_add_exported()
In reply to Masahiro YamadaPass a set of the name, license, and namespace to sym_add_exported().
sym_update_namespace() is unneeded.
---
(no changes since v1)
scripts/mod/modpost.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-)
scripts/mod/modpost.c +9 -32
@@ -352,26 +352,8 @@ static const char *sec_name(const struct elf_info *info, unsigned int secindex)#define strstarts (str, prefix) (strncmp(str, prefix, strlen(prefix)) = 0) -static void sym_update_namespace (const char *symname,const char *namespace) -{ -struct symbol *s =find_symbol (symname); - -/* -* That symbol should have been created earlier and thus this is -* actually an assertion. -*/ -if (!s) { -error ("Could not update namespace(%s) for symbol %s\n" , - namespace, symname); -return ; - } - -free (s->namespace); - s->namespace = namespace[0 ] ?NOFAIL (strdup (namespace)) :NULL ; -} -static struct symbol *sym_add_exported (const char *name,struct module *mod, -bool gpl_only) +bool gpl_only,const char *namespace) {struct symbol *s =find_symbol (name);
@@ -384,6 +366,7 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod, s =alloc_symbol (name); s->module = mod; s->is_gpl_only = gpl_only; + s->namespace = namespace[0 ] ?NOFAIL (strdup (namespace)) :NULL ;list_add_tail (&s->list, &mod->exported_symbols);hash_add_symbol (s);
@@ -657,17 +640,12 @@ static void handle_symbol(struct module *mod, struct elf_info *info,break ;default :if (sym->st_shndx = info->export_symbol_sec) { -const char *name; - -if (strstarts (symname,"__export_symbol_gpl." )) { - name = symname +strlen ("__export_symbol_gpl." ); -sym_add_exported (name, mod, true); -sym_update_namespace (name,sym_get_data (info, sym)); - }else if (strstarts (symname,"__export_symbol." )) { - name = symname +strlen ("__export_symbol." ); -sym_add_exported (name, mod, false); -sym_update_namespace (name,sym_get_data (info, sym)); - } +if (strstarts (symname,"__export_symbol_gpl." )) +sym_add_exported (symname +strlen ("__export_symbol_gpl." ), + mod, true,sym_get_data (info, sym)); +else if (strstarts (symname,"__export_symbol." )) +sym_add_exported (symname +strlen ("__export_symbol." ), + mod, false,sym_get_data (info, sym));break ; }
@@ -2283,9 +2261,8 @@ static void read_dump(const char *fname) mod =new_module (modname,strlen (modname)); mod->from_dump = true; } - s =sym_add_exported (symname, mod, gpl_only); + s =sym_add_exported (symname, mod, gpl_only, namespace);sym_set_crc (s, crc); -sym_update_namespace (symname, namespace); }free (buf);return ;
Signature · 1 line
2.34.1
PATCH v2 4/7 modpost: use null string instead of NULL pointer for default namespace
In reply to Masahiro YamadaThe default namespace is the null string, "".
When set, the null string "" is converted to NULL:
s->namespace = namespace[0] ? NOFAIL(strdup(namespace)) : NULL;
When printed, the NULL pointer is get back to the null string:
sym->namespace ?: ""
This saves 1 byte memory allocated for "", but loses the readability.
In kernel-space, we strive to save memory, but modpost is a userspace tool used to build the kernel. On modern systems, such small piece of memory is not a big deal.
Handle the namespace string as is.
---
(no changes since v1)
scripts/mod/modpost.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
scripts/mod/modpost.c +11 -6
@@ -297,6 +297,13 @@ static bool contains_namespace(struct list_head *head, const char *namespace) {struct namespace_list *list; +/* +* The default namespace is null string "", which is always implicitly +* contained. +*/ +if (!namespace[0 ]) +return true; +list_for_each_entry (list, head, list) {if (!strcmp (list->namespace, namespace))return true;
@@ -366,7 +373,7 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod, s =alloc_symbol (name); s->module = mod; s->is_gpl_only = gpl_only; - s->namespace = namespace[0 ] ?NOFAIL (strdup (namespace)) :NULL ; + s->namespace =NOFAIL (strdup (namespace));list_add_tail (&s->list, &mod->exported_symbols);hash_add_symbol (s);
@@ -1928,8 +1935,7 @@ static void check_exports(struct module *mod)else basename = mod->name; -if (exp->namespace && - !contains_namespace (&mod->imported_namespaces, exp->namespace)) { +if (!contains_namespace (&mod->imported_namespaces, exp->namespace)) {modpost_log (allow_missing_ns_imports ?LOG_WARN :LOG_ERROR ,"module %s uses symbol %s from namespace %s, but does not import it.\n" , basename, exp->name, exp->namespace);
@@ -2015,8 +2021,7 @@ static void add_exported_symbols(struct buffer *buf, struct module *mod)list_for_each_entry (sym, &mod->exported_symbols, list)buf_printf (buf,"KSYMTAB_%s(%s, \"%s\", \"%s\");\n" , sym->is_func ?"FUNC" :"DATA" , sym->name, - sym->is_gpl_only ?"_gpl" :"" , - sym->namespace ?:"" ); + sym->is_gpl_only ?"_gpl" :"" , sym->namespace);if (!modversions)return ;
@@ -2284,7 +2289,7 @@ static void write_dump(const char *fname)buf_printf (&buf,"0x%08x\t%s\t%s\tEXPORT_SYMBOL%s\t%s\n" , sym->crc, sym->name, mod->name, sym->is_gpl_only ?"_GPL" :"" , - sym->namespace ?:"" ); + sym->namespace); } }write_buf (&buf, fname);
Signature · 1 line
2.34.1
PATCH v2 5/7 modpost: squash report_sec_mismatch() and remove enum mismatch
In reply to Masahiro YamadaNow report_sec_mismatch() prints the same warning message for all possible cases. (fatal() is just a sanity check for unreachable code.)
Squash it into default_mismatch_handler().
enum mismatch is no longer used. Remove it as well.
---
Changes in v2:
- New patch
scripts/mod/modpost.c | 61 +++---------------------------------------- 1 file changed, 4 insertions(+), 57 deletions(-)
scripts/mod/modpost.c +4 -57
@@ -847,18 +847,6 @@ static const char *const linker_symbols[] { "__init_begin", "_sinittext", "_einittext", NULL };static const char *const optim_symbols[] = {"*.constprop.*" ,NULL }; -enum mismatch { -TEXT_TO_ANY_INIT , -DATA_TO_ANY_INIT , -TEXT_TO_ANY_EXIT , -DATA_TO_ANY_EXIT , -XXXINIT_TO_SOME_INIT , -XXXEXIT_TO_SOME_EXIT , -ANY_INIT_TO_ANY_EXIT , -ANY_EXIT_TO_ANY_INIT , -EXTABLE_TO_NON_TEXT , -}; -/** * Describe how to match sections on different criteria: *
@@ -880,7 +868,6 @@ struct sectioncheck {const char *fromsec[20 ];const char *bad_tosec[20 ];const char *good_tosec[20 ]; -enum mismatch mismatch;void (*handler)(const char *modname,struct elf_info *elf,const struct sectioncheck *const mismatch,Elf_Rela *r,Elf_Sym *sym,const char *fromsec);
@@ -899,56 +886,46 @@ static const struct sectioncheck sectioncheck[] = { { .fromsec = { TEXT_SECTIONS, NULL }, .bad_tosec = { ALL_INIT_SECTIONS, NULL }, - .mismatch = TEXT_TO_ANY_INIT, }, { .fromsec = { DATA_SECTIONS, NULL }, .bad_tosec = { ALL_XXXINIT_SECTIONS, NULL }, - .mismatch = DATA_TO_ANY_INIT, }, { .fromsec = { DATA_SECTIONS, NULL }, .bad_tosec = { INIT_SECTIONS, NULL }, - .mismatch = DATA_TO_ANY_INIT, }, { .fromsec = { TEXT_SECTIONS, NULL }, .bad_tosec = { ALL_EXIT_SECTIONS, NULL }, - .mismatch = TEXT_TO_ANY_EXIT, }, { .fromsec = { DATA_SECTIONS, NULL }, .bad_tosec = { ALL_EXIT_SECTIONS, NULL }, - .mismatch = DATA_TO_ANY_EXIT, }, /* Do not reference init code/data from meminit code/data */ { .fromsec = { ALL_XXXINIT_SECTIONS, NULL }, .bad_tosec = { INIT_SECTIONS, NULL }, - .mismatch = XXXINIT_TO_SOME_INIT, }, /* Do not reference exit code/data from memexit code/data */ { .fromsec = { ALL_XXXEXIT_SECTIONS, NULL }, .bad_tosec = { EXIT_SECTIONS, NULL }, - .mismatch = XXXEXIT_TO_SOME_EXIT, }, /* Do not use exit code/data from init code */ { .fromsec = { ALL_INIT_SECTIONS, NULL }, .bad_tosec = { ALL_EXIT_SECTIONS, NULL }, - .mismatch = ANY_INIT_TO_ANY_EXIT, }, /* Do not use init code/data from exit code */ { .fromsec = { ALL_EXIT_SECTIONS, NULL }, .bad_tosec = { ALL_INIT_SECTIONS, NULL }, - .mismatch = ANY_EXIT_TO_ANY_INIT, }, { .fromsec = { ALL_PCI_INIT_SECTIONS, NULL }, .bad_tosec = { INIT_SECTIONS, NULL }, - .mismatch = ANY_INIT_TO_ANY_EXIT, }, { .fromsec = { "__ex_table", NULL },
@@ -957,7 +934,6 @@ static const struct sectioncheck sectioncheck[] = {*/ .bad_tosec = { ".altinstr_replacement", NULL }, .good_tosec = {ALL_TEXT_SECTIONS , NULL}, - .mismatch = EXTABLE_TO_NON_TEXT, .handler = extable_mismatch_handler, } };
@@ -1215,37 +1191,6 @@ static inline void get_pretty_name(int is_func, const char** name, const char** } } -/* -* Print a warning about a section mismatch. -* Try to find symbols near it so user can find it. -* Check whitelist before warning - it may be a false positive. -*/ -static void report_sec_mismatch (const char *modname, -const struct sectioncheck *mismatch, -const char *fromsec, -const char *fromsym, -const char *tosec,const char *tosym) -{ - sec_mismatch_count++; - -switch (mismatch->mismatch) { -case TEXT_TO_ANY_INIT : -case DATA_TO_ANY_INIT : -case TEXT_TO_ANY_EXIT : -case DATA_TO_ANY_EXIT : -case XXXINIT_TO_SOME_INIT : -case XXXEXIT_TO_SOME_EXIT : -case ANY_INIT_TO_ANY_EXIT : -case ANY_EXIT_TO_ANY_INIT : -warn ("%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n" , - modname, fromsym, fromsec, tosym, tosec); -break ; -case EXTABLE_TO_NON_TEXT : -fatal ("There's a special handler for this mismatch type, we should never get here.\n" ); -break ; - } -} -static void default_mismatch_handler (const char *modname,struct elf_info *elf,const struct sectioncheck *const mismatch,Elf_Rela *r,Elf_Sym *sym,const char *fromsec)
@@ -1266,8 +1211,10 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,/* check whitelist - we may ignore it */ if (secref_whitelist (mismatch, fromsec, fromsym, tosec, tosym)) { -report_sec_mismatch (modname, mismatch, - fromsec, fromsym, tosec, tosym); + sec_mismatch_count++; + +warn ("%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n" , + modname, fromsym, fromsec, tosym, tosec); } }
Signature · 1 line
2.34.1
PATCH v2 6/7 kbuild: implement CONFIG_TRIM_UNUSED_KSYMS without recursion
In reply to Masahiro YamadaWhen CONFIG_TRIM_UNUSED_KSYMS is enabled, Kbuild recursively traverses the directory tree to determine which EXPORT_SYMBOL to trim. If an EXPORT_SYMBOL turns out to be unused by anyone, Kbuild begins the second traverse, where some source files are recompiled with their EXPORT_SYMBOL() tuned into a no-op.
Linus stated a negative opinion about this slowness in commits:
- 5cf0fd591f2e ("Kbuild: disable TRIM_UNUSED_KSYMS option")
- a555bdd0c58c ("Kbuild: enable TRIM_UNUSED_KSYMS again, with some guarding")
We can do this better now. The final data structures of EXPORT_SYMBOL are generated by the modpost stage, so modpost can selectively emit KSYMTAB entries that are really referenced by modules.
modpost needs to know all defined symbols in all modules (that is, EXPORT_SYMBOL's that have users). Commit 8da79d44fd2e ("kbuild:
unify two modpost invocations") is a ground-work to do this in one-pass.
Nicolas explained why the trimming was implemented with recursion:
https://lore.kernel.org/all/[email protected]/
Actually, we never achieved that level of optimization where the chain reaction of trimming comes into play because:
- CONFIG_LTO_CLANG cannot remove any unused symbols
- CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is enabled only for vmlinux, but not modules
If deeper trimming is required, we need to revisit this, but that is unlikely to happen.
---
Changes in v2:
- New patch
.gitignore | 1 - Makefile | 24 ++++-------- include/linux/export.h | 41 --------------------- scripts/Makefile.build | 7 ---- scripts/Makefile.modpost | 8 +++- scripts/adjust_autoksyms.sh | 73 ------------------------------------- scripts/basic/fixdep.c | 3 +- scripts/gen_autoksyms.sh | 62 ------------------------------- scripts/gen_ksymdeps.sh | 30 --------------- scripts/link-vmlinux.sh | 5 ++- scripts/mod/modpost.c | 54 ++++++++++++++++++++++++--- scripts/remove-stale-files | 2 + 12 files changed, 70 insertions(+), 240 deletions(-) delete mode 100755 scripts/adjust_autoksyms.sh delete mode 100755 scripts/gen_autoksyms.sh delete mode 100755 scripts/gen_ksymdeps.sh
.gitignore +0 -1
@@ -103,7 +103,6 @@ modules.order # /include/config/ /include/generated/ -/include/ksym/ /arch/*/include/generated/ # stgit generated dirs
Makefile +7 -17
@@ -1120,28 +1120,13 @@ endif export KBUILD_VMLINUX_LIBS export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds -# Recurse until adjust_autoksyms.sh is satisfied -PHONY += autoksyms_recursive ifdef CONFIG_TRIM_UNUSED_KSYMS # For the kernel to actually contain only the needed exported symbols, # we have to build modules as well to determine what those symbols are. # (this can be evaluated only once include/config/auto.conf has been included) KBUILD_MODULES := 1 - -autoksyms_recursive: $(build-dir) modules.order - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \ - "$(MAKE) -f $(srctree)/Makefile autoksyms_recursive" endif -autoksyms_h := $(if $(CONFIG_TRIM_UNUSED_KSYMS), include/generated/autoksyms.h) - -quiet_cmd_autoksyms_h = GEN $@ - cmd_autoksyms_h = mkdir -p $(dir $@); \ - $(CONFIG_SHELL) $(srctree)/scripts/gen_autoksyms.sh $@ - -$(autoksyms_h): - $(call cmd,autoksyms_h) - # '$(AR) mPi' needs 'T' to workaround the bug of llvm-ar <= 14 quiet_cmd_ar_vmlinux.a = AR $@ cmd_ar_vmlinux.a = \
@@ -1153,7 +1138,7 @@ targets += vmlinux.a vmlinux.a: $(KBUILD_VMLINUX_OBJS) scripts/head-object-list.txt FORCE $(call if_changed,ar_vmlinux.a) -vmlinux.o: autoksyms_recursive vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE +vmlinux.o: vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux_o ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
@@ -1168,6 +1153,11 @@ vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) modpost FORCE targets += vmlinux +# When .vmlinux.export.c is updated, vmlinux must be relinked. +# (REVISIT for refactoring) +.vmlinux.export.c: modpost + @: + # The actual objects are generated when descending, # make sure no implicit rule kicks in $(sort $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)): . ;
@@ -1195,7 +1185,7 @@ scripts: scripts_basic scripts_dtc PHONY += prepare archprepare archprepare: outputmakefile archheaders archscripts scripts include/config/kernel.release \ - asm-generic $(version_h) $(autoksyms_h) include/generated/utsrelease.h \ + asm-generic $(version_h) include/generated/utsrelease.h \ include/generated/compile.h include/generated/autoconf.h remove-stale-files prepare0: archprepare
include/linux/export.h +0 -41
47 lines not on this page · raw message
scripts/Makefile.build +0 -7
@@ -218,16 +218,10 @@ is-standard-object = $(if $(filter-out y%, $(OBJECT_FILES_NON_STANDARD_$(basetar $(obj)/%.o: objtool-enabled = $(if $(is-standard-object),$(if $(delay-objtool),$(is-single-obj-m),y)) -ifdef CONFIG_TRIM_UNUSED_KSYMS -cmd_gen_ksymdeps = \ - $(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >> $(dot-target).cmd -endif - cmd_check_local_export = $(srctree)/scripts/check-local-export $@ define rule_cc_o_c $(call cmd_and_fixdep,cc_o_c) - $(call cmd,gen_ksymdeps) $(call cmd,check_local_export) $(call cmd,checksrc) $(call cmd,checkdoc)
@@ -238,7 +232,6 @@ endef define rule_as_o_S $(call cmd_and_fixdep,as_o_S) - $(call cmd,gen_ksymdeps) $(call cmd,check_local_export) $(call cmd,gen_objtooldep) $(call cmd,gen_symversions_S)
scripts/Makefile.modpost +7 -1
@@ -86,6 +86,12 @@ output-symdump := $(if $(vmlinux.o-if-present), Module.symvers, modules-only.sym missing-input := $(filter-out $(vmlinux.o-if-present),vmlinux.o) endif +ifdef CONFIG_TRIM_UNUSED_KSYMS +ksym-wl := $(CONFIG_UNUSED_KSYMS_WHITELIST) +ksym-wl := $(if $(filter-out /%, $(ksym-wl)),$(srctree)/)$(ksym-wl) +modpost-args += -t $(addprefix -W, $(ksym-wl)) +endif + else # set src + obj - they may be used in the modules's Makefile
@@ -122,7 +128,7 @@ quiet_cmd_modpost = MODPOST $@ sed 's/ko$$/o/' $(or $(modorder-if-needed), /dev/null) | $(MODPOST) $(modpost-args) $(vmlinux.o-if-present) -T - targets += $(output-symdump) -$(output-symdump): $(modorder-if-needed) $(vmlinux.o-if-present) $(moudle.symvers-if-present) $(MODPOST) FORCE +$(output-symdump): $(modorder-if-needed) $(vmlinux.o-if-present) $(moudle.symvers-if-present) $(MODPOST) $(ksym-wl) FORCE $(call if_changed,modpost) __modpost: $(output-symdump)
scripts/adjust_autoksyms.sh deleted +0 -73
73 lines not on this page · raw message
scripts/basic/fixdep.c +1 -2
@@ -243,8 +243,7 @@ static void *read_file(const char *filename)/* Ignore certain dependencies */ static int is_ignored_file (const char *s,int len) { -return str_ends_with (s, len,"include/generated/autoconf.h" ) || -str_ends_with (s, len,"include/generated/autoksyms.h" ); +return str_ends_with (s, len,"include/generated/autoconf.h" ); }/*
scripts/gen_autoksyms.sh deleted +0 -60
60 lines not on this page · raw message
scripts/gen_ksymdeps.sh deleted +0 -30
@@ -1,30 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -set -e - -# List of exported symbols -# -# If the object has no symbol, $NM warns 'no symbols'. -# Suppress the stderr. -# TODO: -# Use -q instead of 2>/dev/null when we upgrade the minimum version of -# binutils to 2.37, llvm to 13.0.0. -ksyms=$($NM $1 2>/dev/null | sed -n 's/.*__ksym_marker_\(.*\)/\1/p') - -if [ -z "$ksyms" ]; then - exit 0 -fi - -echo -echo "ksymdeps_$1 := \\" - -for s in $ksyms -do - printf ' $(wildcard include/ksym/%s) \\\n' "$s" -done - -echo -echo "$1: \$(ksymdeps_$1)" -echo -echo "\$(ksymdeps_$1):"
scripts/link-vmlinux.sh +4 -1
@@ -305,4 +305,7 @@ if is_enabled CONFIG_KALLSYMS; then fi # For fixdep -echo "vmlinux: $0" > .vmlinux.d +echo "vmlinux: $0 \\" > .vmlinux.d +if is_enabled CONFIG_MODULES; then + echo .vmlinux.export.c >> .vmlinux.d +fi
scripts/mod/modpost.c +49 -5
122 lines not on this page · raw message
scripts/remove-stale-files +2 -0
@@ -47,3 +47,5 @@ rm -f arch/riscv/purgatory/kexec-purgatory.c rm -f scripts/extract-cert rm -f arch/x86/purgatory/kexec-purgatory.c + +rm -rf include/ksym
Signature · 1 line
2.34.1
PATCH v2 7/7 kbuild: move modules.builtin(.modinfo) rules to Makefile.vmlinux_o
In reply to Masahiro YamadaDo not build modules.builtin(.modinfo) as a side-effect of vmlinux.
There are no good reason to rebuild them just because vmlinux's prerequistes (vmlinux.lds, .vmlinux.export.c, etc.) have been updated.
---
Changes in v2:
- New patch
scripts/Makefile.vmlinux_o | 26 +++++++++++++++++++++++++- scripts/link-vmlinux.sh | 7 ------- 2 files changed, 25 insertions(+), 8 deletions(-)
scripts/Makefile.vmlinux_o +25 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only PHONY := __default -__default: vmlinux.o +__default: vmlinux.o modules.builtin include include/config/auto.conf include $(srctree)/scripts/Kbuild.include
@@ -62,6 +62,30 @@ vmlinux.o: $(initcalls-lds) vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE targets += vmlinux.o +# module.builtin.modinfo +# --------------------------------------------------------------------------- + +OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary + +targets += modules.builtin.modinfo +modules.builtin.modinfo: vmlinux.o FORCE + $(call if_changed,objcopy) + +# module.builtin +# --------------------------------------------------------------------------- + +# The second line aids cases where multiple modules share the same object. + +quiet_cmd_modules_builtin = GEN $@ + cmd_modules_builtin = \ + tr '\0' '\n' < $< | \ + sed -n 's/^[[:alnum:]:_]*\.file=//p' | \ + tr ' ' '\n' | uniq | sed -e 's:^:kernel/:' -e 's/$$/.ko/' > $@ + +targets += modules.builtin +modules.builtin: modules.builtin.modinfo FORCE + $(call if_changed,modules_builtin) + # Add FORCE to the prequisites of a target to force it to be always rebuilt. # ---------------------------------------------------------------------------
scripts/link-vmlinux.sh +0 -7
@@ -214,13 +214,6 @@ if [ "$1" = "clean" ]; then exit 0 fi -info MODINFO modules.builtin.modinfo -${OBJCOPY} -j .modinfo -O binary vmlinux.o modules.builtin.modinfo -info GEN modules.builtin -# The second line aids cases where multiple modules share the same object. -tr '\0' '\n' < modules.builtin.modinfo | sed -n 's/^[[:alnum:]:_]*\.file=//p' | - tr ' ' '\n' | uniq | sed -e 's:^:kernel/:' -e 's/$/.ko/' > modules.builtin - if is_enabled CONFIG_MODULES; then ${MAKE} -f "${srctree}/scripts/Makefile.vmlinux" .vmlinux.export.o fi
Signature · 1 line
2.34.1