From: Mark Rutland <mark.rutland@arm.com>
To: Guo Ren <guoren@kernel.org>, peterz@infradead.org
Cc: Lai Jiangshan <laijs@linux.alibaba.com>,
arnd@arndb.de, palmer@rivosinc.com, tglx@linutronix.de,
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, palmer@dabbelt.com,
paul.walmsley@sifive.com, zouyipeng@huawei.com,
bigeasy@linutronix.de, David.Laight@aculab.com,
chenzhongjin@huawei.com, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org,
Borislav Petkov <bp@alien8.de>, Miguel Ojeda <ojeda@kernel.org>,
Kees Cook <keescook@chromium.org>,
Nick Desaulniers <ndesaulniers@google.com>
Subject: Re: [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr
Date: Mon, 24 Oct 2022 12:56:03 +0100 [thread overview]
Message-ID: <Y1Z9U7XN4nlGg8yb@FVFF77S0Q05N> (raw)
In-Reply-To: <CAJF2gTTurEaFjbKvj1tUptq_TLpXeBAE1UstNYxriC-7r5MHpQ@mail.gmail.com>
On Thu, Oct 20, 2022 at 08:29:28PM +0800, Guo Ren wrote:
> Hi Mark and Lai,
>
> On Thu, Oct 20, 2022 at 5:15 PM Mark Rutland <mark.rutland@arm.com> wrote:
> >
> > On Sat, Oct 08, 2022 at 09:54:39AM +0800, Guo Ren wrote:
> > > On Mon, Oct 3, 2022 at 7:39 PM Mark Rutland <mark.rutland@arm.com> wrote:
> > > >
> > > > On Sat, Oct 01, 2022 at 09:24:44PM -0400, guoren@kernel.org wrote:
> > > > > From: Lai Jiangshan <laijs@linux.alibaba.com>
> > > > >
> > > > > And it will be extended for C entry code.
> > > > >
> > > > > Cc: Borislav Petkov <bp@alien8.de>
> > > > > Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
> > > > > Reviewed-by: Kees Cook <keescook@chromium.org>
> > > > > Suggested-by: Nick Desaulniers <ndesaulniers@google.com>
> > > > > Suggested-by: Peter Zijlstra <peterz@infradead.org>
> > > > > Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
> > > > > ---
> > > > > include/linux/compiler_types.h | 8 +++++---
> > > > > 1 file changed, 5 insertions(+), 3 deletions(-)
> > > > >
> > > > > diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
> > > > > index 4f2a819fd60a..e9ce11ea4d8b 100644
> > > > > --- a/include/linux/compiler_types.h
> > > > > +++ b/include/linux/compiler_types.h
> > > > > @@ -227,9 +227,11 @@ struct ftrace_likely_data {
> > > > > #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
> > > > > +#define __noinstr_section(section) \
> > > > > + noinline notrace __section(section) __no_profile \
> > > > > + __no_kcsan __no_sanitize_address __no_sanitize_coverage
> > > > > +
> > > > > +#define noinstr __noinstr_section(".noinstr.text")
> > > >
> > > > One thing proably worth noting here is that while KPROBES will avoid
> > > > instrumenting `.noinstr.text`, that won't happen automatically for other
> > > > __noinstr_section() sections, and that will need to be inhibited through other
> > > > means (e.g. the kprobes blacklist, explicit NOKPROBE_SYMBOL() annotation, or
> > > > otherwise).
> > >
> > > In riscv, "we select HAVE_KPROBES if !XIP_KERNEL", so don't worry
> > > about that. I don't think we could enable kprobe for XIP_KERNEL in the
> > > future.
> >
> > Sure; but someone else might use __noinstr_section() elsewhere where this could
> > matter, and I was suggesting that we could add a comment as above.
> Okay, how about:
>
> /* Be care KPROBES will avoid instrumenting .noinstr.text, not
> __noinstr_section(). */
> #define __noinstr_section(section) \
> noinline notrace __section(section) __no_profile \
> __no_kcsan __no_sanitize_address __no_sanitize_coverage
How about we split this like:
| /*
| * Prevent the compiler from instrumenting this code in any way
| * This does not prevent instrumentation via KPROBES, which must be
| * prevented through other means if necessary.
| */
| #define __no_compiler_instrument \
| noinline notrace noinline notrace __no_kcsan \
| __no_sanitize_address __no_sanitize_coverage
|
| /*
| * Section for code which can't be instrumented at all.
| * Any code in this section cannot be instrumented with KPROBES.
| */
| #define noinstr __no_compiler_instrument section(".noinstr.text")
... then we don't need __noinstr_section(), and IMO the split is
clearer.
Peter?
Thanks,
Mark.
next prev parent reply other threads:[~2022-10-24 12:21 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-02 1:24 [PATCH V6 00/11] riscv: Add GENERIC_ENTRY support and related features guoren
2022-10-02 1:24 ` [PATCH V6 01/11] riscv: elf_kexec: Fixup compile warning guoren
2022-10-25 1:20 ` liaochang (A)
2022-10-25 2:36 ` Guo Ren
2022-10-02 1:24 ` [PATCH V6 02/11] riscv: compat_syscall_table: " guoren
2022-10-02 1:24 ` [PATCH V6 03/11] riscv: ptrace: Remove duplicate operation guoren
2022-10-02 1:24 ` [PATCH V6 04/11] compiler_types.h: Add __noinstr_section() for noinstr guoren
2022-10-03 11:38 ` Mark Rutland
2022-10-08 1:54 ` Guo Ren
2022-10-20 9:15 ` Mark Rutland
2022-10-20 12:29 ` Guo Ren
2022-10-24 11:56 ` Mark Rutland [this message]
2022-10-24 12:06 ` Peter Zijlstra
2022-10-24 12:14 ` Mark Rutland
2022-10-25 2:51 ` Guo Ren
2022-10-25 9:47 ` Mark Rutland
2022-10-02 1:24 ` [PATCH V6 05/11] riscv: traps: Add noinstr to prevent instrumentation inserted guoren
2022-10-03 11:40 ` Mark Rutland
2022-10-08 2:16 ` Guo Ren
2022-10-02 1:24 ` [PATCH V6 06/11] riscv: convert to generic entry guoren
2022-10-02 1:24 ` [PATCH V6 07/11] riscv: Support HAVE_IRQ_EXIT_ON_IRQ_STACK guoren
2022-10-02 1:24 ` [PATCH V6 08/11] riscv: Support HAVE_SOFTIRQ_ON_OWN_STACK guoren
2022-10-02 1:24 ` [PATCH V6 09/11] riscv: Add support for STACKLEAK gcc plugin guoren
2022-10-03 11:34 ` Mark Rutland
2022-10-08 0:16 ` Guo Ren
2022-10-08 3:26 ` Guo Ren
2022-10-08 3:44 ` Guo Ren
2022-10-02 1:24 ` [PATCH V6 10/11] riscv: Add config of thread stack size guoren
2022-10-02 1:24 ` [PATCH V6 11/11] riscv: remove extra level wrappers of trace_hardirqs_{on,off} guoren
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=Y1Z9U7XN4nlGg8yb@FVFF77S0Q05N \
--to=mark.rutland@arm.com \
--cc=David.Laight@aculab.com \
--cc=apatel@ventanamicro.com \
--cc=arnd@arndb.de \
--cc=atishp@atishpatra.org \
--cc=bigeasy@linutronix.de \
--cc=bp@alien8.de \
--cc=chenhuacai@kernel.org \
--cc=chenzhongjin@huawei.com \
--cc=conor.dooley@microchip.com \
--cc=falcon@tinylab.org \
--cc=guoren@kernel.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=ndesaulniers@google.com \
--cc=ojeda@kernel.org \
--cc=palmer@dabbelt.com \
--cc=palmer@rivosinc.com \
--cc=paul.walmsley@sifive.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=zouyipeng@huawei.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;
as well as URLs for NNTP newsgroup(s).