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 1/7] buildid: Add method to get running kernel's build ID
Date: Mon, 1 Mar 2021 09:47:43 -0800 [thread overview]
Message-ID: <20210301174749.1269154-2-swboyd@chromium.org> (raw)
In-Reply-To: <20210301174749.1269154-1-swboyd@chromium.org>
Add vmlinux_build_id() so that callers can get a hex format string
representation of the running kernel's build ID. This will be used in
the kdump and dump_stack code so that developers can easily locate the
vmlinux for a stacktrace.
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/buildid.h | 3 ++
lib/buildid.c | 65 ++++++++++++++++++++++++++++++++---------
2 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/include/linux/buildid.h b/include/linux/buildid.h
index 40232f90db6e..dd134a96a87c 100644
--- a/include/linux/buildid.h
+++ b/include/linux/buildid.h
@@ -5,8 +5,11 @@
#include <linux/mm_types.h>
#define BUILD_ID_SIZE_MAX 20
+#define BUILD_ID_STR_SIZE_MAX (BUILD_ID_SIZE_MAX * 2 + 1)
int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id,
__u32 *size);
+const char *vmlinux_build_id(void);
+
#endif
diff --git a/lib/buildid.c b/lib/buildid.c
index 6156997c3895..57daf928b133 100644
--- a/lib/buildid.c
+++ b/lib/buildid.c
@@ -2,30 +2,23 @@
#include <linux/buildid.h>
#include <linux/elf.h>
+#include <linux/kernel.h>
#include <linux/pagemap.h>
#define BUILD_ID 3
+
/*
* Parse build id from the note segment. This logic can be shared between
* 32-bit and 64-bit system, because Elf32_Nhdr and Elf64_Nhdr are
* identical.
*/
-static inline int parse_build_id(void *page_addr,
- unsigned char *build_id,
- __u32 *size,
- void *note_start,
- Elf32_Word note_size)
+static int parse_build_id_buf(unsigned char *build_id,
+ __u32 *size,
+ const void *note_start,
+ Elf32_Word note_size)
{
Elf32_Word note_offs = 0, new_offs;
- /* check for overflow */
- if (note_start < page_addr || note_start + note_size < note_start)
- return -EINVAL;
-
- /* only supports note that fits in the first page */
- if (note_start + note_size > page_addr + PAGE_SIZE)
- return -EINVAL;
-
while (note_offs + sizeof(Elf32_Nhdr) < note_size) {
Elf32_Nhdr *nhdr = (Elf32_Nhdr *)(note_start + note_offs);
@@ -49,9 +42,27 @@ static inline int parse_build_id(void *page_addr,
break;
note_offs = new_offs;
}
+
return -EINVAL;
}
+static inline int parse_build_id(void *page_addr,
+ unsigned char *build_id,
+ __u32 *size,
+ void *note_start,
+ Elf32_Word note_size)
+{
+ /* check for overflow */
+ if (note_start < page_addr || note_start + note_size < note_start)
+ return -EINVAL;
+
+ /* only supports note that fits in the first page */
+ if (note_start + note_size > page_addr + PAGE_SIZE)
+ return -EINVAL;
+
+ return parse_build_id_buf(build_id, size, note_start, note_size);
+}
+
/* Parse build ID from 32-bit ELF */
static int get_build_id_32(void *page_addr, unsigned char *build_id,
__u32 *size)
@@ -147,3 +158,31 @@ int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id,
put_page(page);
return ret;
}
+
+static void build_id2hex(char *dst, const unsigned char *src, __u32 size)
+{
+ bin2hex(dst, src, size);
+ dst[2 * size] = '\0';
+}
+
+/**
+ * vmlinux_build_id - Get the running kernel's build-id in hex string format
+ *
+ * Return: Running kernel's build-id in hex string format
+ */
+const char *vmlinux_build_id(void)
+{
+ extern const void __start_notes __weak;
+ extern const void __stop_notes __weak;
+ unsigned int notes_size = &__stop_notes - &__start_notes;
+ unsigned char build_id[BUILD_ID_SIZE_MAX];
+ __u32 size;
+ static char vmlinux_build_id_buf[BUILD_ID_STR_SIZE_MAX];
+
+ if (vmlinux_build_id_buf[0] == '\0') {
+ if (!parse_build_id_buf(build_id, &size, &__start_notes, notes_size))
+ build_id2hex(vmlinux_build_id_buf, build_id, size);
+ }
+
+ return vmlinux_build_id_buf;
+}
--
https://chromeos.dev
next prev parent reply other threads:[~2021-03-01 23:04 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 ` Stephen Boyd [this message]
[not found] ` <CAHp75VcCjYm59-BQ0paPDCV97N5mgcq_OAdeixgUDEnAuG2qMg@mail.gmail.com>
[not found] ` <161472770533.1478170.3061709841985494537@swboyd.mtv.corp.google.com>
2021-03-04 0:41 ` [PATCH 1/7] buildid: Add method to get running kernel's build ID 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 ` [PATCH 4/7] module: Parse and stash build ID on insertion Stephen Boyd
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-2-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®