From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>,
Michal Marek <michal.lkml@markovi.net>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 24/29] modpost: add mod->is_vmlinux struct member
Date: Mon, 25 May 2020 00:42:30 +0900 [thread overview]
Message-ID: <20200524154235.380482-25-masahiroy@kernel.org> (raw)
In-Reply-To: <20200524154235.380482-1-masahiroy@kernel.org>
is_vmlinux() is called in several places to check whether the current
module is vmlinux or not.
It is faster and clearer to check mod->is_vmlinux flag.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
Changes in v2: None
scripts/mod/modpost.c | 19 ++++++++++---------
scripts/mod/modpost.h | 1 +
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index c0bc8a2ea026..0d065f8f5087 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -186,6 +186,7 @@ static struct module *new_module(const char *modname)
/* add to list */
mod->name = p;
+ mod->is_vmlinux = is_vmlinux(modname);
mod->gpl_compatible = -1;
mod->next = modules;
modules = mod;
@@ -427,11 +428,11 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod,
if (!s) {
s = new_symbol(name, mod, export);
- } else if (!external_module || is_vmlinux(s->module->name) ||
+ } else if (!external_module || s->module->is_vmlinux ||
s->module == mod) {
warn("%s: '%s' exported twice. Previous export was in %s%s\n",
mod->name, name, s->module->name,
- is_vmlinux(s->module->name) ? "" : ".ko");
+ s->module->is_vmlinux ? "" : ".ko");
return s;
}
@@ -688,7 +689,7 @@ static void handle_modversion(const struct module *mod,
if (sym->st_shndx == SHN_UNDEF) {
warn("EXPORT symbol \"%s\" [%s%s] version generation failed, symbol will not be versioned.\n",
- symname, mod->name, is_vmlinux(mod->name) ? "":".ko");
+ symname, mod->name, mod->is_vmlinux ? "" : ".ko");
return;
}
@@ -2011,12 +2012,12 @@ static void read_symbols(const char *modname)
mod = new_module(modname);
- if (is_vmlinux(modname)) {
+ if (mod->is_vmlinux) {
have_vmlinux = 1;
mod->skip = 1;
}
- if (!is_vmlinux(modname)) {
+ if (!mod->is_vmlinux) {
license = get_modinfo(&info, "license");
if (!license)
warn("missing MODULE_LICENSE() in %s\n", modname);
@@ -2075,7 +2076,7 @@ static void read_symbols(const char *modname)
check_sec_ref(mod, modname, &info);
- if (!is_vmlinux(modname)) {
+ if (!mod->is_vmlinux) {
version = get_modinfo(&info, "version");
if (version || all_versions)
get_src_version(modname, mod->srcversion,
@@ -2345,7 +2346,7 @@ static void add_depends(struct buffer *b, struct module *mod)
/* Clear ->seen flag of modules that own symbols needed by this. */
for (s = mod->unres; s; s = s->next)
if (s->module)
- s->module->seen = is_vmlinux(s->module->name);
+ s->module->seen = s->module->is_vmlinux;
buf_printf(b, "\n");
buf_printf(b, "MODULE_INFO(depends, \"");
@@ -2462,9 +2463,9 @@ static void read_dump(const char *fname)
goto fail;
mod = find_module(modname);
if (!mod) {
- if (is_vmlinux(modname))
- have_vmlinux = 1;
mod = new_module(modname);
+ if (mod->is_vmlinux)
+ have_vmlinux = 1;
mod->skip = 1;
mod->from_dump = 1;
}
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 554f02c69ac2..ec717ab20b98 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -120,6 +120,7 @@ struct module {
int gpl_compatible;
struct symbol *unres;
int from_dump; /* 1 if module was loaded from *.symver */
+ int is_vmlinux;
int seen;
int skip;
int has_init;
--
2.25.1
next prev parent reply other threads:[~2020-05-24 15:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-24 15:42 [PATCH v2 00/29] modpost: various fixes, cleanups, optimizations Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 01/29] modpost: drop RCS/CVS $Revision handling in MODULE_VERSION() Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 02/29] modpost: do not call get_modinfo() for vmlinux Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 03/29] modpost: add read_text_file() and get_line() helpers Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 04/29] modpost: fix potential mmap'ed file overrun in get_src_version() Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 05/29] modpost: re-add warning about missing *.mod file Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 06/29] modpost: avoid false-positive file open error Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 07/29] modpost: use read_text_file() and get_line() for reading text files Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 08/29] modpost: remove get_next_text() and make {grab,release_}file static Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 09/29] kbuild: disallow multi-word in M= or KBUILD_EXTMOD Masahiro Yamada
2020-05-31 18:31 ` Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 10/29] modpost: move -T option close to the modpost command Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 11/29] modpost: pass -N option only for modules modpost Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 12/29] modpost: move external module options Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 13/29] modpost: load KBUILD_EXTRA_SYMBOLS files in order Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 14/29] modpost: track if the symbol origin is a dump file or ELF object Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 15/29] modpost: allow to pass -i option multiple times remove -e option Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 16/29] modpost: rename ext_sym_list to dump_list Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 17/29] modpost: re-add -e to set external_module flag Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 18/29] modpost: show warning if vmlinux is not found when processing modules Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 19/29] modpost: show warning if it fails to read symbol dump file Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 20/29] modpost: generate vmlinux.symvers and reuse it for the second modpost Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 21/29] modpost: remove -s option Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 22/29] modpost: remove mod->is_dot_o struct member Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 23/29] modpost: remove is_vmlinux() call in check_for_{gpl_usage,unused}() Masahiro Yamada
2020-05-24 15:42 ` Masahiro Yamada [this message]
2020-05-24 15:42 ` [PATCH v2 25/29] modpost: remove mod->skip struct member Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 26/29] modpost: set have_vmlinux in new_module() Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 27/29] modpost: strip .o from modname before calling new_module() Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 28/29] modpost: remove is_vmlinux() helper Masahiro Yamada
2020-05-24 15:42 ` [PATCH v2 29/29] modpost: change elf_info->size to size_t Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200524154235.380482-25-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).