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>
Subject: [PATCH v5 14/33] objtool: arm64: Add annotate_reachable() for objtools
Date: Wed, 22 Jun 2022 23:49:01 +0800 [thread overview]
Message-ID: <20220622154920.95075-15-chenzhongjin@huawei.com> (raw)
In-Reply-To: <20220622154920.95075-1-chenzhongjin@huawei.com>
x86 removed annotate_reachable and replaced it with ASM_REACHABLE
which is not suitable for arm64 micro because there are some cases
GCC will merge duplicate inline asm.
Re-add annotation_reachable() for arm64.
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
---
include/linux/compiler.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 01ce94b58b42..c8bce9421fa7 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -117,6 +117,14 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
*/
#define __stringify_label(n) #n
+#define __annotate_reachable(c) ({ \
+ asm volatile(__stringify_label(c) ":\n\t" \
+ ".pushsection .discard.reachable\n\t" \
+ ".long " __stringify_label(c) "b - .\n\t" \
+ ".popsection\n\t"); \
+})
+#define annotate_reachable() __annotate_reachable(__COUNTER__)
+
#define __annotate_unreachable(c) ({ \
asm volatile(__stringify_label(c) ":\n\t" \
".pushsection .discard.unreachable\n\t" \
@@ -129,6 +137,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
#define __annotate_jump_table __section(".rodata..c_jump_table")
#else /* !CONFIG_OBJTOOL */
+#define annotate_reachable()
#define annotate_unreachable()
#define __annotate_jump_table
#endif /* CONFIG_OBJTOOL */
--
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,
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 14/33] objtool: arm64: Add annotate_reachable() for objtools
Date: Wed, 22 Jun 2022 23:49:01 +0800 [thread overview]
Message-ID: <20220622154920.95075-15-chenzhongjin@huawei.com> (raw)
In-Reply-To: <20220622154920.95075-1-chenzhongjin@huawei.com>
x86 removed annotate_reachable and replaced it with ASM_REACHABLE
which is not suitable for arm64 micro because there are some cases
GCC will merge duplicate inline asm.
Re-add annotation_reachable() for arm64.
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
---
include/linux/compiler.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 01ce94b58b42..c8bce9421fa7 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -117,6 +117,14 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
*/
#define __stringify_label(n) #n
+#define __annotate_reachable(c) ({ \
+ asm volatile(__stringify_label(c) ":\n\t" \
+ ".pushsection .discard.reachable\n\t" \
+ ".long " __stringify_label(c) "b - .\n\t" \
+ ".popsection\n\t"); \
+})
+#define annotate_reachable() __annotate_reachable(__COUNTER__)
+
#define __annotate_unreachable(c) ({ \
asm volatile(__stringify_label(c) ":\n\t" \
".pushsection .discard.unreachable\n\t" \
@@ -129,6 +137,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
#define __annotate_jump_table __section(".rodata..c_jump_table")
#else /* !CONFIG_OBJTOOL */
+#define annotate_reachable()
#define annotate_unreachable()
#define __annotate_jump_table
#endif /* CONFIG_OBJTOOL */
--
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>
Subject: [PATCH v5 14/33] objtool: arm64: Add annotate_reachable() for objtools
Date: Wed, 22 Jun 2022 23:49:01 +0800 [thread overview]
Message-ID: <20220622154920.95075-15-chenzhongjin@huawei.com> (raw)
In-Reply-To: <20220622154920.95075-1-chenzhongjin@huawei.com>
x86 removed annotate_reachable and replaced it with ASM_REACHABLE
which is not suitable for arm64 micro because there are some cases
GCC will merge duplicate inline asm.
Re-add annotation_reachable() for arm64.
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
---
include/linux/compiler.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 01ce94b58b42..c8bce9421fa7 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -117,6 +117,14 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
*/
#define __stringify_label(n) #n
+#define __annotate_reachable(c) ({ \
+ asm volatile(__stringify_label(c) ":\n\t" \
+ ".pushsection .discard.reachable\n\t" \
+ ".long " __stringify_label(c) "b - .\n\t" \
+ ".popsection\n\t"); \
+})
+#define annotate_reachable() __annotate_reachable(__COUNTER__)
+
#define __annotate_unreachable(c) ({ \
asm volatile(__stringify_label(c) ":\n\t" \
".pushsection .discard.unreachable\n\t" \
@@ -129,6 +137,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
#define __annotate_jump_table __section(".rodata..c_jump_table")
#else /* !CONFIG_OBJTOOL */
+#define annotate_reachable()
#define annotate_unreachable()
#define __annotate_jump_table
#endif /* CONFIG_OBJTOOL */
--
2.17.1
_______________________________________________
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:[~2022-06-22 15:54 UTC|newest]
Thread overview: 108+ 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 ` Chen Zhongjin
2022-06-22 15:48 ` 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 ` Chen Zhongjin
2022-06-22 15:48 ` 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 ` Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 03/33] objtool: arm64: Decode add/sub instructions Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` 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 ` Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 05/33] objtool: arm64: Decode other system instructions Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 06/33] objtool: arm64: Decode load/store instructions Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 07/33] objtool: arm64: Decode LDR instructions Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` 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
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 09/33] objtool: check: Support data in text section Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 10/33] objtool: arm64: Handle supported relocations in alternatives Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` 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 ` Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` [PATCH v5 12/33] objtool: arm64: Enable stack validation for arm64 Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:48 ` Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 13/33] objtool: arm64: Enable ORC " Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin [this message]
2022-06-22 15:49 ` [PATCH v5 14/33] objtool: arm64: Add annotate_reachable() for objtools Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 17/33] objtool: arm64: Add unwind_hint support Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 18/33] arm64: Change symbol type annotations Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 23/33] arm64: head: Mark constants " Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 24/33] arm64: proc: Mark constant " Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 25/33] arm64: crypto: " Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 26/33] arm64: crypto: Remove unnecessary stackframe Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 27/33] arm64: Set intra-function call annotations Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` 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 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` [PATCH v5 33/33] objtool: revert c_file fallthrough detection for arm64 Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 15:49 ` Chen Zhongjin
2022-06-22 17:19 ` [PATCH v5 00/33] objtool: add base support " Daniel Thompson
2022-06-22 17:19 ` Daniel Thompson
2022-06-22 17:19 ` Daniel Thompson
2022-06-23 1:37 ` Chen Zhongjin
2022-06-23 1:37 ` Chen Zhongjin
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-15-chenzhongjin@huawei.com \
--to=chenzhongjin@huawei.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@csgroup.eu \
--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.