From: Mark Rutland <mark.rutland@arm.com>
To: He Ying <heying24@huawei.com>
Cc: catalin.marinas@arm.com, will@kernel.org, marcan@marcan.st,
maz@kernel.org, joey.gouly@arm.com, pcc@google.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] arm64: entry: Save some nops when CONFIG_ARM64_PSEUDO_NMI is not set
Date: Wed, 19 Jan 2022 09:35:25 +0000 [thread overview]
Message-ID: <20220119093525.GB42546@C02TD0UTHF1T.local> (raw)
In-Reply-To: <e6293ec4-7c56-194a-95f9-98b102d80b31@huawei.com>
On Wed, Jan 19, 2022 at 02:40:58PM +0800, He Ying wrote:
> Hi all,
>
> Ping. Any comments?
The patch looks fine, but as it's the middle of the merge window people
are busy and unlikely to look at this for the next few days.
Generally it's a good idea to wait until rc1 or rc2, rebase atop that,
and post the updated patch. Stuff like this usually gets queued around
rc3/rc4 time.
> 锟斤拷 2022/1/12 11:24, He Ying 写锟斤拷:
> > Arm64 pseudo-NMI feature code brings some additional nops
> > when CONFIG_ARM64_PSEUDO_NMI is not set, which is not
> > necessary. So add necessary ifdeffery to avoid it.
> >
> > Signed-off-by: He Ying <heying24@huawei.com>
FWIW:
Acked-by: Mark Rutland <mark.rutland@arm.com>
Mark.
> > ---
> > arch/arm64/kernel/entry.S | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
> > index 2f69ae43941d..ffc32d3d909a 100644
> > --- a/arch/arm64/kernel/entry.S
> > +++ b/arch/arm64/kernel/entry.S
> > @@ -300,6 +300,7 @@ alternative_else_nop_endif
> > str w21, [sp, #S_SYSCALLNO]
> > .endif
> > +#ifdef CONFIG_ARM64_PSEUDO_NMI
> > /* Save pmr */
> > alternative_if ARM64_HAS_IRQ_PRIO_MASKING
> > mrs_s x20, SYS_ICC_PMR_EL1
> > @@ -307,6 +308,7 @@ alternative_if ARM64_HAS_IRQ_PRIO_MASKING
> > mov x20, #GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET
> > msr_s SYS_ICC_PMR_EL1, x20
> > alternative_else_nop_endif
> > +#endif
> > /* Re-enable tag checking (TCO set on exception entry) */
> > #ifdef CONFIG_ARM64_MTE
> > @@ -330,6 +332,7 @@ alternative_else_nop_endif
> > disable_daif
> > .endif
> > +#ifdef CONFIG_ARM64_PSEUDO_NMI
> > /* Restore pmr */
> > alternative_if ARM64_HAS_IRQ_PRIO_MASKING
> > ldr x20, [sp, #S_PMR_SAVE]
> > @@ -339,6 +342,7 @@ alternative_if ARM64_HAS_IRQ_PRIO_MASKING
> > dsb sy // Ensure priority change is seen by redistributor
> > .L__skip_pmr_sync\@:
> > alternative_else_nop_endif
> > +#endif
> > ldp x21, x22, [sp, #S_PC] // load ELR, SPSR
next prev parent reply other threads:[~2022-01-19 9:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 8:55 [PATCH] arm64: Make CONFIG_ARM64_PSEUDO_NMI macro wrap all the pseudo-NMI code He Ying
2022-01-07 13:19 ` Mark Rutland
2022-01-10 3:00 ` He Ying
2022-01-10 11:26 ` Mark Rutland
2022-01-11 8:52 ` He Ying
2022-01-11 11:05 ` Mark Rutland
2022-01-08 12:51 ` Marc Zyngier
2022-01-10 3:20 ` He Ying
2022-01-12 3:24 ` [PATCH] arm64: entry: Save some nops when CONFIG_ARM64_PSEUDO_NMI is not set He Ying
2022-01-19 6:40 ` He Ying
2022-01-19 9:35 ` Mark Rutland [this message]
2022-01-19 9:47 ` He Ying
2022-02-15 23:18 ` Will Deacon
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=20220119093525.GB42546@C02TD0UTHF1T.local \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=heying24@huawei.com \
--cc=joey.gouly@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=maz@kernel.org \
--cc=pcc@google.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®