Commit 06184325 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Thomas Gleixner

x86/idt: Annotate alloc_intr_gate() with __init

There seems to be no reason to allocate interrupt gates after init. Mark
alloc_intr_gate() as __init and add WARN_ON() checks making sure it is
only used before idt_setup_apic_and_irq_gates() finalizes IDT setup and
maps all un-allocated entries to spurious entries.
Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200428093824.1451532-3-vkuznets@redhat.com
parent a0bb51f2
...@@ -51,6 +51,9 @@ struct idt_data { ...@@ -51,6 +51,9 @@ struct idt_data {
#define TSKG(_vector, _gdt) \ #define TSKG(_vector, _gdt) \
G(_vector, NULL, DEFAULT_STACK, GATE_TASK, DPL0, _gdt << 3) G(_vector, NULL, DEFAULT_STACK, GATE_TASK, DPL0, _gdt << 3)
static bool idt_setup_done __initdata;
/* /*
* Early traps running on the DEFAULT_STACK because the other interrupt * Early traps running on the DEFAULT_STACK because the other interrupt
* stacks work only after cpu_init(). * stacks work only after cpu_init().
...@@ -323,6 +326,7 @@ void __init idt_setup_apic_and_irq_gates(void) ...@@ -323,6 +326,7 @@ void __init idt_setup_apic_and_irq_gates(void)
set_intr_gate(i, entry); set_intr_gate(i, entry);
} }
#endif #endif
idt_setup_done = true;
} }
/** /**
...@@ -352,6 +356,7 @@ void idt_invalidate(void *addr) ...@@ -352,6 +356,7 @@ void idt_invalidate(void *addr)
load_idt(&idt); load_idt(&idt);
} }
/* This goes away once ASYNC_PF is sanitized */
void __init update_intr_gate(unsigned int n, const void *addr) void __init update_intr_gate(unsigned int n, const void *addr)
{ {
if (WARN_ON_ONCE(!test_bit(n, system_vectors))) if (WARN_ON_ONCE(!test_bit(n, system_vectors)))
...@@ -359,9 +364,14 @@ void __init update_intr_gate(unsigned int n, const void *addr) ...@@ -359,9 +364,14 @@ void __init update_intr_gate(unsigned int n, const void *addr)
set_intr_gate(n, addr); set_intr_gate(n, addr);
} }
void alloc_intr_gate(unsigned int n, const void *addr) void __init alloc_intr_gate(unsigned int n, const void *addr)
{ {
BUG_ON(n < FIRST_SYSTEM_VECTOR); if (WARN_ON(n < FIRST_SYSTEM_VECTOR))
if (!test_and_set_bit(n, system_vectors)) return;
if (WARN_ON(idt_setup_done))
return;
if (!WARN_ON(test_and_set_bit(n, system_vectors)))
set_intr_gate(n, addr); set_intr_gate(n, addr);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment