From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-ia64@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>,
Ard Biesheuvel <ardb@kernel.org>,
Nicolas Pitre <npitre@baylibre.com>,
Masahiro Yamada <masahiroy@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Michal Marek <michal.lkml@markovi.net>
Subject: [PATCH v3 5/8] modpost: squash sym_update_namespace() into sym_add_exported()
Date: Wed, 28 Sep 2022 15:39:44 +0900 [thread overview]
Message-ID: <20220928063947.299333-6-masahiroy@kernel.org> (raw)
In-Reply-To: <20220928063947.299333-1-masahiroy@kernel.org>
Pass a set of the name, license, and namespace to sym_add_exported().
sym_update_namespace() is unneeded.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
---
(no changes since v1)
scripts/mod/modpost.c | 41 +++++++++--------------------------------
1 file changed, 9 insertions(+), 32 deletions(-)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 13fff6e92aef..0bb5bbd176b4 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -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;
--
2.34.1
next prev parent reply other threads:[~2022-09-28 6:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 6:39 [PATCH v3 0/8] Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL(), faster TRIM_UNUSED_KSYMS Masahiro Yamada
2022-09-28 6:39 ` [PATCH v3 1/8] kbuild: move modules.builtin(.modinfo) rules to Makefile.vmlinux_o Masahiro Yamada
2022-09-28 6:39 ` [PATCH v3 2/8] kbuild: rebuild .vmlinux.export.o when its prerequisite is updated Masahiro Yamada
2022-10-09 1:19 ` [kbuild] b3830bad81: System_halted kernel test robot
2022-10-10 19:29 ` Masahiro Yamada
2022-10-11 9:36 ` Yujie Liu
2022-10-11 14:42 ` Masahiro Yamada
2022-09-28 6:39 ` [PATCH v3 3/8] kbuild: generate KSYMTAB entries by modpost Masahiro Yamada
2022-09-28 19:29 ` Masahiro Yamada
2022-09-28 6:39 ` [PATCH v3 4/8] ia64,export.h: replace EXPORT_DATA_SYMBOL* with EXPORT_SYMBOL* Masahiro Yamada
2022-09-28 6:39 ` Masahiro Yamada [this message]
2022-09-28 6:39 ` [PATCH v3 6/8] modpost: use null string instead of NULL pointer for default namespace Masahiro Yamada
2022-09-28 9:53 ` David Laight
2022-09-28 13:52 ` Masahiro Yamada
2022-09-28 6:39 ` [PATCH v3 7/8] modpost: squash report_sec_mismatch() and remove enum mismatch Masahiro Yamada
2022-09-28 6:39 ` [PATCH v3 8/8] kbuild: implement CONFIG_TRIM_UNUSED_KSYMS without recursion Masahiro Yamada
2022-09-28 21:04 ` [PATCH v3 0/8] Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL(), faster TRIM_UNUSED_KSYMS 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=20220928063947.299333-6-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=ardb@kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=ndesaulniers@google.com \
--cc=npitre@baylibre.com \
--cc=viro@zeniv.linux.org.uk \
/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).