x86/irq: Do not use apic_chip_data.old_domain as temporary buffer

Function __assign_irq_vector() makes use of apic_chip_data.old_domain as a
temporary buffer, which is in the way of using apic_chip_data.old_domain for
synchronizing the vector cleanup with the vector assignement code.

Use a proper temporary cpumask for this.

[ tglx: Renamed the mask to searched_cpumask for clarity ]

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Tested-by: Borislav Petkov <bp@alien8.de>
Tested-by: Joe Lawrence <joe.lawrence@stratus.com>
Cc: Jeremiah Mahler <jmmahler@gmail.com>
Cc: andy.shevchenko@gmail.com
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: stable@vger.kernel.org #4.3+
Link: http://lkml.kernel.org/r/1450880014-11741-1-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index cf1e325b67ee..19082cf56616 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -31,7 +31,7 @@ struct apic_chip_data {
 struct irq_domain *x86_vector_domain;
 EXPORT_SYMBOL_GPL(x86_vector_domain);
 static DEFINE_RAW_SPINLOCK(vector_lock);
-static cpumask_var_t vector_cpumask;
+static cpumask_var_t vector_cpumask, searched_cpumask;
 static struct irq_chip lapic_controller;
 #ifdef  CONFIG_X86_IO_APIC
 static struct apic_chip_data *legacy_irq_data[NR_IRQS_LEGACY];
@@ -126,6 +126,7 @@ static int __assign_irq_vector(int irq, struct apic_chip_data *d,
         /* Only try and allocate irqs on cpus that are present */
         err = -ENOSPC;
         cpumask_clear(d->old_domain);
+        cpumask_clear(searched_cpumask);
         cpu = cpumask_first_and(mask, cpu_online_mask);
         while (cpu < nr_cpu_ids) {
                 int new_cpu, vector, offset;
@@ -159,9 +160,9 @@ next:
                 }
 
                 if (unlikely(current_vector == vector)) {
-                        cpumask_or(d->old_domain, d->old_domain,
+                        cpumask_or(searched_cpumask, searched_cpumask,
                                    vector_cpumask);
-                        cpumask_andnot(vector_cpumask, mask, d->old_domain);
+                        cpumask_andnot(vector_cpumask, mask, searched_cpumask);
                         cpu = cpumask_first_and(vector_cpumask,
                                                 cpu_online_mask);
                         continue;
@@ -406,6 +407,7 @@ int __init arch_early_irq_init(void)
         arch_init_htirq_domain(x86_vector_domain);
 
         BUG_ON(!alloc_cpumask_var(&vector_cpumask, GFP_KERNEL));
+        BUG_ON(!alloc_cpumask_var(&searched_cpumask, GFP_KERNEL));
 
         return arch_early_ioapic_init();
 }