From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Nicholas Piggin <npiggin@gmail•com>
Cc: PowerPC <linuxppc-dev@lists•ozlabs.org>,
Michael Ellerman <mpe@ellerman•id.au>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the powerpc tree
Date: Wed, 10 Feb 2021 22:18:14 +1100 [thread overview]
Message-ID: <20210210221814.22c3ab52@canb.auug.org.au> (raw)
In-Reply-To: <1612945076.ng7h3tp2jn.astroid@bobo.none>
[-- Attachment #1: Type: text/plain, Size: 3420 bytes --]
Hi Nick,
On Wed, 10 Feb 2021 18:20:54 +1000 Nicholas Piggin <npiggin@gmail•com> wrote:
>
> Thanks for that, it's due to .noinstr section being put on the other
> side of .text, so all our interrupt handler asm code can't reach them
> directly anymore since the ppc interrupt wrappers patch added noinstr
> attribute.
>
> That's not strictly required though, we've used NOKPROBE_SYMBOL okay
> until now. If you can take this patch for now, it should get
> allyesconfig to build again. I'll fix it in the powerpc tree before the
> merge window.
>
> --
>
> diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
> index 4badb3e51c19..fee1e4dd1e84 100644
> --- a/arch/powerpc/include/asm/interrupt.h
> +++ b/arch/powerpc/include/asm/interrupt.h
> @@ -172,6 +172,8 @@ static inline void interrupt_nmi_exit_prepare(struct pt_regs *regs, struct inter
> #define DECLARE_INTERRUPT_HANDLER_RAW(func) \
> __visible long func(struct pt_regs *regs)
>
> +#define ppc_noinstr noinline notrace __no_kcsan __no_sanitize_address
> +
> /**
> * DEFINE_INTERRUPT_HANDLER_RAW - Define raw interrupt handler function
> * @func: Function name of the entry point
> @@ -198,7 +200,7 @@ static inline void interrupt_nmi_exit_prepare(struct pt_regs *regs, struct inter
> #define DEFINE_INTERRUPT_HANDLER_RAW(func) \
> static __always_inline long ____##func(struct pt_regs *regs); \
> \
> -__visible noinstr long func(struct pt_regs *regs) \
> +__visible ppc_noinstr long func(struct pt_regs *regs) \
> { \
> long ret; \
> \
> @@ -228,7 +230,7 @@ static __always_inline long ____##func(struct pt_regs *regs)
> #define DEFINE_INTERRUPT_HANDLER(func) \
> static __always_inline void ____##func(struct pt_regs *regs); \
> \
> -__visible noinstr void func(struct pt_regs *regs) \
> +__visible ppc_noinstr void func(struct pt_regs *regs) \
> { \
> struct interrupt_state state; \
> \
> @@ -262,7 +264,7 @@ static __always_inline void ____##func(struct pt_regs *regs)
> #define DEFINE_INTERRUPT_HANDLER_RET(func) \
> static __always_inline long ____##func(struct pt_regs *regs); \
> \
> -__visible noinstr long func(struct pt_regs *regs) \
> +__visible ppc_noinstr long func(struct pt_regs *regs) \
> { \
> struct interrupt_state state; \
> long ret; \
> @@ -297,7 +299,7 @@ static __always_inline long ____##func(struct pt_regs *regs)
> #define DEFINE_INTERRUPT_HANDLER_ASYNC(func) \
> static __always_inline void ____##func(struct pt_regs *regs); \
> \
> -__visible noinstr void func(struct pt_regs *regs) \
> +__visible ppc_noinstr void func(struct pt_regs *regs) \
> { \
> struct interrupt_state state; \
> \
> @@ -331,7 +333,7 @@ static __always_inline void ____##func(struct pt_regs *regs)
> #define DEFINE_INTERRUPT_HANDLER_NMI(func) \
> static __always_inline long ____##func(struct pt_regs *regs); \
> \
> -__visible noinstr long func(struct pt_regs *regs) \
> +__visible ppc_noinstr long func(struct pt_regs *regs) \
> { \
> struct interrupt_nmi_state state; \
> long ret; \
Tested-by: Stephen Rothwell <sfr@canb•auug.org.au> # allyesconfig build
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-02-10 11:21 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 10:19 linux-next: build failure after merge of the powerpc tree Stephen Rothwell
2021-02-10 8:20 ` Nicholas Piggin
2021-02-10 11:18 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-09 10:09 Stephen Rothwell
2024-09-09 14:22 ` Christophe Leroy
2024-09-09 14:58 ` Stephen Rothwell
2024-09-09 16:23 ` Masahiro Yamada
2024-09-09 17:28 ` Christophe Leroy
2023-02-10 3:38 Stephen Rothwell
2023-02-12 23:22 ` Michael Ellerman
2021-04-19 9:14 Stephen Rothwell
2021-04-19 9:59 ` Xiongwei Song
2021-04-19 12:24 ` Michael Ellerman
2020-04-22 5:41 Stephen Rothwell
2020-04-22 6:35 ` Haren Myneni
2020-04-25 23:52 ` Michael Ellerman
2019-09-30 0:13 Stephen Rothwell
2019-10-03 23:05 ` Michael Ellerman
2019-10-11 8:22 ` Michael Ellerman
2019-09-02 11:40 Stephen Rothwell
2019-09-02 11:52 ` Christoph Hellwig
2019-02-22 7:14 Stephen Rothwell
2019-02-22 7:37 ` Christophe Leroy
2019-02-22 11:28 ` Michael Ellerman
2018-03-29 7:43 Stephen Rothwell
2018-01-19 5:53 Stephen Rothwell
2018-01-18 22:26 Stephen Rothwell
2017-11-02 6:49 Stephen Rothwell
2017-11-14 11:12 ` Michael Ellerman
2016-11-22 8:58 Stephen Rothwell
2016-11-22 10:21 ` Stephen Rothwell
2016-11-23 2:02 ` Nicholas Piggin
2016-07-22 6:31 Stephen Rothwell
2016-07-01 5:27 Stephen Rothwell
2016-07-01 8:59 ` Colin Ian King
2016-01-07 8:16 Stephen Rothwell
2016-01-07 10:30 ` Michael Ellerman
2016-01-13 5:46 ` Aneesh Kumar K.V
2016-01-13 7:44 ` Michael Ellerman
2016-01-12 12:32 ` Michael Ellerman
2015-08-21 8:25 Stephen Rothwell
2015-08-21 8:59 ` Vasant Hegde
2015-08-21 23:40 ` Michael Ellerman
2015-08-22 4:09 ` Vasant Hegde
2015-08-22 11:16 ` Michael Ellerman
2014-08-06 6:31 Stephen Rothwell
2013-07-02 0:54 Stephen Rothwell
2013-07-02 2:00 ` Benjamin Herrenschmidt
2012-11-28 3:03 Stephen Rothwell
2012-11-28 4:28 ` Benjamin Herrenschmidt
2011-07-01 1:39 Stephen Rothwell
2011-07-01 3:00 ` Benjamin Herrenschmidt
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=20210210221814.22c3ab52@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=npiggin@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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