From: Nick Desaulniers <ndesaulniers@google.com>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Nicolas Pitre <npitre@baylibre.com>,
Luis Chamberlain <mcgrof@kernel.org>,
linux-modules <linux-modules@vger.kernel.org>,
Ard Biesheuvel <ardb@kernel.org>,
Michal Marek <michal.lkml@markovi.net>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 6/7] modpost: merge sym_update_namespace() into sym_add_exported()
Date: Fri, 10 Jun 2022 15:26:46 -0700 [thread overview]
Message-ID: <CAKwvOdk++w0K+y-spCn1fHbhO+G3oJ8LF9LDFJKWg-acW04XBQ@mail.gmail.com> (raw)
In-Reply-To: <20220610183236.1272216-7-masahiroy@kernel.org>
On Fri, Jun 10, 2022 at 11:34 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> 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>
Thanks for the patch!
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
>
> 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 f738dddde7b8..0db2cbb74a2a 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -357,26 +357,8 @@ static const char *sec_name_of_symbol(const struct elf_info *info,
>
> #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);
>
> @@ -389,6 +371,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);
>
> @@ -658,17 +641,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;
> }
> @@ -2470,9 +2448,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.32.0
>
--
Thanks,
~Nick Desaulniers
next prev parent reply other threads:[~2022-06-10 22:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-10 18:32 [PATCH 0/7] Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL() Masahiro Yamada
2022-06-10 18:32 ` [PATCH 1/7] modpost: fix section mismatch check for exported init/exit sections Masahiro Yamada
2022-06-10 18:32 ` [PATCH 2/7] modpost: put get_secindex() call inside sec_name() Masahiro Yamada
2022-06-10 21:41 ` Nick Desaulniers
2022-06-10 18:32 ` [PATCH 3/7] kbuild: generate struct kernel_symbol by modpost Masahiro Yamada
2022-06-11 18:47 ` Masahiro Yamada
2022-06-10 18:32 ` [PATCH 4/7] ia64,export.h: replace EXPORT_DATA_SYMBOL* with EXPORT_SYMBOL* Masahiro Yamada
2022-06-11 18:49 ` Masahiro Yamada
2022-06-10 18:32 ` [PATCH 5/7] checkpatch: warn if <asm/export.h> is included Masahiro Yamada
2022-06-11 1:33 ` Joe Perches
2022-06-11 18:56 ` Masahiro Yamada
2022-06-10 18:32 ` [PATCH 6/7] modpost: merge sym_update_namespace() into sym_add_exported() Masahiro Yamada
2022-06-10 22:26 ` Nick Desaulniers [this message]
2022-06-10 18:32 ` [PATCH 7/7] modpost: use null string instead of NULL pointer for default namespace Masahiro Yamada
2022-07-25 16:42 ` Nick Desaulniers
2022-06-11 18:51 ` [PATCH 0/7] Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL() 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=CAKwvOdk++w0K+y-spCn1fHbhO+G3oJ8LF9LDFJKWg-acW04XBQ@mail.gmail.com \
--to=ndesaulniers@google.com \
--cc=ardb@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=mcgrof@kernel.org \
--cc=michal.lkml@markovi.net \
--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).