]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
powerpc/entry: Disable interrupts before irqentry_exit
authorShrikanth Hegde <sshegde@linux.ibm.com>
Wed, 3 Jun 2026 13:10:54 +0000 (18:40 +0530)
committerMadhavan Srinivasan <maddy@linux.ibm.com>
Mon, 8 Jun 2026 10:28:03 +0000 (15:58 +0530)
Venkat reported a panic on powerpc-next tree where GENERIC_ENTRY has
been enabled.

kernel BUG at kernel/sched/core.c:7512!
NIP  preempt_schedule_irq+0x44/0x118
LR   dynamic_irqentry_exit_cond_resched+0x40/0x1a4
Call Trace:
 dynamic_irqentry_exit_cond_resched+0x40/0x1a4
 do_page_fault+0xc0/0x104
 data_access_common_virt+0x210/0x220

This happens since __do_page_fault ends up enabling the interrupts and
it could take significant time such that need_resched could be set. This
leads to schedule call in irqentry_exit leading to the bug.

There are many such irq handlers which enables the interrupts.
Fix it by disabling the irq before calling irqentry_exit. The same
pattern exists today in interrupt_exit_kernel_prepare.

Fixes: bee25f97ad24 ("powerpc: Enable GENERIC_ENTRY feature")
Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Closes: https://lore.kernel.org/all/7904105b-9dfa-4efd-a5ef-bc0276ed255d@linux.ibm.com/
Signed-off-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Reviewed-by: Mukesh Kumar Chaurasiya (IBM) <mkchauras@gmail.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20260603131054.216235-1-sshegde@linux.ibm.com
arch/powerpc/include/asm/entry-common.h

index de5601282755ee5bdb76c1f2c4205710de6d6621..fc636c42e89ab75dcf86515130b2782ae728a570 100644 (file)
@@ -260,9 +260,10 @@ static inline void arch_interrupt_exit_prepare(struct pt_regs *regs)
                 * AMR can only have been unlocked if we interrupted the kernel.
                 */
                kuap_assert_locked();
-
-               local_irq_disable();
        }
+
+       /* irqentry_exit expects to be called with interrupts disabled */
+       local_irq_disable();
 }
 
 static inline void arch_interrupt_async_enter_prepare(struct pt_regs *regs)