Commit 7854f822 authored by Thomas Gleixner's avatar Thomas Gleixner

x86/vector: Rename used_vectors to system_vectors

used_vectors is a nisnomer as it only has the system vectors which are
excluded from the regular vector allocation marked. It's not what the name
suggests storage for the actually used vectors.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Tested-by: default avatarYu Chen <yu.c.chen@intel.com>
Acked-by: default avatarJuergen Gross <jgross@suse.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Alok Kataria <akataria@vmware.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Rui Zhang <rui.zhang@intel.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Len Brown <lenb@kernel.org>
Link: https://lkml.kernel.org/r/20170913213154.150209009@linutronix.de
parent c1d1ee9a
...@@ -392,7 +392,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit) ...@@ -392,7 +392,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
void update_intr_gate(unsigned int n, const void *addr); void update_intr_gate(unsigned int n, const void *addr);
void alloc_intr_gate(unsigned int n, const void *addr); void alloc_intr_gate(unsigned int n, const void *addr);
extern unsigned long used_vectors[]; extern unsigned long system_vectors[];
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
DECLARE_PER_CPU(u32, debug_idt_ctr); DECLARE_PER_CPU(u32, debug_idt_ctr);
......
...@@ -175,7 +175,7 @@ static int __assign_irq_vector(int irq, struct apic_chip_data *d, ...@@ -175,7 +175,7 @@ static int __assign_irq_vector(int irq, struct apic_chip_data *d,
if (unlikely(current_vector == vector)) if (unlikely(current_vector == vector))
goto next_cpu; goto next_cpu;
if (test_bit(vector, used_vectors)) if (test_bit(vector, system_vectors))
goto next; goto next;
for_each_cpu(new_cpu, vector_searchmask) { for_each_cpu(new_cpu, vector_searchmask) {
......
...@@ -225,7 +225,7 @@ idt_setup_from_table(gate_desc *idt, const struct idt_data *t, int size, bool sy ...@@ -225,7 +225,7 @@ idt_setup_from_table(gate_desc *idt, const struct idt_data *t, int size, bool sy
idt_init_desc(&desc, t); idt_init_desc(&desc, t);
write_idt_entry(idt, t->vector, &desc); write_idt_entry(idt, t->vector, &desc);
if (sys) if (sys)
set_bit(t->vector, used_vectors); set_bit(t->vector, system_vectors);
} }
} }
...@@ -313,14 +313,14 @@ void __init idt_setup_apic_and_irq_gates(void) ...@@ -313,14 +313,14 @@ void __init idt_setup_apic_and_irq_gates(void)
idt_setup_from_table(idt_table, apic_idts, ARRAY_SIZE(apic_idts), true); idt_setup_from_table(idt_table, apic_idts, ARRAY_SIZE(apic_idts), true);
for_each_clear_bit_from(i, used_vectors, FIRST_SYSTEM_VECTOR) { for_each_clear_bit_from(i, system_vectors, FIRST_SYSTEM_VECTOR) {
entry = irq_entries_start + 8 * (i - FIRST_EXTERNAL_VECTOR); entry = irq_entries_start + 8 * (i - FIRST_EXTERNAL_VECTOR);
set_intr_gate(i, entry); set_intr_gate(i, entry);
} }
for_each_clear_bit_from(i, used_vectors, NR_VECTORS) { for_each_clear_bit_from(i, system_vectors, NR_VECTORS) {
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
set_bit(i, used_vectors); set_bit(i, system_vectors);
set_intr_gate(i, spurious_interrupt); set_intr_gate(i, spurious_interrupt);
#else #else
entry = irq_entries_start + 8 * (i - FIRST_EXTERNAL_VECTOR); entry = irq_entries_start + 8 * (i - FIRST_EXTERNAL_VECTOR);
...@@ -358,7 +358,7 @@ void idt_invalidate(void *addr) ...@@ -358,7 +358,7 @@ void idt_invalidate(void *addr)
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, used_vectors))) if (WARN_ON_ONCE(!test_bit(n, system_vectors)))
return; return;
set_intr_gate(n, addr); set_intr_gate(n, addr);
} }
...@@ -366,6 +366,6 @@ void __init update_intr_gate(unsigned int n, const void *addr) ...@@ -366,6 +366,6 @@ void __init update_intr_gate(unsigned int n, const void *addr)
void alloc_intr_gate(unsigned int n, const void *addr) void alloc_intr_gate(unsigned int n, const void *addr)
{ {
BUG_ON(n < FIRST_SYSTEM_VECTOR); BUG_ON(n < FIRST_SYSTEM_VECTOR);
if (!test_and_set_bit(n, used_vectors)) if (!test_and_set_bit(n, system_vectors))
set_intr_gate(n, addr); set_intr_gate(n, addr);
} }
...@@ -134,7 +134,7 @@ int arch_show_interrupts(struct seq_file *p, int prec) ...@@ -134,7 +134,7 @@ int arch_show_interrupts(struct seq_file *p, int prec)
seq_puts(p, " Machine check polls\n"); seq_puts(p, " Machine check polls\n");
#endif #endif
#if IS_ENABLED(CONFIG_HYPERV) || defined(CONFIG_XEN) #if IS_ENABLED(CONFIG_HYPERV) || defined(CONFIG_XEN)
if (test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors)) { if (test_bit(HYPERVISOR_CALLBACK_VECTOR, system_vectors)) {
seq_printf(p, "%*s: ", prec, "HYP"); seq_printf(p, "%*s: ", prec, "HYP");
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", seq_printf(p, "%10u ",
...@@ -416,7 +416,7 @@ int check_irq_vectors_for_cpu_disable(void) ...@@ -416,7 +416,7 @@ int check_irq_vectors_for_cpu_disable(void)
*/ */
for (vector = FIRST_EXTERNAL_VECTOR; for (vector = FIRST_EXTERNAL_VECTOR;
vector < FIRST_SYSTEM_VECTOR; vector++) { vector < FIRST_SYSTEM_VECTOR; vector++) {
if (!test_bit(vector, used_vectors) && if (!test_bit(vector, system_vectors) &&
IS_ERR_OR_NULL(per_cpu(vector_irq, cpu)[vector])) { IS_ERR_OR_NULL(per_cpu(vector_irq, cpu)[vector])) {
if (++count == this_count) if (++count == this_count)
return 0; return 0;
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
#include <asm/proto.h> #include <asm/proto.h>
#endif #endif
DECLARE_BITMAP(used_vectors, NR_VECTORS); DECLARE_BITMAP(system_vectors, NR_VECTORS);
static inline void cond_local_irq_enable(struct pt_regs *regs) static inline void cond_local_irq_enable(struct pt_regs *regs)
{ {
......
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