From: Jinjie Ruan <ruanjinjie@huawei.com>
To: Mukesh Kumar Chaurasiya <mkchauras@linux.ibm.com>,
<maddy@linux.ibm.com>, <mpe@ellerman.id.au>, <npiggin@gmail.com>,
<chleroy@kernel.org>, <oleg@redhat.com>, <kees@kernel.org>,
<luto@amacapital.net>, <wad@chromium.org>,
<mchauras@linux.ibm.com>, <thuth@redhat.com>,
<sshegde@linux.ibm.com>, <akpm@linux-foundation.org>,
<macro@orcam.me.uk>, <deller@gmx.de>, <ldv@strace.io>,
<charlie@rivosinc.com>, <segher@kernel.crashing.org>,
<bigeasy@linutronix.de>, <peterz@infradead.org>,
<namcao@linutronix.de>, <tglx@linutronix.de>,
<kan.liang@linux.intel.com>, <mark.barnett@arm.com>,
<linuxppc-dev@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 1/8] powerpc: rename arch_irq_disabled_regs
Date: Thu, 8 Jan 2026 16:30:15 +0800 [thread overview]
Message-ID: <272dc19f-7e6b-9fd7-22c0-de3a4a81dc8f@huawei.com> (raw)
In-Reply-To: <20251229045416.3193779-2-mkchauras@linux.ibm.com>
On 2025/12/29 12:54, Mukesh Kumar Chaurasiya wrote:
> From: Mukesh Kumar Chaurasiya <mchauras@linux.ibm.com>
>
> Rename arch_irq_disabled_regs() to regs_irqs_disabled() to align with the
> naming used in the generic irqentry framework. This makes the function
> available for use both in the PowerPC architecture code and in the
> common entry/exit paths shared with other architectures.
>
> This is a preparatory change for enabling the generic irqentry framework
> on PowerPC.
>
> Signed-off-by: Mukesh Kumar Chaurasiya <mchauras@linux.ibm.com>
> Reviewed-by: Shrikanth Hegde <sshegde@linux.ibm.com>
> ---
> arch/powerpc/include/asm/hw_irq.h | 4 ++--
> arch/powerpc/include/asm/interrupt.h | 16 ++++++++--------
> arch/powerpc/kernel/interrupt.c | 4 ++--
> arch/powerpc/kernel/syscall.c | 2 +-
> arch/powerpc/kernel/traps.c | 2 +-
> arch/powerpc/kernel/watchdog.c | 2 +-
> arch/powerpc/perf/core-book3s.c | 2 +-
> 7 files changed, 16 insertions(+), 16 deletions(-)
Reviewed-by: Jinjie Ruan <ruanjinjie@huawei.com>
>
> diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
> index 1078ba88efaf..8dfe36b442a5 100644
> --- a/arch/powerpc/include/asm/hw_irq.h
> +++ b/arch/powerpc/include/asm/hw_irq.h
> @@ -393,7 +393,7 @@ static inline void do_hard_irq_enable(void)
> __hard_irq_enable();
> }
>
> -static inline bool arch_irq_disabled_regs(struct pt_regs *regs)
> +static inline bool regs_irqs_disabled(struct pt_regs *regs)
> {
> return (regs->softe & IRQS_DISABLED);
> }
> @@ -466,7 +466,7 @@ static inline bool arch_irqs_disabled(void)
>
> #define hard_irq_disable() arch_local_irq_disable()
>
> -static inline bool arch_irq_disabled_regs(struct pt_regs *regs)
> +static inline bool regs_irqs_disabled(struct pt_regs *regs)
> {
> return !(regs->msr & MSR_EE);
> }
> diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
> index eb0e4a20b818..0e2cddf8bd21 100644
> --- a/arch/powerpc/include/asm/interrupt.h
> +++ b/arch/powerpc/include/asm/interrupt.h
> @@ -172,7 +172,7 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)
> /* Enable MSR[RI] early, to support kernel SLB and hash faults */
> #endif
>
> - if (!arch_irq_disabled_regs(regs))
> + if (!regs_irqs_disabled(regs))
> trace_hardirqs_off();
>
> if (user_mode(regs)) {
> @@ -192,11 +192,11 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs)
> CT_WARN_ON(ct_state() != CT_STATE_KERNEL &&
> ct_state() != CT_STATE_IDLE);
> INT_SOFT_MASK_BUG_ON(regs, is_implicit_soft_masked(regs));
> - INT_SOFT_MASK_BUG_ON(regs, arch_irq_disabled_regs(regs) &&
> - search_kernel_restart_table(regs->nip));
> + INT_SOFT_MASK_BUG_ON(regs, regs_irqs_disabled(regs) &&
> + search_kernel_restart_table(regs->nip));
> }
> - INT_SOFT_MASK_BUG_ON(regs, !arch_irq_disabled_regs(regs) &&
> - !(regs->msr & MSR_EE));
> + INT_SOFT_MASK_BUG_ON(regs, !regs_irqs_disabled(regs) &&
> + !(regs->msr & MSR_EE));
>
> booke_restore_dbcr0();
> }
> @@ -298,7 +298,7 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct inte
> * Adjust regs->softe to be soft-masked if it had not been
> * reconcied (e.g., interrupt entry with MSR[EE]=0 but softe
> * not yet set disabled), or if it was in an implicit soft
> - * masked state. This makes arch_irq_disabled_regs(regs)
> + * masked state. This makes regs_irqs_disabled(regs)
> * behave as expected.
> */
> regs->softe = IRQS_ALL_DISABLED;
> @@ -372,7 +372,7 @@ static inline void interrupt_nmi_exit_prepare(struct pt_regs *regs, struct inter
>
> #ifdef CONFIG_PPC64
> #ifdef CONFIG_PPC_BOOK3S
> - if (arch_irq_disabled_regs(regs)) {
> + if (regs_irqs_disabled(regs)) {
> unsigned long rst = search_kernel_restart_table(regs->nip);
> if (rst)
> regs_set_return_ip(regs, rst);
> @@ -661,7 +661,7 @@ void replay_soft_interrupts(void);
>
> static inline void interrupt_cond_local_irq_enable(struct pt_regs *regs)
> {
> - if (!arch_irq_disabled_regs(regs))
> + if (!regs_irqs_disabled(regs))
> local_irq_enable();
> }
>
> diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c
> index aea6f7e8e9c6..9ce2013e70ae 100644
> --- a/arch/powerpc/kernel/interrupt.c
> +++ b/arch/powerpc/kernel/interrupt.c
> @@ -347,7 +347,7 @@ notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs)
> unsigned long ret;
>
> BUG_ON(regs_is_unrecoverable(regs));
> - BUG_ON(arch_irq_disabled_regs(regs));
> + BUG_ON(regs_irqs_disabled(regs));
> CT_WARN_ON(ct_state() == CT_STATE_USER);
>
> /*
> @@ -396,7 +396,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs)
>
> local_irq_disable();
>
> - if (!arch_irq_disabled_regs(regs)) {
> + if (!regs_irqs_disabled(regs)) {
> /* Returning to a kernel context with local irqs enabled. */
> WARN_ON_ONCE(!(regs->msr & MSR_EE));
> again:
> diff --git a/arch/powerpc/kernel/syscall.c b/arch/powerpc/kernel/syscall.c
> index be159ad4b77b..9f03a6263fb4 100644
> --- a/arch/powerpc/kernel/syscall.c
> +++ b/arch/powerpc/kernel/syscall.c
> @@ -32,7 +32,7 @@ notrace long system_call_exception(struct pt_regs *regs, unsigned long r0)
>
> BUG_ON(regs_is_unrecoverable(regs));
> BUG_ON(!user_mode(regs));
> - BUG_ON(arch_irq_disabled_regs(regs));
> + BUG_ON(regs_irqs_disabled(regs));
>
> #ifdef CONFIG_PPC_PKEY
> if (mmu_has_feature(MMU_FTR_PKEY)) {
> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
> index cb8e9357383e..629f2a2d4780 100644
> --- a/arch/powerpc/kernel/traps.c
> +++ b/arch/powerpc/kernel/traps.c
> @@ -1956,7 +1956,7 @@ DEFINE_INTERRUPT_HANDLER_RAW(performance_monitor_exception)
> * prevent hash faults on user addresses when reading callchains (and
> * looks better from an irq tracing perspective).
> */
> - if (IS_ENABLED(CONFIG_PPC64) && unlikely(arch_irq_disabled_regs(regs)))
> + if (IS_ENABLED(CONFIG_PPC64) && unlikely(regs_irqs_disabled(regs)))
> performance_monitor_exception_nmi(regs);
> else
> performance_monitor_exception_async(regs);
> diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c
> index 2429cb1c7baa..6111cbbde069 100644
> --- a/arch/powerpc/kernel/watchdog.c
> +++ b/arch/powerpc/kernel/watchdog.c
> @@ -373,7 +373,7 @@ DEFINE_INTERRUPT_HANDLER_NMI(soft_nmi_interrupt)
> u64 tb;
>
> /* should only arrive from kernel, with irqs disabled */
> - WARN_ON_ONCE(!arch_irq_disabled_regs(regs));
> + WARN_ON_ONCE(!regs_irqs_disabled(regs));
>
> if (!cpumask_test_cpu(cpu, &wd_cpus_enabled))
> return 0;
> diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
> index 8b0081441f85..f7518b7e3055 100644
> --- a/arch/powerpc/perf/core-book3s.c
> +++ b/arch/powerpc/perf/core-book3s.c
> @@ -2482,7 +2482,7 @@ static void __perf_event_interrupt(struct pt_regs *regs)
> * will trigger a PMI after waking up from idle. Since counter values are _not_
> * saved/restored in idle path, can lead to below "Can't find PMC" message.
> */
> - if (unlikely(!found) && !arch_irq_disabled_regs(regs))
> + if (unlikely(!found) && !regs_irqs_disabled(regs))
> printk_ratelimited(KERN_WARNING "Can't find PMC that caused IRQ\n");
>
> /*
next prev parent reply other threads:[~2026-01-08 8:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-29 4:54 [PATCH v3 0/8] Generic IRQ entry/exit support for powerpc Mukesh Kumar Chaurasiya
2025-12-29 4:54 ` [PATCH v3 1/8] powerpc: rename arch_irq_disabled_regs Mukesh Kumar Chaurasiya
2026-01-08 8:30 ` Jinjie Ruan [this message]
2025-12-29 4:54 ` [PATCH v3 2/8] powerpc: Prepare to build with generic entry/exit framework Mukesh Kumar Chaurasiya
2025-12-29 4:54 ` [PATCH v3 3/8] powerpc: introduce arch_enter_from_user_mode Mukesh Kumar Chaurasiya
2025-12-29 4:54 ` [PATCH v3 4/8] powerpc: Introduce syscall exit arch functions Mukesh Kumar Chaurasiya
2025-12-29 4:54 ` [PATCH v3 5/8] powerpc: add exit_flags field in pt_regs Mukesh Kumar Chaurasiya
2025-12-29 4:54 ` [PATCH v3 6/8] powerpc: Prepare for IRQ entry exit Mukesh Kumar Chaurasiya
2025-12-29 4:54 ` [PATCH v3 7/8] powerpc: Enable IRQ generic entry/exit path Mukesh Kumar Chaurasiya
2026-01-01 17:31 ` Shrikanth Hegde
2026-01-06 4:59 ` Mukesh Kumar Chaurasiya
2025-12-29 4:54 ` [PATCH v3 8/8] powerpc: Enable Generic Entry/Exit for syscalls Mukesh Kumar Chaurasiya
2026-01-01 9:07 ` [PATCH v3 0/8] Generic IRQ entry/exit support for powerpc Shrikanth Hegde
2026-01-06 5:01 ` Mukesh Kumar Chaurasiya
2026-01-08 5:16 ` Venkat
2026-01-08 6:05 ` Christophe Leroy (CS GROUP)
2026-01-08 9:09 ` Mukesh Kumar Chaurasiya
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=272dc19f-7e6b-9fd7-22c0-de3a4a81dc8f@huawei.com \
--to=ruanjinjie@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=bigeasy@linutronix.de \
--cc=charlie@rivosinc.com \
--cc=chleroy@kernel.org \
--cc=deller@gmx.de \
--cc=kan.liang@linux.intel.com \
--cc=kees@kernel.org \
--cc=ldv@strace.io \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=luto@amacapital.net \
--cc=macro@orcam.me.uk \
--cc=maddy@linux.ibm.com \
--cc=mark.barnett@arm.com \
--cc=mchauras@linux.ibm.com \
--cc=mkchauras@linux.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=namcao@linutronix.de \
--cc=npiggin@gmail.com \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=segher@kernel.crashing.org \
--cc=sshegde@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=thuth@redhat.com \
--cc=wad@chromium.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