From: Martijn Coenen <maco@android.com>
To: linux-kernel@vger.kernel.org
Cc: Martijn Coenen <maco@android.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Alan Stern <stern@rowland.harvard.edu>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Oliver Neukum <oneukum@suse.com>, Arnd Bergmann <arnd@arndb.de>,
Jessica Yu <jeyu@kernel.org>, Stephen Boyd <sboyd@codeaurora.org>,
Philippe Ombredanne <pombredanne@nexb.com>,
Kate Stewart <kstewart@linuxfoundation.org>,
Sam Ravnborg <sam@ravnborg.org>,
linux-kbuild@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net,
linux-scsi@vger.kernel.org, linux-arch@vger.kernel.org,
maco@google.com, sspatil@google.com, malchev@google.com,
joelaf@google.com
Subject: [PATCH 3/6] modpost: add support for checking symbol namespaces.
Date: Mon, 16 Jul 2018 14:21:22 +0200 [thread overview]
Message-ID: <20180716122125.175792-4-maco@android.com> (raw)
In-Reply-To: <20180716122125.175792-1-maco@android.com>
Emits a warning whenever a module refers to an exported symbol without
explicitly importing the namespace that it is defined in.
Example:
WARNING: module ums-usbat uses symbol usb_stor_resume from namespace
USB_STORAGE_NS, but does not import it.
Signed-off-by: Martijn Coenen <maco@android.com>
---
scripts/mod/modpost.c | 70 +++++++++++++++++++++++++++++++++++++++----
scripts/mod/modpost.h | 7 +++++
2 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 1663fb19343a..a56a8461a96a 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -165,6 +165,7 @@ struct symbol {
struct module *module;
unsigned int crc;
int crc_valid;
+ const char *ns; /* namespace */
unsigned int weak:1;
unsigned int vmlinux:1; /* 1 if symbol is defined in vmlinux */
unsigned int kernel:1; /* 1 if symbol is from kernel
@@ -234,6 +235,35 @@ static struct symbol *find_symbol(const char *name)
return NULL;
}
+static bool contains_namespace(struct namespace_list *list, const char *ns)
+{
+ struct namespace_list *ns_entry;
+
+ for (ns_entry = list; ns_entry != NULL; ns_entry = ns_entry->next) {
+ if (strcmp(ns_entry->namespace, ns) == 0)
+ return true;
+ }
+
+ return false;
+}
+
+static void add_namespace(struct namespace_list **list, const char *ns)
+{
+ struct namespace_list *ns_entry;
+
+ if (!contains_namespace(*list, ns)) {
+ ns_entry = NOFAIL(malloc(sizeof(struct namespace_list)));
+ strcpy(ns_entry->namespace, ns);
+ ns_entry->next = *list;
+ *list = ns_entry;
+ }
+}
+
+static bool module_imports_namespace(struct module *module, const char *ns)
+{
+ return contains_namespace(module->imported_namespaces, ns);
+}
+
static const struct {
const char *str;
enum export export;
@@ -313,21 +343,40 @@ static enum export export_from_sec(struct elf_info *elf, unsigned int sec)
return export_unknown;
}
+static const char *sym_extract_ns(const char **symname)
+{
+ size_t n;
+
+ n = strcspn(*symname, ".");
+ if (n < strlen(*symname) - 1) {
+ char *dupsymname = NOFAIL(strdup(*symname));
+
+ dupsymname[n] = '\0';
+ *symname = dupsymname;
+ return dupsymname + n + 1;
+ } else {
+ return NULL;
+ }
+}
+
/**
* Add an exported symbol - it may have already been added without a
* CRC, in this case just update the CRC
**/
-static struct symbol *sym_add_exported(const char *name, struct module *mod,
- enum export export)
+static struct symbol *sym_add_exported(const char *name,
+ struct module *mod, enum export export)
{
- struct symbol *s = find_symbol(name);
+ const char *extract_name = name;
+ const char *ns = sym_extract_ns(&extract_name);
+ struct symbol *s = find_symbol(extract_name);
if (!s) {
- s = new_symbol(name, mod, export);
+ s = new_symbol(extract_name, mod, export);
+ s->ns = ns;
} else {
if (!s->preloaded) {
warn("%s: '%s' exported twice. Previous export "
- "was in %s%s\n", mod->name, name,
+ "was in %s%s\n", mod->name, extract_name,
s->module->name,
is_vmlinux(s->module->name) ?"":".ko");
} else {
@@ -697,6 +746,10 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
}
if (strcmp(symname, "init_module") == 0)
mod->has_init = 1;
+ if (strstarts(symname, "__knsimport_")) {
+ const char *name = symname + strlen("__knsimport_");
+ add_namespace(&mod->imported_namespaces, name);
+ }
if (strcmp(symname, "cleanup_module") == 0)
mod->has_cleanup = 1;
break;
@@ -2097,6 +2150,13 @@ static void check_exports(struct module *mod)
basename++;
else
basename = mod->name;
+
+ if (exp->ns && !module_imports_namespace(mod, exp->ns)) {
+ warn("module %s uses symbol %s from namespace %s, "
+ "but does not import it.\n",
+ basename, exp->name, exp->ns);
+ }
+
if (!mod->gpl_compatible)
check_for_gpl_usage(exp->export, basename, exp->name);
check_for_unused(exp->export, basename, exp->name);
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 8453d6ac2f77..9626bf3e7424 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -109,6 +109,11 @@ buf_printf(struct buffer *buf, const char *fmt, ...);
void
buf_write(struct buffer *buf, const char *s, int len);
+struct namespace_list {
+ struct namespace_list *next;
+ char namespace[0];
+};
+
struct module {
struct module *next;
const char *name;
@@ -121,6 +126,8 @@ struct module {
struct buffer dev_table_buf;
char srcversion[25];
int is_dot_o;
+ // Actual imported namespaces
+ struct namespace_list *imported_namespaces;
};
struct elf_info {
--
2.18.0.203.gfac676dfb9-goog
next prev parent reply other threads:[~2018-07-16 12:21 UTC|newest]
Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 12:21 [PATCH 0/6] Symbol namespaces Martijn Coenen
2018-07-16 12:21 ` [PATCH 1/6] export: explicitly align struct kernel_symbol Martijn Coenen
2018-07-16 12:21 ` [PATCH 2/6] module: add support for symbol namespaces Martijn Coenen
2018-07-19 16:32 ` Jessica Yu
2018-07-20 7:54 ` Martijn Coenen
2018-07-20 14:49 ` Jessica Yu
2018-07-20 15:42 ` Martijn Coenen
2018-07-23 11:12 ` Jessica Yu
2018-07-24 7:44 ` Martijn Coenen
2018-07-24 7:56 ` Martijn Coenen
2018-07-25 15:55 ` Jessica Yu
2018-07-25 16:48 ` Lucas De Marchi
2018-07-26 7:44 ` Martijn Coenen
2018-07-16 12:21 ` Martijn Coenen [this message]
2018-07-16 12:21 ` [PATCH 4/6] modpost: add support for generating namespace dependencies Martijn Coenen
2018-07-23 6:49 ` Jessica Yu
2018-07-16 12:21 ` [PATCH 5/6] scripts: Coccinelle script for " Martijn Coenen
2018-07-16 12:21 ` [PATCH 6/6] RFC: USB: storage: move symbols into USB_STORAGE namespace Martijn Coenen
2018-07-17 15:04 ` Alan Stern
2018-07-18 13:28 ` Martijn Coenen
2018-07-16 15:33 ` [PATCH 0/6] Symbol namespaces Greg Kroah-Hartman
2018-07-23 14:28 ` Arnd Bergmann
2018-07-24 8:09 ` Martijn Coenen
2018-07-24 9:08 ` Arnd Bergmann
2019-08-13 12:16 ` [PATCH v2 0/10] Symbol namespaces - RFC Matthias Maennich
2019-08-13 12:16 ` [PATCH v2 01/10] module: support reading multiple values per modinfo tag Matthias Maennich
2019-08-13 12:40 ` Greg KH
2019-08-13 12:16 ` [PATCH v2 02/10] export: explicitly align struct kernel_symbol Matthias Maennich
2019-08-13 12:41 ` Greg KH
2019-08-13 12:17 ` [PATCH v2 03/10] module: add support for symbol namespaces Matthias Maennich
2019-08-13 15:26 ` Greg KH
2019-08-13 12:17 ` [PATCH v2 04/10] modpost: " Matthias Maennich
2019-08-13 15:27 ` Greg KH
2019-08-13 12:17 ` [PATCH v2 05/10] module: add config option MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS Matthias Maennich
2019-08-13 18:17 ` Greg KH
2019-08-13 20:15 ` Saravana Kannan
2019-08-14 12:54 ` Matthias Maennich
2019-08-14 17:34 ` Saravana Kannan
2019-08-13 12:17 ` [PATCH v2 06/10] export: allow definition default namespaces in Makefiles or sources Matthias Maennich
2019-08-13 18:16 ` Greg KH
2019-08-13 18:16 ` Greg KH
2019-08-13 12:17 ` [PATCH v2 07/10] modpost: add support for generating namespace dependencies Matthias Maennich
2019-08-13 18:21 ` Greg KH
2019-08-13 12:17 ` [PATCH v2 08/10] scripts: Coccinelle script for " Matthias Maennich
2019-08-13 12:31 ` Julia Lawall
2019-08-13 12:44 ` Greg KH
2019-08-14 6:36 ` [Cocci] " Himanshu Jha
2019-08-14 8:03 ` Matthias Maennich
2019-08-15 13:50 ` [v2 " Markus Elfring
2019-08-22 9:18 ` Matthias Maennich
2019-08-22 11:00 ` Markus Elfring
2019-08-13 12:17 ` [PATCH v2 09/10] usb-storage: remove single-use define for debugging Matthias Maennich
2019-08-13 12:42 ` Greg KH
2019-08-13 13:12 ` Greg KH
2019-08-13 12:17 ` [PATCH v2 10/10] RFC: usb-storage: export symbols in USB_STORAGE namespace Matthias Maennich
2019-08-13 12:45 ` Greg KH
2019-08-13 12:47 ` Greg KH
2019-08-13 15:02 ` Matthias Maennich
[not found] ` <20190821114955.12788-1-maennich@google.com>
2019-08-21 11:49 ` [PATCH v3 01/11] module: support reading multiple values per modinfo tag Matthias Maennich
2019-08-21 11:49 ` [PATCH v3 02/11] export: explicitly align struct kernel_symbol Matthias Maennich
2019-08-21 11:49 ` [PATCH v3 03/11] module: add support for symbol namespaces Matthias Maennich
2019-08-27 15:37 ` Jessica Yu
2019-08-27 16:04 ` Matthias Maennich
2019-08-21 11:49 ` [PATCH v3 04/11] modpost: " Matthias Maennich
2019-08-26 16:21 ` Jessica Yu
2019-08-27 14:41 ` Matthias Maennich
2019-08-28 9:43 ` Jessica Yu
2019-08-28 9:55 ` Matthias Maennich
2019-08-28 10:16 ` Jessica Yu
2019-08-21 11:49 ` [PATCH v3 05/11] module: add config option MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS Matthias Maennich
2019-08-21 11:49 ` [PATCH v3 06/11] export: allow definition default namespaces in Makefiles or sources Matthias Maennich
2019-08-28 10:49 ` Jessica Yu
2019-08-28 10:56 ` Matthias Maennich
2019-08-21 11:49 ` [PATCH v3 07/11] modpost: add support for generating namespace dependencies Matthias Maennich
2019-08-21 11:49 ` [PATCH v3 08/11] scripts: Coccinelle script for " Matthias Maennich
2019-08-22 6:09 ` [v3 " Markus Elfring
2019-08-29 12:13 ` [PATCH v3 " Jessica Yu
2019-08-21 11:49 ` [PATCH v3 09/11] usb-storage: remove single-use define for debugging Matthias Maennich
2019-08-21 12:37 ` Greg KH
2019-08-21 13:21 ` Thomas Gleixner
2019-08-21 13:32 ` Greg KH
2019-08-21 11:49 ` [PATCH v3 10/11] RFC: usb-storage: export symbols in USB_STORAGE namespace Matthias Maennich
2019-08-21 12:38 ` Greg KH
2019-08-21 14:36 ` Jessica Yu
2019-08-21 23:13 ` Christoph Hellwig
2019-08-22 8:32 ` Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 00/12] Symbol Namespaces Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 01/12] module: support reading multiple values per modinfo tag Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 02/12] export: explicitly align struct kernel_symbol Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 03/12] module: add support for symbol namespaces Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 04/12] modpost: " Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 05/12] module: add config option MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 06/12] export: allow definition default namespaces in Makefiles or sources Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 07/12] modpost: add support for generating namespace dependencies Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 08/12] scripts: Coccinelle script for " Matthias Maennich
2019-09-04 9:53 ` Masahiro Yamada
2019-09-05 14:46 ` Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 09/12] docs: Add documentation for Symbol Namespaces Matthias Maennich
2019-09-04 7:16 ` Greg KH
2019-09-03 15:06 ` [PATCH v4 10/12] usb-storage: remove single-use define for debugging Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 11/12] RFC: usb-storage: export symbols in USB_STORAGE namespace Matthias Maennich
2019-09-03 15:06 ` [PATCH v4 12/12] RFC: watchdog: export core symbols in WATCHDOG_CORE namespace Matthias Maennich
2019-09-03 16:10 ` Guenter Roeck
2019-09-04 8:45 ` Masahiro Yamada
2019-09-04 12:12 ` Guenter Roeck
2019-09-04 16:16 ` [usb-storage] " Matthew Dharm
2019-09-05 10:41 ` Jessica Yu
2019-09-05 10:52 ` Arnd Bergmann
2019-09-05 11:16 ` Jessica Yu
2019-09-05 11:25 ` Masahiro Yamada
2019-09-05 12:00 ` Greg Kroah-Hartman
2019-09-05 11:25 ` Matthias Maennich
2019-09-04 9:37 ` [PATCH v4 00/12] Symbol Namespaces Masahiro Yamada
2019-09-06 10:32 ` [PATCH v5 00/11] " Matthias Maennich
2019-09-06 10:32 ` [PATCH v5 01/11] module: support reading multiple values per modinfo tag Matthias Maennich
2019-09-06 10:32 ` [PATCH v5 02/11] export: explicitly align struct kernel_symbol Matthias Maennich
2019-09-06 10:32 ` [PATCH v5 03/11] module: add support for symbol namespaces Matthias Maennich
2019-09-06 10:32 ` [PATCH v5 04/11] modpost: " Matthias Maennich
2019-09-26 22:24 ` [PATCH] modpost: Copy namespace string into 'struct symbol' Shaun Ruffell
2019-09-27 5:31 ` Greg Kroah-Hartman
2019-09-27 8:03 ` Matthias Maennich
2019-09-30 21:20 ` Shaun Ruffell
2019-10-01 16:19 ` Matthias Maennich
2019-10-01 19:37 ` Shaun Ruffell
2019-09-06 10:32 ` [PATCH v5 05/11] module: add config option MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS Matthias Maennich
2019-09-06 10:32 ` [PATCH v5 06/11] export: allow definition default namespaces in Makefiles or sources Matthias Maennich
2019-09-06 10:32 ` [PATCH v5 07/11] modpost: add support for generating namespace dependencies Matthias Maennich
2019-09-06 10:32 ` [PATCH v5 08/11] scripts: Coccinelle script for " Matthias Maennich
2019-09-06 10:32 ` [PATCH v5 09/11] docs: Add documentation for Symbol Namespaces Matthias Maennich
2019-09-06 10:32 ` [PATCH v5 10/11] usb-storage: remove single-use define for debugging Matthias Maennich
2019-09-06 12:59 ` Jessica Yu
2019-09-06 13:22 ` Greg KH
2019-09-06 10:32 ` [PATCH v5 11/11] usb-storage: export symbols in USB_STORAGE namespace Matthias Maennich
2019-09-09 8:35 ` [PATCH v5 00/11] Symbol Namespaces Jessica Yu
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=20180716122125.175792-4-maco@android.com \
--to=maco@android.com \
--cc=arnd@arndb.de \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jeyu@kernel.org \
--cc=joelaf@google.com \
--cc=kstewart@linuxfoundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=maco@google.com \
--cc=malchev@google.com \
--cc=michal.lkml@markovi.net \
--cc=mingo@redhat.com \
--cc=oneukum@suse.com \
--cc=pombredanne@nexb.com \
--cc=sam@ravnborg.org \
--cc=sboyd@codeaurora.org \
--cc=sspatil@google.com \
--cc=stern@rowland.harvard.edu \
--cc=tglx@linutronix.de \
--cc=usb-storage@lists.one-eyed-alien.net \
--cc=x86@kernel.org \
--cc=yamada.masahiro@socionext.com \
/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).