| Message ID | 20230521160426.1881124-20-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL(), faster TRIM_UNUSED_KSYMS | expand |
On Sun, May 21, 2023 at 9:05 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > In case of section mismatch, modpost shows slightly different messages. > > For extable section mismatch: > > "%s(%s+0x%lx): Section mismatch in reference to the %s:%s\n" > > For the other cases: > > "%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n" > > They are similar. Merge them. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Thanks for the patch! Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > --- > > scripts/mod/modpost.c | 18 +++--------------- > 1 file changed, 3 insertions(+), 15 deletions(-) > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index 852cc164c77e..e7561fa57478 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -1135,21 +1135,10 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, > > sec_mismatch_count++; > > - switch (mismatch->mismatch) { > - case TEXT_TO_ANY_INIT: > - case DATA_TO_ANY_INIT: > - case TEXTDATA_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: > - warn("%s(%s+0x%lx): Section mismatch in reference to the %s:%s\n", > - modname, fromsec, (long)faddr, tosec, tosym); > + warn("%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n", > + modname, fromsym, fromsec, tosym, tosec); > > + if (mismatch->mismatch == EXTABLE_TO_NON_TEXT) { > if (match(tosec, mismatch->bad_tosec)) > fatal("The relocation at %s+0x%lx references\n" > "section \"%s\" which is black-listed.\n" > @@ -1169,7 +1158,6 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, > else > error("%s+0x%lx references non-executable section '%s'\n", > fromsec, (long)faddr, tosec); > - break; > } > } > > -- > 2.39.2 >
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 852cc164c77e..e7561fa57478 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1135,21 +1135,10 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, sec_mismatch_count++; - switch (mismatch->mismatch) { - case TEXT_TO_ANY_INIT: - case DATA_TO_ANY_INIT: - case TEXTDATA_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: - warn("%s(%s+0x%lx): Section mismatch in reference to the %s:%s\n", - modname, fromsec, (long)faddr, tosec, tosym); + warn("%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n", + modname, fromsym, fromsec, tosym, tosec); + if (mismatch->mismatch == EXTABLE_TO_NON_TEXT) { if (match(tosec, mismatch->bad_tosec)) fatal("The relocation at %s+0x%lx references\n" "section \"%s\" which is black-listed.\n" @@ -1169,7 +1158,6 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, else error("%s+0x%lx references non-executable section '%s'\n", fromsec, (long)faddr, tosec); - break; } }
In case of section mismatch, modpost shows slightly different messages. For extable section mismatch: "%s(%s+0x%lx): Section mismatch in reference to the %s:%s\n" For the other cases: "%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n" They are similar. Merge them. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/mod/modpost.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)