Skip to content

Commit

Permalink
x86/entry/64: Move do_softirq_own_stack() to C
Browse files Browse the repository at this point in the history
The first step to get rid of the ENTER/LEAVE_IRQ_STACK ASM macro maze.  Use
the new C code helpers to move do_softirq_own_stack() out of ASM code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Andy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20200521202117.870911120@linutronix.de
  • Loading branch information
Thomas Gleixner committed Jun 11, 2020
1 parent 931b941 commit eb6555c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
13 changes: 0 additions & 13 deletions arch/x86/entry/entry_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -1145,19 +1145,6 @@ SYM_FUNC_START(asm_call_on_stack)
ret
SYM_FUNC_END(asm_call_on_stack)

/* Call softirq on interrupt stack. Interrupts are off. */
.pushsection .text, "ax"
SYM_FUNC_START(do_softirq_own_stack)
pushq %rbp
mov %rsp, %rbp
ENTER_IRQ_STACK regs=0 old_rsp=%r11
call __do_softirq
LEAVE_IRQ_STACK regs=0
leaveq
ret
SYM_FUNC_END(do_softirq_own_stack)
.popsection

#ifdef CONFIG_XEN_PV
/*
* A note on the "critical region" in our callback handler.
Expand Down
6 changes: 6 additions & 0 deletions arch/x86/kernel/irq_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <linux/sched/task_stack.h>

#include <asm/cpu_entry_area.h>
#include <asm/irq_stack.h>
#include <asm/io_apic.h>
#include <asm/apic.h>

Expand Down Expand Up @@ -70,3 +71,8 @@ int irq_init_percpu_irqstack(unsigned int cpu)
return 0;
return map_irq_stack(cpu);
}

void do_softirq_own_stack(void)
{
run_on_irqstack_cond(__do_softirq, NULL, NULL);
}

0 comments on commit eb6555c

Please sign in to comment.