From: Stephen Boyd <swboyd@chromium.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Alexei Starovoitov <ast@kernel.org>, Jessica Yu <jeyu@kernel.org>,
Evan Green <evgreen@chromium.org>,
Hsin-Yi Wang <hsinyi@chromium.org>
Subject: [PATCH 4/7] module: Parse and stash build ID on insertion
Date: Mon, 1 Mar 2021 09:47:46 -0800 [thread overview]
Message-ID: <20210301174749.1269154-5-swboyd@chromium.org> (raw)
In-Reply-To: <20210301174749.1269154-1-swboyd@chromium.org>
Parse the build ID of a module when it is inserted and stash it away in
'struct module' in case we print module symbols. This will be used in a
future patch to print the module build ID when module functions are in a
stack trace.
Note: we only do this if CONFIG_KALLSYMS is enabled, because if it isn't
enabled then module names aren't printed for symbolic pointers and thus
build IDs aren't printed either.
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Evan Green <evgreen@chromium.org>
Cc: Hsin-Yi Wang <hsinyi@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
include/linux/module.h | 4 ++++
kernel/module.c | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/include/linux/module.h b/include/linux/module.h
index 59f094fa6f74..9d1f6a5240c1 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -11,6 +11,7 @@
#include <linux/list.h>
#include <linux/stat.h>
+#include <linux/buildid.h>
#include <linux/compiler.h>
#include <linux/cache.h>
#include <linux/kmod.h>
@@ -432,6 +433,9 @@ struct module {
/* Notes attributes */
struct module_notes_attrs *notes_attrs;
+
+ /* Module build-id */
+ char build_id[BUILD_ID_STR_SIZE_MAX];
#endif
/* The command line arguments (may be mangled). People like
diff --git a/kernel/module.c b/kernel/module.c
index 30479355ab85..a7559a0de9d8 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -13,6 +13,7 @@
#include <linux/trace_events.h>
#include <linux/init.h>
#include <linux/kallsyms.h>
+#include <linux/buildid.h>
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/sysfs.h>
@@ -2770,6 +2771,20 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
}
mod->core_kallsyms.num_symtab = ndst;
}
+
+static void module_init_build_id(struct module *mod, const struct load_info *info)
+{
+ const Elf_Shdr *sechdr;
+ unsigned int i;
+
+ for (i = 0; i < info->hdr->e_shnum; i++) {
+ sechdr = &info->sechdrs[i];
+ if (!sect_empty(sechdr) && sechdr->sh_type == SHT_NOTE &&
+ !build_id_parse_buf((void *)sechdr->sh_addr, mod->build_id,
+ sechdr->sh_size))
+ break;
+ }
+}
#else
static inline void layout_symtab(struct module *mod, struct load_info *info)
{
@@ -2778,6 +2793,10 @@ static inline void layout_symtab(struct module *mod, struct load_info *info)
static void add_kallsyms(struct module *mod, const struct load_info *info)
{
}
+
+static void module_init_build_id(struct module *mod, const struct load_info *info)
+{
+}
#endif /* CONFIG_KALLSYMS */
static void dynamic_debug_setup(struct module *mod, struct _ddebug *debug, unsigned int num)
@@ -4004,6 +4023,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
goto free_arch_cleanup;
}
+ module_init_build_id(mod, info);
dynamic_debug_setup(mod, info->debug, info->num_debug);
/* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
--
https://chromeos.dev
next prev parent reply other threads:[~2021-03-01 23:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 17:47 [PATCH 0/7] Add build ID to stacktraces Stephen Boyd
2021-03-01 17:47 ` [PATCH 1/7] buildid: Add method to get running kernel's build ID Stephen Boyd
[not found] ` <CAHp75VcCjYm59-BQ0paPDCV97N5mgcq_OAdeixgUDEnAuG2qMg@mail.gmail.com>
[not found] ` <161472770533.1478170.3061709841985494537@swboyd.mtv.corp.google.com>
2021-03-04 0:41 ` Stephen Boyd
2021-03-01 17:47 ` [PATCH 2/7] dump_stack: Add vmlinux build ID to stack traces Stephen Boyd
2021-03-01 17:47 ` [PATCH 3/7] buildid: Add API to parse build ID out of buffer Stephen Boyd
2021-03-01 17:47 ` Stephen Boyd [this message]
2021-03-01 17:47 ` [PATCH 5/7] printk: Make %pS and friends print module build ID Stephen Boyd
2021-03-02 2:43 ` Steven Rostedt
2021-03-02 23:24 ` Stephen Boyd
2021-03-04 17:19 ` Matthew Wilcox
2021-03-04 19:11 ` Stephen Boyd
2021-03-03 2:01 ` Steven Rostedt
2021-03-03 3:00 ` Stephen Boyd
2021-03-03 8:19 ` Andy Shevchenko
2021-03-03 8:56 ` Stephen Boyd
2021-03-03 10:25 ` Petr Mladek
2021-03-03 15:00 ` Steven Rostedt
2021-03-03 16:17 ` Andy Shevchenko
2021-03-04 0:38 ` Stephen Boyd
2021-03-04 1:19 ` Steven Rostedt
2021-03-04 6:25 ` Stephen Boyd
2021-03-04 1:17 ` Stephen Boyd
2021-03-04 17:00 ` Matthew Wilcox
2021-03-04 19:15 ` Stephen Boyd
2021-03-04 23:11 ` Rasmus Villemoes
2021-03-05 4:21 ` Stephen Boyd
2021-03-01 17:47 ` [PATCH 6/7] buildid: Mark some arguments const Stephen Boyd
2021-03-01 17:47 ` [PATCH 7/7] kdump: Use vmlinux_build_id() to simplify Stephen Boyd
2021-03-02 8:19 ` Baoquan He
2021-03-02 23:21 ` Stephen Boyd
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=20210301174749.1269154-5-swboyd@chromium.org \
--to=swboyd@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=ast@kernel.org \
--cc=evgreen@chromium.org \
--cc=hsinyi@chromium.org \
--cc=jeyu@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®