From: Julien Thierry <jthierry@redhat.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: mark.rutland@arm.com, linux-efi@vger.kernel.org,
michal.lkml@markovi.net, keescook@chromium.org,
peterz@infradead.org, catalin.marinas@arm.com,
masahiroy@kernel.org, broonie@kernel.org,
linux-hardening@vger.kernel.org, jpoimboe@redhat.com,
will@kernel.org, ardb@kernel.org,
Julien Thierry <jthierry@redhat.com>
Subject: [RFC PATCH 16/17] objtool: arm64: Ignore replacement section for alternative callback
Date: Wed, 20 Jan 2021 18:37:59 +0100 [thread overview]
Message-ID: <20210120173800.1660730-17-jthierry@redhat.com> (raw)
In-Reply-To: <20210120173800.1660730-1-jthierry@redhat.com>
ARM64_CB_PATCH doesn't have static replacement instructions. Skip
trying to validate the alternative section.
Signed-off-by: Julien Thierry <jthierry@redhat.com>
---
tools/objtool/arch/arm64/special.c | 12 ++++++++++++
tools/objtool/check.c | 3 +++
2 files changed, 15 insertions(+)
diff --git a/tools/objtool/arch/arm64/special.c b/tools/objtool/arch/arm64/special.c
index d47e5590ed60..aff8577e71e9 100644
--- a/tools/objtool/arch/arm64/special.c
+++ b/tools/objtool/arch/arm64/special.c
@@ -24,6 +24,18 @@ struct switch_table_info {
void arch_handle_alternative(unsigned short feature, struct special_alt *alt)
{
+ if (alt->orig_len && !alt->new_len) {
+ /*
+ * ARM64_CB_PATCH has no alternative instruction.
+ * a callback is called at alternative replacement time
+ * to dynamically change the original instructions.
+ *
+ * ARM64_CB_PATCH is the last ARM64 feature, it's value changes
+ * every time a new feature is added. So the orig/alt region
+ * length are used to detect those alternatives
+ */
+ alt->skip_alt = true;
+ }
}
bool arch_support_alt_relocation(struct special_alt *special_alt,
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index d902697a388e..8840af09f843 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1182,6 +1182,9 @@ static int add_special_section_alts(struct objtool_file *file)
continue;
}
+ if (special_alt->skip_alt && !special_alt->new_len)
+ continue;
+
ret = handle_group_alt(file, special_alt, orig_insn,
&new_insn);
if (ret)
--
2.25.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-20 17:48 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 17:37 [RFC PATCH 00/17] objtool: add base support for arm64 Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 01/17] tools: Add some generic functions and headers Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 02/17] tools: arm64: Make aarch64 instruction decoder available to tools Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 03/17] tools: bug: Remove duplicate definition Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 04/17] objtool: arm64: Add base definition for arm64 backend Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 05/17] objtool: arm64: Decode add/sub instructions Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 06/17] objtool: arm64: Decode jump and call related instructions Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 07/17] objtool: arm64: Decode other system instructions Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 08/17] objtool: arm64: Decode load/store instructions Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 09/17] objtool: arm64: Decode LDR instructions Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 10/17] objtool: arm64: Accept padding in code sections Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 11/17] efi: libstub: Ignore relocations for .discard sections Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 12/17] gcc-plugins: objtool: Add plugin to detect switch table on arm64 Julien Thierry
2021-01-27 22:15 ` Nick Desaulniers
2021-01-27 23:26 ` Josh Poimboeuf
2021-01-29 18:10 ` Nick Desaulniers
2021-02-01 21:44 ` Josh Poimboeuf
2021-02-01 23:17 ` Nick Desaulniers
2021-02-02 0:02 ` Josh Poimboeuf
2021-02-02 14:24 ` David Laight
2021-02-02 22:33 ` Nick Desaulniers
2021-02-02 23:36 ` Josh Poimboeuf
2021-02-02 23:52 ` Nick Desaulniers
2021-02-02 8:57 ` Julien Thierry
2021-02-02 23:01 ` Nick Desaulniers
2021-02-03 0:14 ` Josh Poimboeuf
2021-02-03 11:57 ` Peter Zijlstra
2021-02-03 13:04 ` Mark Brown
2021-02-03 13:58 ` Mark Rutland
2021-02-03 8:11 ` Julien Thierry
2021-02-09 16:30 ` Daniel Kiss
2021-01-20 17:37 ` [RFC PATCH 13/17] objtool: arm64: Implement functions to add switch tables alternatives Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 14/17] objtool: arm64: Cache section with switch table information Julien Thierry
2021-01-20 17:37 ` [RFC PATCH 15/17] objtool: arm64: Handle supported relocations in alternatives Julien Thierry
2021-01-20 17:37 ` Julien Thierry [this message]
2021-01-20 17:38 ` [RFC PATCH 17/17] objtool: arm64: Enable stack validation for arm64 Julien Thierry
2021-01-21 9:03 ` [RFC PATCH 00/17] objtool: add base support " Ard Biesheuvel
2021-01-21 10:26 ` Julien Thierry
2021-01-21 11:08 ` Ard Biesheuvel
2021-01-21 11:23 ` Peter Zijlstra
2021-01-21 11:48 ` Ard Biesheuvel
2021-01-21 18:54 ` Josh Poimboeuf
2021-01-22 17:43 ` Mark Brown
2021-01-22 17:54 ` Ard Biesheuvel
2021-01-28 22:10 ` Madhavan T. Venkataraman
2021-01-29 15:47 ` Mark Brown
2021-01-22 21:15 ` Madhavan T. Venkataraman
2021-01-22 21:43 ` Ard Biesheuvel
2021-01-22 21:44 ` Madhavan T. Venkataraman
2021-01-25 21:19 ` Josh Poimboeuf
2021-01-22 21:16 ` Madhavan T. Venkataraman
2021-01-21 13:23 ` Julien Thierry
2021-01-21 14:23 ` Mark Brown
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=20210120173800.1660730-17-jthierry@redhat.com \
--to=jthierry@redhat.com \
--cc=ardb@kernel.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=jpoimboe@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=peterz@infradead.org \
--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).