module: trivial cleanups for symbol search
v2 cover module: trivial cleanups for symbol search
V2: rebase on module-next.
Masahiro Yamada (3):
module: do not pass opaque pointer for symbol search
module: do not binary-search in __ksymtab_gpl if fsa->gplok is false
module: merge check_exported_symbol() into
find_exported_symbol_in_section()
kernel/module/main.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-)
Signature · 1 line
2.32.0
PATCH v2 1/3 module: do not pass opaque pointer for symbol search
There is no need to use an opaque pointer for check_exported_symbol() or find_exported_symbol_in_section.
Pass (struct find_symbol_arg *) explicitly.
---
kernel/module/main.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
kernel/module/main.c +4 -7
@@ -244,11 +244,9 @@ static __maybe_unused void *any_section_objs(const struct load_info *info,#endif static bool check_exported_symbol (const struct symsearch *syms, -struct module *owner, -unsigned int symnum,void *data) +struct module *owner,unsigned int symnum, +struct find_symbol_arg *fsa) { -struct find_symbol_arg *fsa = data; -if (!fsa->gplok && syms->license ==GPL_ONLY )return false; fsa->owner = owner;
@@ -285,16 +283,15 @@ int cmp_name(const void *name, const void *sym)static bool find_exported_symbol_in_section (const struct symsearch *syms,struct module *owner, -void *data) +struct find_symbol_arg *fsa) { -struct find_symbol_arg *fsa = data;struct kernel_symbol *sym; sym =bsearch (fsa->name, syms->start, syms->stop - syms->start,sizeof (struct kernel_symbol ), cmp_name);if (sym !=NULL &&check_exported_symbol (syms, owner, - sym - syms->start, data)) + sym - syms->start, fsa))return true;return false;
Signature · 1 line
2.32.0
PATCH v2 2/3 module: do not binary-search in __ksymtab_gpl if fsa->gplok is false
In reply to Masahiro YamadaCurrently, !fsa->gplok && syms->license == GPL_ONLY) is checked after bsearch() succeeds.
It is meaningless to do the binary search in the GPL symbol table when fsa->gplok is false because we know find_exported_symbol_in_section() will fail anyway.
This check should be done before bsearch().
---
kernel/module/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/module/main.c +3 -2
@@ -247,8 +247,6 @@ static bool check_exported_symbol(const struct symsearch *syms, struct module *owner, unsigned int symnum, struct find_symbol_arg *fsa) { - if (!fsa->gplok && syms->license == GPL_ONLY) - return false; fsa->owner = owner; fsa->crc =symversion (syms->crcs, symnum); fsa->sym = &syms->start[symnum];
@@ -287,6 +285,9 @@ static bool find_exported_symbol_in_section(const struct symsearch *syms, {struct kernel_symbol *sym; +if (!fsa->gplok && syms->license ==GPL_ONLY ) +return false; + sym =bsearch (fsa->name, syms->start, syms->stop - syms->start,sizeof (struct kernel_symbol ), cmp_name);
Signature · 1 line
2.32.0
PATCH v2 3/3 module: merge check_exported_symbol() into find_exported_symbol_in_section()
In reply to Masahiro YamadaNow check_exported_symbol() always succeeds.
Merge it into find_exported_symbol_in_search() to make the code concise.
---
kernel/module/main.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
kernel/module/main.c +7 -15
@@ -243,17 +243,6 @@ static __maybe_unused void *any_section_objs(const struct load_info *info,#define symversion (base, idx) ((base != NULL) ? ((base) + (idx)) : NULL)#endif -static bool check_exported_symbol (const struct symsearch *syms, -struct module *owner,unsigned int symnum, -struct find_symbol_arg *fsa) -{ - fsa->owner = owner; - fsa->crc =symversion (syms->crcs, symnum); - fsa->sym = &syms->start[symnum]; - fsa->license = syms->license; -return true; -} -static const char *kernel_symbol_name (const struct kernel_symbol *sym) {#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
@@ -290,12 +279,15 @@ static bool find_exported_symbol_in_section(const struct symsearch *syms, sym =bsearch (fsa->name, syms->start, syms->stop - syms->start,sizeof (struct kernel_symbol ), cmp_name); +if (!sym) +return false; -if (sym !=NULL &&check_exported_symbol (syms, owner, - sym - syms->start, fsa)) -return true; + fsa->owner = owner; + fsa->crc =symversion (syms->crcs, sym - syms->start); + fsa->sym = sym; + fsa->license = syms->license; -return false; +return true; }/*
Signature · 1 line
2.32.0
Luis Chamberlain
maintainerQuoted 1 line · Masahiro Yamada
V2: rebase on module-next.
Thanks! Pushed onto modules-testing, if there are no issues reported I'll move to modules-next.
Luis