From: Chen Zhongjin <chenzhongjin@huawei.com>
To: <linux-kernel@vger.kernel.org>, <linux-arch@vger.kernel.org>,
<linuxppc-dev@lists.ozlabs.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kbuild@vger.kernel.org>, <live-patching@vger.kernel.org>
Cc: mark.rutland@arm.com, madvenka@linux.microsoft.com,
michal.lkml@markovi.net, pasha.tatashin@soleen.com,
peterz@infradead.org, catalin.marinas@arm.com,
masahiroy@kernel.org, ndesaulniers@google.com,
chenzhongjin@huawei.com, rmk+kernel@armlinux.org.uk,
broonie@kernel.org, will@kernel.org, jpoimboe@kernel.org
Subject: [PATCH v5 09/33] objtool: check: Support data in text section
Date: Wed, 22 Jun 2022 23:48:56 +0800 [thread overview]
Message-ID: <20220622154920.95075-10-chenzhongjin@huawei.com> (raw)
In-Reply-To: <20220622154920.95075-1-chenzhongjin@huawei.com>
Arm64 assembly code can mix code and data in text sections through the use
of SYM_DATA_*() macros. Skip the content of these symbols when decoding
instructions of text sections.
Signed-off-by: Julien Thierry <jthierry@redhat.com>
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
---
tools/objtool/check.c | 13 +++++++++++--
tools/objtool/elf.c | 14 ++++++++++++++
tools/objtool/include/objtool/elf.h | 1 +
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index c0feb6db7c6d..77911ca9cfff 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -359,7 +359,7 @@ static int decode_instructions(struct objtool_file *file)
{
struct section *sec;
struct symbol *func;
- unsigned long offset;
+ unsigned long offset, next_offset;
struct instruction *insn;
int ret;
@@ -377,7 +377,14 @@ static int decode_instructions(struct objtool_file *file)
!strcmp(sec->name, ".entry.text"))
sec->noinstr = true;
- for (offset = 0; offset < sec->sh.sh_size; offset += insn->len) {
+ for (offset = 0; offset < sec->sh.sh_size; offset = next_offset) {
+ struct symbol *obj_sym = find_object_containing(sec, offset);
+ if (obj_sym) {
+ /* This is data in the middle of text section, skip it */
+ next_offset = obj_sym->offset + obj_sym->len;
+ continue;
+ }
+
insn = malloc(sizeof(*insn));
if (!insn) {
WARN("malloc failed");
@@ -410,6 +417,8 @@ static int decode_instructions(struct objtool_file *file)
hash_add(file->insn_hash, &insn->hash, sec_offset_hash(sec, insn->offset));
list_add_tail(&insn->list, &file->insn_list);
nr_insns++;
+
+ next_offset = offset + insn->len;
}
list_for_each_entry(func, &sec->symbol_list, list) {
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index c25e957c1e52..d7304e39f6b6 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -236,6 +236,20 @@ struct symbol *find_func_containing(struct section *sec, unsigned long offset)
return NULL;
}
+struct symbol *find_object_containing(const struct section *sec, unsigned long offset)
+{
+ struct rb_node *node;
+
+ rb_for_each(node, &offset, &sec->symbol_tree, symbol_by_offset) {
+ struct symbol *s = rb_entry(node, struct symbol, node);
+
+ if (s->type == STT_OBJECT)
+ return s;
+ }
+
+ return NULL;
+}
+
struct symbol *find_symbol_by_name(const struct elf *elf, const char *name)
{
struct symbol *sym;
diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h
index adebfbc2b518..8b0896935af1 100644
--- a/tools/objtool/include/objtool/elf.h
+++ b/tools/objtool/include/objtool/elf.h
@@ -167,6 +167,7 @@ struct reloc *find_reloc_by_dest(const struct elf *elf, struct section *sec, uns
struct reloc *find_reloc_by_dest_range(const struct elf *elf, struct section *sec,
unsigned long offset, unsigned int len);
struct symbol *find_func_containing(struct section *sec, unsigned long offset);
+struct symbol *find_object_containing(const struct section *sec, unsigned long offset);
#define for_each_sec(file, sec) \
list_for_each_entry(sec, &file->elf->sections, list)
--
2.17.1
next prev parent reply other threads:[~2022-06-22 15:54 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-22 15:48 [PATCH v5 00/33] objtool: add base support for arm64 Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 01/33] tools: arm64: Make aarch64 instruction decoder available to tools Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 02/33] objtool: arm64: Add base definition for arm64 backend Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 03/33] objtool: arm64: Decode add/sub instructions Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 04/33] objtool: arm64: Decode jump and call related instructions Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 05/33] objtool: arm64: Decode other system instructions Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 06/33] objtool: arm64: Decode load/store instructions Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 07/33] objtool: arm64: Decode LDR instructions Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 08/33] objtool: arm64: Accept non-instruction data in code sections Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin [this message]
2022-06-22 15:48 ` [PATCH v5 10/33] objtool: arm64: Handle supported relocations in alternatives Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 11/33] objtool: arm64: Ignore replacement section for alternative callback Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 12/33] objtool: arm64: Enable stack validation for arm64 Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 13/33] objtool: arm64: Enable ORC " Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 14/33] objtool: arm64: Add annotate_reachable() for objtools Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 15/33] arm64: bug: Add reachable annotation to warning macros Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 16/33] arm64: kgdb: Add reachable annotation after kgdb brk Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 17/33] objtool: arm64: Add unwind_hint support Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 18/33] arm64: Change symbol type annotations Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 19/33] arm64: Annotate unwind_hint for symbols with empty stack Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 20/33] arm64: entry: Annotate unwind_hint for entry Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 21/33] arm64: kvm: Annotate unwind_hint for hyp entry Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 22/33] arm64: efi-header: Mark efi header as data Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 23/33] arm64: head: Mark constants " Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 24/33] arm64: proc: Mark constant " Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 25/33] arm64: crypto: " Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 26/33] arm64: crypto: Remove unnecessary stackframe Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 27/33] arm64: Set intra-function call annotations Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 28/33] arm64: sleep: Properly set frame pointer before call Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 29/33] arm64: compat: Move VDSO code to .rodata section Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 30/33] arm64: entry: Align stack size for alternative Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 31/33] arm64: kernel: Skip validation of proton-pack.c Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 32/33] arm64: irq-gic: Replace unreachable() with -EINVAL Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 33/33] objtool: revert c_file fallthrough detection for arm64 Chen Zhongjin
2022-06-22 17:19 ` [PATCH v5 00/33] objtool: add base support " Daniel Thompson
2022-06-23 1:37 ` Chen Zhongjin
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=20220622154920.95075-10-chenzhongjin@huawei.com \
--to=chenzhongjin@huawei.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=jpoimboe@kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=live-patching@vger.kernel.org \
--cc=madvenka@linux.microsoft.com \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=ndesaulniers@google.com \
--cc=pasha.tatashin@soleen.com \
--cc=peterz@infradead.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=will@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;
as well as URLs for NNTP newsgroup(s).