From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 81263C43458 for ; Fri, 10 Jul 2026 09:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Content-Transfer-Encoding:Content-Type:In-Reply-To:From:References:To:Subject :MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8m8UUEOWO/yHWHAfratmaqX7eM2V2QgfD1yrUepoNrw=; b=ekxWzSH6Yb1pSb 8H+c3NWvModW2KO3lgVDo6PUsAOCMc69V5WfRsGblODPra4TzQ/Q9/cnJJhliCpw6MTf9ZDF1EDbB D7vqNlGRg6m9I5BD8XeQ01+bnLr7rW1KEr+Qnsp1TdwWW5wR8Qe5Ee079aRszp1XiYwCWF5sD3lYl 7Ik8OPUbMYiPe9h1yTQ5e8x2hRA6a5mge23uxON8E/gv+f8PSEuVQchFrbuwn4w9r8A+pZkehdZyg XxoEKY9TlOR2R/usUgd97xEYWbDpUij/2AfgULmBiU5DLdAuBbnndalwHK4MQHx57iJLWacsca7Eo qSq/cVwqVI1JVOsRDLAA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wi77w-00000004WOV-1OE2; Fri, 10 Jul 2026 09:02:32 +0000 Received: from canpmsgout11.his.huawei.com ([113.46.200.226]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wi77s-00000004WNp-2bS1 for linux-arm-kernel@lists.infradead.org; Fri, 10 Jul 2026 09:02:31 +0000 dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=8m8UUEOWO/yHWHAfratmaqX7eM2V2QgfD1yrUepoNrw=; b=XvcqBMRjwtCRljmu+WVaJ13BD1jtX4YLbQ8x4VaY5l/kTvsbmHwOaA41Pgr+T1UoUPIZ2UMFO lYlpw31FOwVZUPlg2s3/7iuFPcj/4VCZcRgjXJm4TfSvboI5CrxFjsUAtNHXIOLGe1uZtOwp6mG Id1aqYbge6OkDTnq0uyQ0cA= Received: from mail.maildlp.com (unknown [172.19.163.200]) by canpmsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4gxQb30NTQzKm5j; Fri, 10 Jul 2026 16:53:03 +0800 (CST) Received: from dggpemf500011.china.huawei.com (unknown [7.185.36.131]) by mail.maildlp.com (Postfix) with ESMTPS id C9C0D40563; Fri, 10 Jul 2026 17:02:20 +0800 (CST) Received: from [10.67.109.254] (10.67.109.254) by dggpemf500011.china.huawei.com (7.185.36.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 10 Jul 2026 17:02:20 +0800 Message-ID: <793f5269-783c-46b6-847e-b943cf3e2a70@huawei.com> Date: Fri, 10 Jul 2026 17:02:18 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH 10/36] arm64: irqflags: save and use both DAIF and PMR To: Vladimir Murzin , References: <20260709121333.23507-1-vladimir.murzin@arm.com> <20260709121333.23507-11-vladimir.murzin@arm.com> From: Jinjie Ruan In-Reply-To: <20260709121333.23507-11-vladimir.murzin@arm.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.109.254] X-ClientProxiedBy: kwepems500002.china.huawei.com (7.221.188.17) To dggpemf500011.china.huawei.com (7.185.36.131) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260710_020229_312316_9568A7A2 X-CRM114-Status: GOOD ( 28.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, maz@kernel.org, will@kernel.org, catalin.marinas@arm.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 7/9/2026 8:13 PM, Vladimir Murzin wrote: > From: Ada Couprie Diaz > > With pseudo-NMIs enabled, both DAIF and the PMR affect interrupt masking. > Now that we have a type which can track both of them at the same time, > update our irqflags implementation to use it. > > Save DAIF flags in all cases, as they can be manipulated directly by other > code, and the PMR if it is in use. > > When checking if IRQs are disabled, now that we always save DAIF we can > check that the I flag is set and bypass checking the PMR if it is. > We can also properly check if PMR masks interrupts (PMR < GIC_PRIO_IRQON), > now that we don't need to rely on the GIC_PRIO_PSR_I_SET bit being set in > the PMR to know if DAIF is already masking interrupts. > Update `irqs_priority_unmasked()` to align with this change. > > This allows us to remove the `__daif_...` and `__pmr_...` versions > of the save and check functions, as they are now unified. > > We can reasonably merge the two `__{daif,pmr}_irq_restore()` functions > in the main one, as the DAIF and PMR values are properly split now. > > Signed-off-by: Ada Couprie Diaz > Signed-off-by: Vladimir Murzin > --- > arch/arm64/include/asm/irqflags.h | 110 ++++++------------------------ > arch/arm64/include/asm/ptrace.h | 2 +- > 2 files changed, 23 insertions(+), 89 deletions(-) > > diff --git a/arch/arm64/include/asm/irqflags.h b/arch/arm64/include/asm/irqflags.h > index 7775904ba6a9..62f047702493 100644 > --- a/arch/arm64/include/asm/irqflags.h > +++ b/arch/arm64/include/asm/irqflags.h > @@ -95,117 +95,48 @@ static __always_inline void arch_local_irq_disable(void) > } > } > > -static __always_inline arm64_exc_hwstate_t __daif_local_save_flags(void) > -{ > - return (arm64_exc_hwstate_t){ .daif = read_sysreg(daif) }; > -} > - > -static __always_inline arm64_exc_hwstate_t __pmr_local_save_flags(void) > -{ > - return (arm64_exc_hwstate_t){ .pmr = read_sysreg_s(SYS_ICC_PMR_EL1) }; > -} > - > /* > * Save the current interrupt enable state. > */ > static __always_inline unsigned long arch_local_save_flags(void) > { > - if (system_uses_irq_prio_masking()) { > - return __pmr_local_save_flags().flags; > - } else { > - return __daif_local_save_flags().flags; > - } > -} > + arm64_exc_hwstate_t hwstate = { .daif = read_sysreg(daif) }; > > -static __always_inline > -bool __daif_irqs_disabled_flags(arm64_exc_hwstate_t hwstate) > -{ > - return hwstate.daif & PSR_I_BIT; > -} > + if (system_uses_irq_prio_masking()) > + hwstate.pmr = read_sysreg_s(SYS_ICC_PMR_EL1); > > -static __always_inline > -bool __pmr_irqs_disabled_flags(arm64_exc_hwstate_t hwstate) > -{ > - return hwstate.pmr != GIC_PRIO_IRQON; > + return hwstate.flags; > } > > static __always_inline bool arch_irqs_disabled_flags(unsigned long flags) > { > arm64_exc_hwstate_t hwstate = { .flags = flags }; > > - if (system_uses_irq_prio_masking()) { > - return __pmr_irqs_disabled_flags(hwstate); > - } else { > - return __daif_irqs_disabled_flags(hwstate); > - } > -} > + /* If I is set, the PMR doesn't matter: interrupts will not be taken. */ > + if (hwstate.daif & PSR_I_BIT) > + return true; > > -static __always_inline bool __daif_irqs_disabled(void) > -{ > - return __daif_irqs_disabled_flags(__daif_local_save_flags()); > -} > + if (system_uses_irq_prio_masking() && hwstate.pmr < GIC_PRIO_IRQON) I think "hwstate.pmr == GIC_PRIO_IRQOFF" is fine, Besides DAIF.I bit set and pmr is GIC_PRIO_IRQOFF, are there any other possible cases? > + return true; > > -static __always_inline bool __pmr_irqs_disabled(void) > -{ > - return __pmr_irqs_disabled_flags(__pmr_local_save_flags()); > + return false; > } > > static __always_inline bool arch_irqs_disabled(void) > { > - if (system_uses_irq_prio_masking()) { > - return __pmr_irqs_disabled(); > - } else { > - return __daif_irqs_disabled(); > - } > -} > - > -static __always_inline arm64_exc_hwstate_t __daif_local_irq_save(void) > -{ > - arm64_exc_hwstate_t hwstate = __daif_local_save_flags(); > - > - __daif_local_irq_disable(); > - > - return hwstate; > -} > - > -static __always_inline arm64_exc_hwstate_t __pmr_local_irq_save(void) > -{ > - arm64_exc_hwstate_t hwstate = __pmr_local_save_flags(); > - > - /* > - * There are too many states with IRQs disabled, just keep the current > - * state if interrupts are already disabled/masked. > - */ > - if (!__pmr_irqs_disabled_flags(hwstate)) > - __pmr_local_irq_disable(); > - > - return hwstate; > + return arch_irqs_disabled_flags(arch_local_save_flags()); > } > > static __always_inline unsigned long arch_local_irq_save(void) > { > - if (system_uses_irq_prio_masking()) { > - return __pmr_local_irq_save().flags; > - } else { > - return __daif_local_irq_save().flags; > - } > -} > + unsigned long flags = arch_local_save_flags(); > > -static __always_inline > -void __daif_local_irq_restore(arm64_exc_hwstate_t hwstate) > -{ > - barrier(); > - write_sysreg(hwstate.daif, daif); > - barrier(); > -} > + if (system_uses_irq_prio_masking()) > + __pmr_local_irq_disable(); > + else > + __daif_local_irq_disable(); > > -static __always_inline > -void __pmr_local_irq_restore(arm64_exc_hwstate_t hwstate) > -{ > - barrier(); > - write_sysreg_s(hwstate.pmr, SYS_ICC_PMR_EL1); > - pmr_sync(); > - barrier(); > + return flags; > } > > /* > @@ -215,11 +146,14 @@ static __always_inline void arch_local_irq_restore(unsigned long flags) > { > arm64_exc_hwstate_t hwstate = { .flags = flags }; > > + barrier(); > if (system_uses_irq_prio_masking()) { > - __pmr_local_irq_restore(hwstate); > + write_sysreg_s(hwstate.pmr, SYS_ICC_PMR_EL1); > + pmr_sync(); > } else { > - __daif_local_irq_restore(hwstate); > + write_sysreg(hwstate.daif, daif); > } > + barrier(); > } > > #endif /* __ASM_IRQFLAGS_H */ > diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h > index f7dc5fb9427d..192eb97cd50b 100644 > --- a/arch/arm64/include/asm/ptrace.h > +++ b/arch/arm64/include/asm/ptrace.h > @@ -205,7 +205,7 @@ static inline void forget_syscall(struct pt_regs *regs) > > #define irqs_priority_unmasked(regs) \ > (system_uses_irq_prio_masking() ? \ > - (regs)->pmr == GIC_PRIO_IRQON : \ > + (regs)->pmr >= GIC_PRIO_IRQON : \ I think "=== GIC_PRIO_IRQON" is fine. otherwise, LGTM Reviewed-by: Jinjie Ruan > true) > > static __always_inline bool regs_irqs_disabled(const struct pt_regs *regs)