modpost: remove useless export_from_sec()
PATCH 1/2 modpost: remove useless export_from_sec()
With commit 1743694eb235 ("modpost: stop symbol preloading for modversion CRC") applied, now export_from_sec() is useless.
handle_symbol() is called for every symbol in the ELF.
When 'symname' does not start with "__ksymtab", export_from_sec() is called, and the returned value is stored in 'export'.
It is used in the last part of handle_symbol():
if (strstarts(symname, "__ksymtab_")) {
name = symname + strlen("__ksymtab_");
sym_add_exported(name, mod, export);
}'export' is used only when 'symname' starts with "__ksymtab_".
So, the value returned by export_from_sec() is never used.
Remove this useless function. This makes further cleanups possible.
---
scripts/mod/modpost.c | 17 +---------------- scripts/mod/modpost.h | 4 ---- 2 files changed, 1 insertion(+), 20 deletions(-)
scripts/mod/modpost.c +1 -16
@@ -369,16 +369,6 @@ static enum export export_from_secname(struct elf_info *elf, unsigned int sec)return export_unknown; } -static enum export export_from_sec (struct elf_info *elf,unsigned int sec) -{ -if (sec == elf->export_sec) -return export_plain; -else if (sec == elf->export_gpl_sec) -return export_gpl; -else -return export_unknown; -} -static const char *namespace_from_kstrtabns (const struct elf_info *info,const Elf_Sym *sym) {
@@ -576,10 +566,7 @@ static int parse_elf(struct elf_info *info, const char *filename)fatal ("%s has NOBITS .modinfo\n" , filename); info->modinfo = (void *)hdr + sechdrs[i].sh_offset; info->modinfo_len = sechdrs[i].sh_size; - }else if (strcmp (secname,"__ksymtab" ) ==0 ) - info->export_sec = i; -else if (strcmp (secname,"__ksymtab_gpl" ) ==0 ) - info->export_gpl_sec = i; + }if (sechdrs[i].sh_type ==SHT_SYMTAB ) {unsigned int sh_link_idx;
@@ -702,8 +689,6 @@ static void handle_symbol(struct module *mod, struct elf_info *info,if (strstarts (symname,"__ksymtab" )) export =export_from_secname (info,get_secindex (info, sym)); -else - export =export_from_sec (info,get_secindex (info, sym));switch (sym->st_shndx) {case SHN_COMMON :
scripts/mod/modpost.h +0 -4
@@ -25,7 +25,6 @@#define Elf_Sym Elf32_Sym#define Elf_Addr Elf32_Addr#define Elf_Sword Elf64_Sword -#define Elf_Section Elf32_Half#define ELF_ST_BIND ELF32_ST_BIND#define ELF_ST_TYPE ELF32_ST_TYPE
@@ -40,7 +39,6 @@#define Elf_Sym Elf64_Sym#define Elf_Addr Elf64_Addr#define Elf_Sword Elf64_Sxword -#define Elf_Section Elf64_Half#define ELF_ST_BIND ELF64_ST_BIND#define ELF_ST_TYPE ELF64_ST_TYPE
@@ -138,8 +136,6 @@ struct elf_info {Elf_Shdr *sechdrs;Elf_Sym *symtab_start;Elf_Sym *symtab_stop; -Elf_Section export_sec; -Elf_Section export_gpl_sec;char *strtab;char *modinfo;unsigned int modinfo_len;
Signature · 1 line
2.32.0
PATCH 2/2 modpost: move export_from_secname() call to more relevant place
The value returned by export_from_secname() is only used by sym_add_exported().
Move export_from_secname() just above sym_add_exported().
---
scripts/mod/modpost.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
scripts/mod/modpost.c +4 -4
@@ -684,12 +684,8 @@ static void handle_modversion(const struct module *mod,static void handle_symbol (struct module *mod,struct elf_info *info,const Elf_Sym *sym,const char *symname) { -enum export export;const char *name; -if (strstarts (symname,"__ksymtab" )) - export =export_from_secname (info,get_secindex (info, sym)); -switch (sym->st_shndx) {case SHN_COMMON :if (strstarts (symname,"__gnu_lto_" )) {
@@ -724,7 +720,11 @@ static void handle_symbol(struct module *mod, struct elf_info *info,default :/* All exported symbols */ if (strstarts (symname,"__ksymtab_" )) { +enum export export; + name = symname +strlen ("__ksymtab_" ); + export =export_from_secname (info, +get_secindex (info, sym));sym_add_exported (name, mod, export); }if (strcmp (symname,"init_module" ) ==0 )
Signature · 1 line
2.32.0
Re: [PATCH 2/2] modpost: move export_from_secname() call to more relevant place
Quoted 7 lines · Masahiro Yamada
The value returned by
export_from_secname()is only used bysym_add_exported().Move
export_from_secname()just abovesym_add_exported().Signed-off-by Masahiro Yamada <[email protected]>
Thanks for the patch!
Quoted 37 lines
---
scripts/mod/modpost.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)scripts/mod/modpost.c +4
-5@@ -684,12 +684,8 @@ static void handle_modversion(const struct module *mod,static void handle_symbol (struct module *mod,struct elf_info *info,const Elf_Sym *sym,const char *symname) { -enum export export;const char *name; -if (strstarts (symname,"__ksymtab" )) - export =export_from_secname (info,get_secindex (info, sym)); -switch (sym->st_shndx) {case SHN_COMMON :if (strstarts (symname,"__gnu_lto_" )) {@@ -724,7 +720,11 @@ static void handle_symbol(struct module *mod, struct elf_info *info,default :/* All exported symbols */ if (strstarts (symname,"__ksymtab_" )) { +enum export export; + name = symname +strlen ("__ksymtab_" ); + export =export_from_secname (info, +get_secindex (info, sym));sym_add_exported (name, mod, export); }if (strcmp (symname,"init_module" ) ==0 ) --2.32.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 16 lines · Masahiro Yamada
With commit
1743694eb235("modpost: stop symbol preloading for modversion CRC") applied, nowexport_from_sec()is useless.
handle_symbol()is called for every symbol in the ELF.When 'symname' does not start with "
__ksymtab",export_from_sec()is called, and the returned value is stored in 'export'.It is used in the last part of
handle_symbol():if (strstarts(symname, "__ksymtab_")) { name = symname + strlen("__ksymtab_"); sym_add_exported(name, mod, export); }
Quoted 7 lines
'export' is used only when 'symname' starts with "
__ksymtab_".So, the value returned by
export_from_sec()is never used.Remove this useless function. This makes further cleanups possible.
Signed-off-by Masahiro Yamada <[email protected]>
Thanks for the patch!
Quoted 80 lines
---
scripts/mod/modpost.c | 17 +---------------- scripts/mod/modpost.h | 4 ---- 2 files changed, 1 insertion(+), 20 deletions(-)scripts/mod/modpost.c +1
-16@@ -369,16 +369,6 @@ static enum export export_from_secname(struct elf_info *elf, unsigned int sec)return export_unknown; } -static enum export export_from_sec (struct elf_info *elf,unsigned int sec) -{ -if (sec == elf->export_sec) -return export_plain; -else if (sec == elf->export_gpl_sec) -return export_gpl; -else -return export_unknown; -} -static const char *namespace_from_kstrtabns (const struct elf_info *info,const Elf_Sym *sym) {@@ -576,10 +566,7 @@ static int parse_elf(struct elf_info *info, const char *filename)fatal ("%s has NOBITS .modinfo\n" , filename); info->modinfo = (void *)hdr + sechdrs[i].sh_offset; info->modinfo_len = sechdrs[i].sh_size; - }else if (strcmp (secname,"__ksymtab" ) ==0 ) - info->export_sec = i; -else if (strcmp (secname,"__ksymtab_gpl" ) ==0 ) - info->export_gpl_sec = i; + }if (sechdrs[i].sh_type ==SHT_SYMTAB ) {unsigned int sh_link_idx;@@ -702,8 +689,6 @@ static void handle_symbol(struct module *mod, struct elf_info *info,if (strstarts (symname,"__ksymtab" )) export =export_from_secname (info,get_secindex (info, sym)); -else - export =export_from_sec (info,get_secindex (info, sym));switch (sym->st_shndx) {case SHN_COMMON :scripts/mod/modpost.h +0
-5@@ -25,7 +25,6 @@#define Elf_Sym Elf32_Sym#define Elf_Addr Elf32_Addr#define Elf_Sword Elf64_Sword -#define Elf_Section Elf32_Half#define ELF_ST_BIND ELF32_ST_BIND#define ELF_ST_TYPE ELF32_ST_TYPE@@ -40,7 +39,6 @@#define Elf_Sym Elf64_Sym#define Elf_Addr Elf64_Addr#define Elf_Sword Elf64_Sxword -#define Elf_Section Elf64_Half#define ELF_ST_BIND ELF64_ST_BIND#define ELF_ST_TYPE ELF64_ST_TYPE@@ -138,8 +136,6 @@ struct elf_info {Elf_Shdr *sechdrs;Elf_Sym *symtab_start;Elf_Sym *symtab_stop; -Elf_Section export_sec; -Elf_Section export_gpl_sec;char *strtab;char *modinfo;unsigned int modinfo_len; --2.32.0
Signature · 2 lines
Thanks, ~Nick Desaulniers