5 files changed, 28 insertions, 24 deletions

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 8bebeb8952fb..88093c1d44fd 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -306,7 +306,8 @@ struct apic {
         unsigned long (*check_apicid_used)(physid_mask_t *map, int apicid);
         unsigned long (*check_apicid_present)(int apicid);
 
-        void (*vector_allocation_domain)(int cpu, struct cpumask *retmask);
+        void (*vector_allocation_domain)(int cpu, struct cpumask *retmask,
+                                         const struct cpumask *mask);
         void (*init_apic_ldr)(void);
 
         void (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap);
@@ -615,7 +616,8 @@ default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
                                unsigned int *apicid);
 
 static inline void
-flat_vector_allocation_domain(int cpu, struct cpumask *retmask)
+flat_vector_allocation_domain(int cpu, struct cpumask *retmask,
+                              const struct cpumask *mask)
 {
         /* Careful. Some cpus do not strictly honor the set of cpus
          * specified in the interrupt destination when using lowest
@@ -630,7 +632,8 @@ flat_vector_allocation_domain(int cpu, struct cpumask *retmask)
 }
 
 static inline void
-default_vector_allocation_domain(int cpu, struct cpumask *retmask)
+default_vector_allocation_domain(int cpu, struct cpumask *retmask,
+                                 const struct cpumask *mask)
 {
         cpumask_copy(retmask, cpumask_of(cpu));
 }
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 08c337bc49ff..e145f28b4099 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -100,7 +100,8 @@ static unsigned long noop_check_apicid_present(int bit)
         return physid_isset(bit, phys_cpu_present_map);
 }
 
-static void noop_vector_allocation_domain(int cpu, struct cpumask *retmask)
+static void noop_vector_allocation_domain(int cpu, struct cpumask *retmask,
+                                          const struct cpumask *mask)
 {
         if (cpu != 0)
                 pr_warning("APIC: Vector allocated for non-BSP cpu\n");
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 8a08f09aa505..9684f963befe 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1113,7 +1113,6 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask)
          */
         static int current_vector = FIRST_EXTERNAL_VECTOR + VECTOR_OFFSET_START;
         static int current_offset = VECTOR_OFFSET_START % 16;
-        unsigned int old_vector;
         int cpu, err;
         cpumask_var_t tmp_mask;
 
@@ -1123,28 +1122,28 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask)
         if (!alloc_cpumask_var(&tmp_mask, GFP_ATOMIC))
                 return -ENOMEM;
 
-        old_vector = cfg->vector;
-        if (old_vector) {
-                cpumask_and(tmp_mask, mask, cpu_online_mask);
-                if (cpumask_subset(tmp_mask, cfg->domain)) {
-                        free_cpumask_var(tmp_mask);
-                        return 0;
-                }
-        }
-
         /* Only try and allocate irqs on cpus that are present */
         err = -ENOSPC;
         cpumask_clear(cfg->old_domain);
         cpu = cpumask_first_and(mask, cpu_online_mask);
         while (cpu < nr_cpu_ids) {
-                int new_cpu;
-                int vector, offset;
+                int new_cpu, vector, offset;
 
-                apic->vector_allocation_domain(cpu, tmp_mask);
+                apic->vector_allocation_domain(cpu, tmp_mask, mask);
 
                 if (cpumask_subset(tmp_mask, cfg->domain)) {
-                        free_cpumask_var(tmp_mask);
-                        return 0;
+                        err = 0;
+                        if (cpumask_equal(tmp_mask, cfg->domain))
+                                break;
+                        /*
+                         * New cpumask using the vector is a proper subset of
+                         * the current in use mask. So cleanup the vector
+                         * allocation for the members that are not used anymore.
+                         */
+                        cpumask_andnot(cfg->old_domain, cfg->domain, tmp_mask);
+                        cfg->move_in_progress = 1;
+                        cpumask_and(cfg->domain, cfg->domain, tmp_mask);
+                        break;
                 }
 
                 vector = current_vector;
@@ -1172,7 +1171,7 @@ next:
                 /* Found one! */
                 current_vector = vector;
                 current_offset = offset;
-                if (old_vector) {
+                if (cfg->vector) {
                         cfg->move_in_progress = 1;
                         cpumask_copy(cfg->old_domain, cfg->domain);
                 }
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index b5d889b5659a..bde78d0098a4 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -212,10 +212,10 @@ static int x2apic_cluster_probe(void)
 /*
  * Each x2apic cluster is an allocation domain.
  */
-static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask)
+static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
+                                             const struct cpumask *mask)
 {
-        cpumask_clear(retmask);
-        cpumask_copy(retmask, per_cpu(cpus_in_cluster, cpu));
+        cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
 }
 
 static struct apic apic_x2apic_cluster = {
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 3f0285ac00fa..992f890283e9 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -208,7 +208,8 @@ static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
  * In vSMP, all cpus should be capable of handling interrupts, regardless of
  * the APIC used.
  */
-static void fill_vector_allocation_domain(int cpu, struct cpumask *retmask)
+static void fill_vector_allocation_domain(int cpu, struct cpumask *retmask,
+                                          const struct cpumask *mask)
 {
         cpumask_setall(retmask);
 }