Commit 7c2a5736 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/irq: Rework handle_irq() for 64-bit 



To consolidate the interrupt entry/exit code vs. the other exceptions
make handle_irq() an inline and handle both 64-bit and 32-bit mode.

Preparatory change to move irq stack switching for 64-bit to C which allows
to consolidate the entry exit handling by reusing the idtentry machinery
both in ASM and C.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20200521202118.889972748@linutronix.de
parent 633260fa

arch/x86/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ extern __visible void smp_kvm_posted_intr_nested_ipi(struct pt_regs *regs); 
extern void (*x86_platform_ipi_callback)(void);

extern void native_init_IRQ(void);



extern void handle_irq(struct irq_desc *desc, struct pt_regs *regs);

extern void __handle_irq(struct irq_desc *desc, struct pt_regs *regs);



extern __visible void do_IRQ(struct pt_regs *regs, unsigned long vector);

arch/x86/kernel/irq.c

+10 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/export.h>

#include <linux/irq.h>



#include <asm/irq_stack.h>

#include <asm/apic.h>

#include <asm/io_apic.h>

#include <asm/irq.h>
@@ -221,6 +222,14 @@ u64 arch_irq_stat(void) 
	return sum;

}



static __always_inline void handle_irq(struct irq_desc *desc,

				       struct pt_regs *regs)

{

	if (IS_ENABLED(CONFIG_X86_64))

		run_on_irqstack_cond(desc->handle_irq, desc, regs);

	else

		__handle_irq(desc, regs);

}



/*

 * do_IRQ handles all normal device IRQ's (the special
@@ -246,7 +255,7 @@ __visible void __irq_entry do_IRQ(struct pt_regs *regs, unsigned long vector) 
	desc = __this_cpu_read(vector_irq[vector]);

	if (likely(!IS_ERR_OR_NULL(desc))) {

		if (IS_ENABLED(CONFIG_X86_32))

			handle_irq(desc, regs);

			__handle_irq(desc, regs);

		else

			generic_handle_irq_desc(desc);

	} else {

arch/x86/kernel/irq_32.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void do_softirq_own_stack(void) 
	call_on_stack(__do_softirq, isp);

}



void handle_irq(struct irq_desc *desc, struct pt_regs *regs)

void __handle_irq(struct irq_desc *desc, struct pt_regs *regs)

{

	int overflow = check_stack_overflow();

CRA Git | Maintained and supported by SUSTech CRA and CCSE