Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARC: Entry Handler tweaks: Optimize away redundant IRQ_DISABLE_SAVE

In the exception return path, for both U/K cases, intr are already
disabled (for various existing reasons). So when we drop down to
@restore_regs, we need not redo that.

There was subtle issue - when intr were NOT being disabled for
ret-to-kernel-but-no-preemption case - now fixed by moving the
IRQ_DISABLE further up in @resume_kernel_mode.

So what do we gain:

* Shaves off a few insn in return path.

* Eliminates the need for IRQ_DISABLE_SAVE assembler macro for ARCv2
hence allows for entry code sharing.

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>

+5 -12
-7
arch/arc/include/asm/irqflags.h
··· 157 157 flag \scratch 158 158 .endm 159 159 160 - .macro IRQ_DISABLE_SAVE scratch, save 161 - lr \scratch, [status32] 162 - mov \save, \scratch /* Make a copy */ 163 - bic \scratch, \scratch, (STATUS_E1_MASK | STATUS_E2_MASK) 164 - flag \scratch 165 - .endm 166 - 167 160 .macro IRQ_ENABLE scratch 168 161 lr \scratch, [status32] 169 162 or \scratch, \scratch, (STATUS_E1_MASK | STATUS_E2_MASK)
+5 -5
arch/arc/kernel/entry.S
··· 612 612 613 613 #ifdef CONFIG_PREEMPT 614 614 615 + ; This is a must for preempt_schedule_irq() 616 + IRQ_DISABLE r9 617 + 615 618 ; Can't preempt if preemption disabled 616 619 GET_CURR_THR_INFO_FROM_SP r10 617 620 ld r8, [r10, THREAD_INFO_PREEMPT_COUNT] ··· 623 620 ; check if this task's NEED_RESCHED flag set 624 621 ld r9, [r10, THREAD_INFO_FLAGS] 625 622 bbit0 r9, TIF_NEED_RESCHED, restore_regs 626 - 627 - IRQ_DISABLE r9 628 623 629 624 ; Invoke PREEMPTION 630 625 bl preempt_schedule_irq ··· 636 635 ; 637 636 ; Restore the saved sys context (common exit-path for EXCPN/IRQ/Trap) 638 637 ; IRQ shd definitely not happen between now and rtie 638 + ; All 2 entry points to here already disable interrupts 639 639 640 640 restore_regs : 641 641 642 - ; Disable Interrupts while restoring reg-file back 643 - ; XXX can this be optimised out 644 - IRQ_DISABLE_SAVE r9, r10 ;@r10 has prisitine (pre-disable) copy 642 + lr r10, [status32] 645 643 646 644 ; Restore REG File. In case multiple Events outstanding, 647 645 ; use the same priorty as rtie: EXCPN, L2 IRQ, L1 IRQ, None