From: Chen Zhongjin <chenzhongjin@huawei.com>
To: <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>
Cc: <jthierry@redhat.com>, <catalin.marinas@arm.com>,
<will@kernel.org>, <mark.rutland@arm.com>, <ardb@kernel.org>,
<masahiroy@kernel.org>, <jpoimboe@redhat.com>,
<peterz@infradead.org>, <ycote@redhat.com>
Subject: [RFC PATCH v3 12/13] objtool: arm64: Ignore replacement section for alternative callback
Date: Thu, 7 Apr 2022 20:01:40 +0800 [thread overview]
Message-ID: <20220407120141.43801-13-chenzhongjin@huawei.com> (raw)
In-Reply-To: <20220407120141.43801-1-chenzhongjin@huawei.com>
From: Julien Thierry <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 | 11 +++++++++++
tools/objtool/check.c | 3 +++
2 files changed, 14 insertions(+)
diff --git a/tools/objtool/arch/arm64/special.c b/tools/objtool/arch/arm64/special.c
index a70b91e8bd7d..8bb1ebd2132a 100644
--- a/tools/objtool/arch/arm64/special.c
+++ b/tools/objtool/arch/arm64/special.c
@@ -4,6 +4,17 @@
void arch_handle_alternative(unsigned short feature, struct special_alt *alt)
{
+ /*
+ * 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
+ */
+ if (alt->orig_len && !alt->new_len)
+ 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 b2135da41f48..596974030382 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1647,6 +1647,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.17.1
next prev parent reply other threads:[~2022-04-07 12:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 12:01 [RFC PATCH v3 00/13] objtool: add base support for arm64 Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 01/13] tools: Add some generic functions and headers Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 02/13] tools: arm64: Make aarch64 instruction decoder available to tools Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 03/13] tools: bug: Remove duplicate definition Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 04/13] objtool: arm64: Add base definition for arm64 backend Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 05/13] objtool: arm64: Decode add/sub instructions Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 06/13] objtool: arm64: Decode jump and call related instructions Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 07/13] objtool: arm64: Decode other system instructions Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 08/13] objtool: arm64: Decode load/store instructions Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 09/13] objtool: arm64: Decode LDR instructions Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 10/13] objtool: arm64: Accept non-instruction data in code sections Chen Zhongjin
2022-04-07 12:01 ` [RFC PATCH v3 11/13] objtool: arm64: Handle supported relocations in alternatives Chen Zhongjin
2022-04-07 12:01 ` Chen Zhongjin [this message]
2022-04-07 12:01 ` [RFC PATCH v3 13/13] objtool: arm64: Enable stack validation for arm64 Chen Zhongjin
2022-04-07 12:19 ` Peter Zijlstra
2022-04-08 9:25 ` 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=20220407120141.43801-13-chenzhongjin@huawei.com \
--to=chenzhongjin@huawei.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=jpoimboe@redhat.com \
--cc=jthierry@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
--cc=ycote@redhat.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
all inboxes | Powered by JetHome®