Skip to contentSkip to conversation

x86: allocate 32 tlb_invalidate_interrupt handlers

RFC In review Shaohua Li 2 participants 2 messages Nov 3, 2010 – Nov 4, 2010 x86

lore
Share & tools
lore

Shaohua Li

author
#0 lore raw

RFC 2/4 x86: allocate 32 tlb_invalidate_interrupt handlers

Add up to 32 invalidate_interrupt handler. How many handlers are added depends on NUM_INVALIDATE_TLB_VECTORS. So if NUM_INVALIDATE_TLB_VECTORS is smaller than 32, we don't waste icache.

---
 arch/x86/include/asm/entry_arch.h |    5 +-
 arch/x86/include/asm/hw_irq.h     |   24 +++++++++++
 arch/x86/kernel/entry_64.S        |    5 +-
 arch/x86/kernel/irqinit.c         |   79 ++++++++++++++++++++++++++++++++++----
 4 files changed, 103 insertions(+), 10 deletions(-)
arch/x86/include/asm/hw_irq.h +24 -0
Index: linux/arch/x86/include/asm/hw_irq.h
===================================================================
@@ -45,6 +45,30 @@ extern void invalidate_interrupt4(void);
 extern void invalidate_interrupt5(void);
 extern void invalidate_interrupt6(void);
 extern void invalidate_interrupt7(void);
+extern void invalidate_interrupt8(void);
+extern void invalidate_interrupt9(void);
+extern void invalidate_interrupt10(void);
+extern void invalidate_interrupt11(void);
+extern void invalidate_interrupt12(void);
+extern void invalidate_interrupt13(void);
+extern void invalidate_interrupt14(void);
+extern void invalidate_interrupt15(void);
+extern void invalidate_interrupt16(void);
+extern void invalidate_interrupt17(void);
+extern void invalidate_interrupt18(void);
+extern void invalidate_interrupt19(void);
+extern void invalidate_interrupt20(void);
+extern void invalidate_interrupt21(void);
+extern void invalidate_interrupt22(void);
+extern void invalidate_interrupt23(void);
+extern void invalidate_interrupt24(void);
+extern void invalidate_interrupt25(void);
+extern void invalidate_interrupt26(void);
+extern void invalidate_interrupt27(void);
+extern void invalidate_interrupt28(void);
+extern void invalidate_interrupt29(void);
+extern void invalidate_interrupt30(void);
+extern void invalidate_interrupt31(void);
 
 extern void irq_move_cleanup_interrupt(void);
 extern void reboot_interrupt(void);
arch/x86/kernel/irqinit.c +71 -8

85 lines not on this page · raw message

arch/x86/include/asm/entry_arch.h +4 -1
Index: linux/arch/x86/include/asm/entry_arch.h
===================================================================
@@ -16,10 +16,13 @@ BUILD_INTERRUPT(call_function_single_int
 BUILD_INTERRUPT(irq_move_cleanup_interrupt,IRQ_MOVE_CLEANUP_VECTOR)
 BUILD_INTERRUPT(reboot_interrupt,REBOOT_VECTOR)
 
-.irpc idx, "01234567"
+.irp idx,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, \
+	16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31
+.if NUM_INVALIDATE_TLB_VECTORS > \idx
 BUILD_INTERRUPT3(invalidate_interrupt\idx,
 		 (INVALIDATE_TLB_VECTOR_START)+\idx,
 		 smp_invalidate_interrupt)
+.endif
 .endr
 #endif
 
arch/x86/kernel/entry_64.S +4 -1
Index: linux/arch/x86/kernel/entry_64.S
===================================================================
@@ -963,9 +963,12 @@ apicinterrupt X86_PLATFORM_IPI_VECTOR \
 	x86_platform_ipi smp_x86_platform_ipi
 
 #ifdef CONFIG_SMP
-.irpc idx, "01234567"
+.irp idx,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, \
+	16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31
+.if NUM_INVALIDATE_TLB_VECTORS > \idx
 apicinterrupt (INVALIDATE_TLB_VECTOR_START)+\idx \
 	invalidate_interrupt\idx smp_invalidate_interrupt
+.endif
 .endr
 #endif
 
#1 lore raw
Quoted 3 lines · Shaohua Li

Add up to 32 invalidate_interrupt handler. How many handlers are added depends on NUM_INVALIDATE_TLB_VECTORS. So if NUM_INVALIDATE_TLB_VECTORS is smaller than 32, we don't waste icache.

Just a small nit on the description: icache doesn't really matter for init code, it's just about binary size on disk.

The patch looks ok.

-Andi