From: Vladimir Murzin <vladimir.murzin@arm.com>
To: Ada Couprie Diaz <ada.coupriediaz@arm.com>,
linux-arm-kernel@lists.infradead.org,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>
Cc: Marc Zyngier <maz@kernel.org>, Kiryl Shutsemau <kas@kernel.org>,
Breno Leitao <leitao@debian.org>,
Jinjie Ruan <ruanjinjie@huawei.com>,
Doug Anderson <dianders@chromium.org>,
Linus Walleij <linusw@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Huth <thuth@redhat.com>, Dawei Li <dawei.li@linux.dev>,
mrigendrachaubey <mrigendra.chaubey@gmail.com>,
kernel-team@meta.com, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH 2/3] arm64: entry: sdei: save and restore PMR for pseudo-NMI
Date: Wed, 18 Nov 2026 09:58:34 +0000 [thread overview]
Message-ID: <628b2774-30bc-4399-98c3-2d99ad5090b6@arm.com> (raw)
In-Reply-To: <20261117174814.95936-3-ada.coupriediaz@arm.com>
Hi Ada,
On 11/17/26 17:48, Ada Couprie Diaz wrote:
> If using pseudo-NMI, PMR must be saved and restored on exception
> entry/exit. We do so, and set it to a known value reflecting that DAIF
> is masking all interrupts, in the regular entry path.
>
> Do the same for SDEI, as it can interrupt the kernel at any point
> and does not mandate firmware to touch PMR, but does mandate masking DAIF.
> This avoids potentially returning with a different PMR than interrupted,
> and SDEI having the DAIF/PMR pair in a unexpected state compared to
> the rest of the kernel.
>
I think we need to save/restore PMR into/from pt_regs similarly to regular
entry path, otherwise regs_irqs_disabled() is still broken, like it was
pointed in the thread [1] (and Sashiko has raised the same concern on
FEAT_NMI series)
Cheers
Vladimir
[1] https://lore.kernel.org/all/auzM-l40BLsT3clg@arm.com/
> Fixes: 133d05186325 ("arm64: Make PMR part of task context")
> Cc: stable@vger.kernel.org
> Signed-off-by: Ada Couprie Diaz <ada.coupriediaz@arm.com>
> ---
> arch/arm64/kernel/entry-common.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c
> index cb122163a68d..17a14c55532c 100644
> --- a/arch/arm64/kernel/entry-common.c
> +++ b/arch/arm64/kernel/entry-common.c
> @@ -1041,7 +1041,7 @@ asmlinkage void noinstr __noreturn handle_bad_stack(struct pt_regs *regs)
> asmlinkage noinstr unsigned long
> __sdei_handler(struct pt_regs *regs, struct sdei_registered_event *arg)
> {
> - unsigned long elr, spsr, esr, far, vbar;
> + unsigned long pmr, elr, spsr, esr, far, vbar;
> irqentry_state_t state;
> unsigned long ret;
>
> @@ -1067,6 +1067,16 @@ __sdei_handler(struct pt_regs *regs, struct sdei_registered_event *arg)
> else if (cpu_has_pan())
> set_pstate_pan(0);
>
> + /*
> + * Regular kernel entry saves and resets the PMR to align with DAIF,
> + * but __sdei_asm_handler() does not ; do it now.
> + */
> + if (system_uses_irq_prio_masking()) {
> + pmr = read_sysreg_s(SYS_ICC_PMR_EL1);
> + write_sysreg_s(GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET,
> + SYS_ICC_PMR_EL1);
> + }
> +
> /*
> * Nothing saved the interrupted context's exception registers on the
> * way in, and it may be in the middle of exception entry or return
> @@ -1110,6 +1120,9 @@ __sdei_handler(struct pt_regs *regs, struct sdei_registered_event *arg)
> write_sysreg(far, far_el1);
> write_sysreg(vbar, vbar_el1);
>
> + if (system_uses_irq_prio_masking())
> + write_sysreg_s(pmr, SYS_ICC_PMR_EL1);
> +
> return ret;
> }
> #endif /* CONFIG_ARM_SDE_INTERFACE */
> -- 2.43.0
>
next prev parent reply other threads:[~2026-11-18 9:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 17:48 [PATCH 0/3] arm64: sdei: fix entry edge cases, pseudo-NMI Ada Couprie Diaz
2026-11-17 17:48 ` [PATCH 1/3] arm64: entry: sdei: always set VBAR_EL1 on SDEI entry Ada Couprie Diaz
2026-11-17 17:48 ` [PATCH 2/3] arm64: entry: sdei: save and restore PMR for pseudo-NMI Ada Couprie Diaz
2026-11-18 9:58 ` Vladimir Murzin [this message]
2026-11-17 17:48 ` [PATCH 3/3] arm64: head: set __entry_task along with task setup Ada Couprie Diaz
2026-11-18 11:01 ` Vladimir Murzin
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=628b2774-30bc-4399-98c3-2d99ad5090b6@arm.com \
--to=vladimir.murzin@arm.com \
--cc=ada.coupriediaz@arm.com \
--cc=catalin.marinas@arm.com \
--cc=dawei.li@linux.dev \
--cc=dianders@chromium.org \
--cc=kas@kernel.org \
--cc=kernel-team@meta.com \
--cc=leitao@debian.org \
--cc=linusw@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=mrigendra.chaubey@gmail.com \
--cc=peterz@infradead.org \
--cc=ruanjinjie@huawei.com \
--cc=stable@vger.kernel.org \
--cc=thuth@redhat.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®