All of lore.kernel.org
 help / color / mirror / Atom feed
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: <jpoimboe@kernel.org>, <peterz@infradead.org>,
	<catalin.marinas@arm.com>, <will@kernel.org>,
	<masahiroy@kernel.org>, <michal.lkml@markovi.net>,
	<ndesaulniers@google.com>, <mark.rutland@arm.com>,
	<pasha.tatashin@soleen.com>, <broonie@kernel.org>,
	<chenzhongjin@huawei.com>, <rmk+kernel@armlinux.org.uk>,
	<madvenka@linux.microsoft.com>, <christophe.leroy@csgroup.eu>,
	<daniel.thompson@linaro.org>
Subject: [PATCH v6 10/33] objtool: arm64: Handle supported relocations in alternatives
Date: Thu, 23 Jun 2022 09:48:54 +0800	[thread overview]
Message-ID: <20220623014917.199563-11-chenzhongjin@huawei.com> (raw)
In-Reply-To: <20220623014917.199563-1-chenzhongjin@huawei.com>

Based on get_alt_insn() in arch/arm64/kernel/alternative.c, arm64
alternative code adapts offsets for static branches and adrp
instructions.

Signed-off-by: Julien Thierry <jthierry@redhat.com>
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
---
 tools/objtool/arch/arm64/special.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/objtool/arch/arm64/special.c b/tools/objtool/arch/arm64/special.c
index 45f283283091..a70b91e8bd7d 100644
--- a/tools/objtool/arch/arm64/special.c
+++ b/tools/objtool/arch/arm64/special.c
@@ -10,7 +10,11 @@ bool arch_support_alt_relocation(struct special_alt *special_alt,
 				 struct instruction *insn,
 				 struct reloc *reloc)
 {
-	return false;
+	u32 opcode = *(u32 *)(insn->sec->data->d_buf + insn->offset);
+
+	return aarch64_insn_is_branch_imm(opcode) ||
+	       aarch64_insn_is_adrp(opcode) ||
+	       !aarch64_insn_uses_literal(opcode);
 }
 
 
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
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,
	daniel.thompson@linaro.org, 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 v6 10/33] objtool: arm64: Handle supported relocations in alternatives
Date: Thu, 23 Jun 2022 09:48:54 +0800	[thread overview]
Message-ID: <20220623014917.199563-11-chenzhongjin@huawei.com> (raw)
In-Reply-To: <20220623014917.199563-1-chenzhongjin@huawei.com>

Based on get_alt_insn() in arch/arm64/kernel/alternative.c, arm64
alternative code adapts offsets for static branches and adrp
instructions.

Signed-off-by: Julien Thierry <jthierry@redhat.com>
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
---
 tools/objtool/arch/arm64/special.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/objtool/arch/arm64/special.c b/tools/objtool/arch/arm64/special.c
index 45f283283091..a70b91e8bd7d 100644
--- a/tools/objtool/arch/arm64/special.c
+++ b/tools/objtool/arch/arm64/special.c
@@ -10,7 +10,11 @@ bool arch_support_alt_relocation(struct special_alt *special_alt,
 				 struct instruction *insn,
 				 struct reloc *reloc)
 {
-	return false;
+	u32 opcode = *(u32 *)(insn->sec->data->d_buf + insn->offset);
+
+	return aarch64_insn_is_branch_imm(opcode) ||
+	       aarch64_insn_is_adrp(opcode) ||
+	       !aarch64_insn_uses_literal(opcode);
 }
 
 
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
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: <jpoimboe@kernel.org>, <peterz@infradead.org>,
	<catalin.marinas@arm.com>, <will@kernel.org>,
	<masahiroy@kernel.org>, <michal.lkml@markovi.net>,
	<ndesaulniers@google.com>, <mark.rutland@arm.com>,
	<pasha.tatashin@soleen.com>, <broonie@kernel.org>,
	<chenzhongjin@huawei.com>, <rmk+kernel@armlinux.org.uk>,
	<madvenka@linux.microsoft.com>, <christophe.leroy@csgroup.eu>,
	<daniel.thompson@linaro.org>
Subject: [PATCH v6 10/33] objtool: arm64: Handle supported relocations in alternatives
Date: Thu, 23 Jun 2022 09:48:54 +0800	[thread overview]
Message-ID: <20220623014917.199563-11-chenzhongjin@huawei.com> (raw)
In-Reply-To: <20220623014917.199563-1-chenzhongjin@huawei.com>

Based on get_alt_insn() in arch/arm64/kernel/alternative.c, arm64
alternative code adapts offsets for static branches and adrp
instructions.

Signed-off-by: Julien Thierry <jthierry@redhat.com>
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
---
 tools/objtool/arch/arm64/special.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/objtool/arch/arm64/special.c b/tools/objtool/arch/arm64/special.c
