Skip to content

Commit af0c61c

Browse files
chleroygregkh
authored andcommitted
powerpc/interrupt: Don't read MSR from interrupt_exit_kernel_prepare()
[ Upstream commit 0eb089a ] A disassembly of interrupt_exit_kernel_prepare() shows a useless read of MSR register. This is shown by r9 being re-used immediately without doing anything with the value read. c000e0e0: 60 00 00 00 nop c000e0e4: 7d 3a c2 a6 mfmd_ap r9 c000e0e8: 7d 20 00 a6 mfmsr r9 c000e0ec: 7c 51 13 a6 mtspr 81,r2 c000e0f0: 81 3f 00 84 lwz r9,132(r31) c000e0f4: 71 29 80 00 andi. r9,r9,32768 This is due to the use of local_irq_save(). The flags read by local_irq_save() are never used, use local_irq_disable() instead. Fixes: 1379974 ("powerpc/64: use interrupt restart table to speed up return from interrupt") Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Reviewed-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/df36c6205ab64326fb1b991993c82057e92ace2f.1685955214.git.christophe.leroy@csgroup.eu Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 081f642 commit af0c61c

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

arch/powerpc/kernel/interrupt.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@ void preempt_schedule_irq(void);
368368

369369
notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs)
370370
{
371-
unsigned long flags;
372371
unsigned long ret = 0;
373372
unsigned long kuap;
374373
bool stack_store = read_thread_flags() & _TIF_EMULATE_STACK_STORE;
@@ -392,7 +391,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs)
392391

393392
kuap = kuap_get_and_assert_locked();
394393

395-
local_irq_save(flags);
394+
local_irq_disable();
396395

397396
if (!arch_irq_disabled_regs(regs)) {
398397
/* Returning to a kernel context with local irqs enabled. */

0 commit comments

Comments
 (0)