From: guoren@kernel.org
To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com,
tglx@linutronix.de, peterz@infradead.org, luto@kernel.org,
conor.dooley@microchip.com, heiko@sntech.de, jszhang@kernel.org,
lazyparser@gmail.com, falcon@tinylab.org, chenhuacai@kernel.org,
apatel@ventanamicro.com, atishp@atishpatra.org,
mark.rutland@arm.com, ben@decadent.org.uk, bjorn@kernel.org
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-riscv@lists.infradead.org,
"Lai Jiangshan" <laijs@linux.alibaba.com>,
"Borislav Petkov" <bp@alien8.de>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Kees Cook" <keescook@chromium.org>,
"Björn Töpel" <bjorn@rivosinc.com>,
"Nick Desaulniers" <ndesaulniers@google.com>
Subject: [PATCH -next V15 1/7] compiler_types.h: Add __noinstr_section() for noinstr
Date: Thu, 26 Jan 2023 12:25:10 -0500 [thread overview]
Message-ID: <20230126172516.1580058-2-guoren@kernel.org> (raw)
In-Reply-To: <20230126172516.1580058-1-guoren@kernel.org>
From: Lai Jiangshan <laijs@linux.alibaba.com>
Using __noinstr_section() doesn't automatically disable all
instrumentations on the section. Inhibition for some
instrumentations requires extra code. I.E. KPROBES explicitly
avoids instrumenting on .noinstr.text.
Cc: Borislav Petkov <bp@alien8.de>
Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Björn Töpel <bjorn@rivosinc.com>
Suggested-by: Nick Desaulniers <ndesaulniers@google.com>
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Tested-by: Jisheng Zhang <jszhang@kernel.org>
Tested-by: Guo Ren <guoren@kernel.org>
Signed-off-by: Guo Ren <guoren@kernel.org>
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
---
include/linux/compiler_types.h | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 7c1afe0f4129..0a2ca5755be7 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -231,12 +231,19 @@ struct ftrace_likely_data {
#define __no_sanitize_or_inline __always_inline
#endif
-/* Section for code which can't be instrumented at all */
-#define noinstr \
- noinline notrace __attribute((__section__(".noinstr.text"))) \
- __no_kcsan __no_sanitize_address __no_profile __no_sanitize_coverage \
+/*
+ * Using __noinstr_section() doesn't automatically disable all instrumentations
+ * on the section. Inhibition for some instrumentations requires extra code.
+ * I.E. KPROBES explicitly avoids instrumenting on .noinstr.text.
+ */
+#define __noinstr_section(section) \
+ noinline notrace __section(section) __no_profile \
+ __no_kcsan __no_sanitize_address __no_sanitize_coverage \
__no_sanitize_memory
+/* Section for code which can't be instrumented at all */
+#define noinstr __noinstr_section(".noinstr.text")
+
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */
--
2.36.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2023-01-26 17:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 17:25 [PATCH -next V15 0/7] riscv: Add GENERIC_ENTRY support guoren
2023-01-26 17:25 ` guoren [this message]
2023-01-26 19:14 ` [PATCH -next V15 1/7] compiler_types.h: Add __noinstr_section() for noinstr Miguel Ojeda
2023-01-27 1:55 ` Guo Ren
2023-01-26 17:25 ` [PATCH -next V15 2/7] riscv: ptrace: Remove duplicate operation guoren
2023-01-26 17:25 ` [PATCH -next V15 3/7] riscv: entry: Add noinstr to prevent instrumentation inserted guoren
2023-01-26 17:25 ` [PATCH -next V15 4/7] riscv: entry: Convert to generic entry guoren
2023-01-26 17:25 ` [PATCH -next V15 5/7] riscv: entry: Remove extra level wrappers of trace_hardirqs_{on,off} guoren
2023-01-26 17:25 ` [PATCH -next V15 6/7] riscv: entry: Consolidate ret_from_kernel_thread into ret_from_fork guoren
2023-01-26 17:25 ` [PATCH -next V15 7/7] riscv: entry: Consolidate general regs saving/restoring guoren
2023-01-26 19:25 ` [PATCH -next V15 0/7] riscv: Add GENERIC_ENTRY support Conor Dooley
2023-01-27 9:15 ` Björn Töpel
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=20230126172516.1580058-2-guoren@kernel.org \
--to=guoren@kernel.org \
--cc=apatel@ventanamicro.com \
--cc=arnd@arndb.de \
--cc=atishp@atishpatra.org \
--cc=ben@decadent.org.uk \
--cc=bjorn@kernel.org \
--cc=bjorn@rivosinc.com \
--cc=bp@alien8.de \
--cc=chenhuacai@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=falcon@tinylab.org \
--cc=heiko@sntech.de \
--cc=jszhang@kernel.org \
--cc=keescook@chromium.org \
--cc=laijs@linux.alibaba.com \
--cc=lazyparser@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=ndesaulniers@google.com \
--cc=ojeda@kernel.org \
--cc=palmer@rivosinc.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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).