index 45f283283091..a70b91e8bd7d 100644
--- a/tools/objtool/arch/arm64/special.c
+++ b/tools/objtool/arch/arm64/special.c
@@ -10,7 +10,11 @@ bool arch_support_alt_relocation(struct special_alt *special_alt,
 				 struct instruction *insn,
 				 struct reloc *reloc)
 {
-	return false;
+	u32 opcode = *(u32 *)(insn->sec->data->d_buf + insn->offset);
+
+	return aarch64_insn_is_branch_imm(opcode) ||
+	       aarch64_insn_is_adrp(opcode) ||
+	       !aarch64_insn_uses_literal(opcode);
 }
 
 
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-06-23  1:53 UTC|newest]

Thread overview: 123+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-23  1:48 [PATCH v5 00/33] objtool: add base support for arm64 Chen Zhongjin
2022-06-23  1:48 ` Chen Zhongjin
2022-06-23  1:48 ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 01/33] tools: arm64: Make aarch64 instruction decoder available to tools Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 02/33] objtool: arm64: Add base definition for arm64 backend Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 03/33] objtool: arm64: Decode add/sub instructions Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 04/33] objtool: arm64: Decode jump and call related instructions Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 05/33] objtool: arm64: Decode other system instructions Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 06/33] objtool: arm64: Decode load/store instructions Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 07/33] objtool: arm64: Decode LDR instructions Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 08/33] objtool: arm64: Accept non-instruction data in code sections Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 09/33] objtool: check: Support data in text section Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` Chen Zhongjin [this message]
2022-06-23  1:48   ` [PATCH v6 10/33] objtool: arm64: Handle supported relocations in alternatives Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 11/33] objtool: arm64: Ignore replacement section for alternative callback Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 12/33] objtool: arm64: Enable stack validation for arm64 Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 13/33] objtool: arm64: Enable ORC " Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 14/33] objtool: arm64: Add annotate_reachable() for objtools Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48 ` [PATCH v6 15/33] arm64: bug: Add reachable annotation to warning macros Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:48   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 16/33] arm64: kgdb: Add reachable annotation after kgdb brk Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 17/33] objtool: arm64: Add unwind_hint support Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 18/33] arm64: Change symbol type annotations Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-29 17:47   ` Mark Brown
2022-06-29 17:47     ` Mark Brown
2022-06-29 17:47     ` Mark Brown
2022-06-30  2:41     ` Chen Zhongjin
2022-06-30  2:41       ` Chen Zhongjin
2022-06-30  2:41       ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 19/33] arm64: Annotate unwind_hint for symbols with empty stack Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 20/33] arm64: entry: Annotate unwind_hint for entry Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 21/33] arm64: kvm: Annotate unwind_hint for hyp entry Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 22/33] arm64: efi-header: Mark efi header as data Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-29 18:03   ` Mark Brown
2022-06-29 18:03     ` Mark Brown
2022-06-29 18:03     ` Mark Brown
2022-06-23  1:49 ` [PATCH v6 23/33] arm64: head: Mark constants " Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 24/33] arm64: proc: Mark constant " Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-29 18:06   ` Mark Brown
2022-06-29 18:06     ` Mark Brown
2022-06-29 18:06     ` Mark Brown
2022-06-23  1:49 ` [PATCH v6 25/33] arm64: crypto: " Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-29 18:20   ` Mark Brown
2022-06-29 18:20     ` Mark Brown
2022-06-29 18:20     ` Mark Brown
2022-06-23  1:49 ` [PATCH v6 26/33] arm64: crypto: Remove unnecessary stackframe Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 27/33] arm64: Set intra-function call annotations Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 28/33] arm64: sleep: Properly set frame pointer before call Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 29/33] arm64: compat: Move VDSO code to .rodata section Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 30/33] arm64: entry: Align stack size for alternative Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 31/33] arm64: kernel: Skip validation of proton-pack.c Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 32/33] arm64: irq-gic: Replace unreachable() with -EINVAL Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  8:13   ` Marc Zyngier
2022-06-23  8:13     ` Marc Zyngier
2022-06-23  8:13     ` Marc Zyngier
2022-06-24  1:24     ` Chen Zhongjin
2022-06-24  1:24       ` Chen Zhongjin
2022-06-24  1:24       ` Chen Zhongjin
2022-06-23  1:49 ` [PATCH v6 33/33] objtool: revert c_file fallthrough detection for arm64 Chen Zhongjin
2022-06-23  1:49   ` Chen Zhongjin
2022-06-23  1:49   ` 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=20220623014917.199563-11-chenzhongjin@huawei.com \
    --to=chenzhongjin@huawei.com \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=christophe.leroy@csgroup.eu \
    --cc=daniel.thompson@linaro.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.