Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1297486
| From | Jiang Liu <jiang.liu@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [Bugfix v2 2/5] x86/irq: Enhance __assign_irq_vector() to rollback in case of failure |
| Date | 2015-12-23 15:20 +0100 |
| Message-ID | <qISqK-2fv-17@gated-at.bofh.it> (permalink) |
| References | <qHwsh-7Xj-15@gated-at.bofh.it> <qISqJ-2fv-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Enhance __assign_irq_vector() to rollback in case of failure so the
caller doesn't need to explicitly rollback.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
arch/x86/kernel/apic/vector.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index d6ec36b4461e..b32c6ef7b4b0 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -117,6 +117,7 @@ static int __assign_irq_vector(int irq, struct apic_chip_data *d,
static int current_vector = FIRST_EXTERNAL_VECTOR + VECTOR_OFFSET_START;
static int current_offset = VECTOR_OFFSET_START % 16;
int cpu, err;
+ unsigned int dest;
if (d->move_in_progress)
return -EBUSY;
@@ -132,19 +133,21 @@ static int __assign_irq_vector(int irq, struct apic_chip_data *d,
apic->vector_allocation_domain(cpu, vector_cpumask, mask);
if (cpumask_subset(vector_cpumask, d->domain)) {
- err = 0;
- if (cpumask_equal(vector_cpumask, d->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_and(used_cpumask, d->domain, vector_cpumask);
+ err = apic->cpu_mask_to_apicid_and(mask, used_cpumask,
+ &dest);
+ if (err || cpumask_equal(vector_cpumask, d->domain))
+ break;
cpumask_andnot(d->old_domain, d->domain,
vector_cpumask);
d->move_in_progress =
cpumask_intersects(d->old_domain, cpu_online_mask);
- cpumask_and(d->domain, d->domain, vector_cpumask);
+ cpumask_copy(d->domain, used_cpumask);
break;
}
@@ -167,11 +170,13 @@ next:
if (test_bit(vector, used_vectors))
goto next;
-
for_each_cpu_and(new_cpu, vector_cpumask, cpu_online_mask) {
if (!IS_ERR_OR_NULL(per_cpu(vector_irq, new_cpu)[vector]))
goto next;
}
+ if (apic->cpu_mask_to_apicid_and(mask, vector_cpumask, &dest))
+ goto next;
+
/* Found one! */
current_vector = vector;
current_offset = offset;
@@ -190,8 +195,7 @@ next:
if (!err) {
/* cache destination APIC IDs into cfg->dest_apicid */
- err = apic->cpu_mask_to_apicid_and(mask, d->domain,
- &d->cfg.dest_apicid);
+ d->cfg.dest_apicid = dest;
}
return err;
@@ -493,14 +497,8 @@ static int apic_set_affinity(struct irq_data *irq_data,
return -EINVAL;
err = assign_irq_vector(irq, data, dest);
- if (err) {
- if (assign_irq_vector(irq, data,
- irq_data_get_affinity_mask(irq_data)))
- pr_err("Failed to recover vector for irq %d\n", irq);
- return err;
- }
- return IRQ_SET_MASK_OK;
+ return err ? err : IRQ_SET_MASK_OK;
}
static struct irq_chip lapic_controller = {
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Re: [lkp] [x86/irq] 4c24cee6b2: IP-Config: Auto-configuration of network failed Jiang Liu <jiang.liu@linux.intel.com> - 2015-12-14 07:40 +0100
Re: [LKP] [lkp] [x86/irq] 4c24cee6b2: IP-Config: Auto-configuration of network failed "Huang\, Ying" <ying.huang@intel.com> - 2015-12-14 08:00 +0100
Re: [LKP] [lkp] [x86/irq] 4c24cee6b2: IP-Config: Auto-configuration of network failed Borislav Petkov <bp@alien8.de> - 2015-12-14 11:00 +0100
Re: [LKP] [lkp] [x86/irq] 4c24cee6b2: IP-Config: Auto-configuration of network failed Jiang Liu <jiang.liu@linux.intel.com> - 2015-12-15 09:00 +0100
Re: [LKP] [lkp] [x86/irq] 4c24cee6b2: IP-Config: Auto-configuration of network failed Borislav Petkov <bp@alien8.de> - 2015-12-15 11:10 +0100
Re: [LKP] [lkp] [x86/irq] 4c24cee6b2: IP-Config: Auto-configuration of network failed Thomas Gleixner <tglx@linutronix.de> - 2015-12-19 21:40 +0100
[Bugfix v2 5/5] x86/irq: Trivial cleanups for x86 vector allocation code Jiang Liu <jiang.liu@linux.intel.com> - 2015-12-23 15:20 +0100
[Bugfix v2 1/5] x86/irq: Do not reuse struct apic_chip_data.old_domain as temporary buffer Jiang Liu <jiang.liu@linux.intel.com> - 2015-12-23 15:20 +0100
[Bugfix v2 3/5] x86/irq: Fix a race window in x86_vector_free_irqs() Jiang Liu <jiang.liu@linux.intel.com> - 2015-12-23 15:20 +0100
Re: [Bugfix v2 3/5] x86/irq: Fix a race window in x86_vector_free_irqs() Thomas Gleixner <tglx@linutronix.de> - 2015-12-29 14:50 +0100
[Bugfix v2 2/5] x86/irq: Enhance __assign_irq_vector() to rollback in case of failure Jiang Liu <jiang.liu@linux.intel.com> - 2015-12-23 15:20 +0100
Re: [Bugfix v2 2/5] x86/irq: Enhance __assign_irq_vector() to rollback in case of failure Thomas Gleixner <tglx@linutronix.de> - 2015-12-30 20:00 +0100
[Bugfix v2 4/5] x86/irq: Fix a race condition between vector assigning and cleanup Jiang Liu <jiang.liu@linux.intel.com> - 2015-12-23 15:20 +0100
Re: [Bugfix v2 4/5] x86/irq: Fix a race condition between vector assigning and cleanup Borislav Petkov <bp@alien8.de> - 2015-12-23 19:50 +0100
Re: [Bugfix v2 4/5] x86/irq: Fix a race condition between vector assigning and cleanup Thomas Gleixner <tglx@linutronix.de> - 2015-12-30 18:30 +0100
Re: [Bugfix v2 4/5] x86/irq: Fix a race condition between vector assigning and cleanup Thomas Gleixner <tglx@linutronix.de> - 2015-12-31 00:00 +0100
Re: [Bugfix v2 1/5] x86/irq: Do not reuse struct apic_chip_data.old_domain as temporary buffer Borislav Petkov <bp@alien8.de> - 2015-12-23 20:20 +0100
Re: [Bugfix v2 1/5] x86/irq: Do not reuse struct apic_chip_data.old_domain as temporary buffer Jeremiah Mahler <jmmahler@gmail.com> - 2015-12-24 06:20 +0100
Re: [Bugfix v2 1/5] x86/irq: Do not reuse struct apic_chip_data.old_domain as temporary buffer Jiang Liu <jiang.liu@linux.intel.com> - 2015-12-28 09:30 +0100
Re: [Bugfix v2 1/5] x86/irq: Do not reuse struct apic_chip_data.old_domain as temporary buffer Jeremiah Mahler <jmmahler@gmail.com> - 2015-12-29 04:30 +0100
Re: [Bugfix v2 1/5] x86/irq: Do not reuse struct apic_chip_data.old_domain as temporary buffer Joe Lawrence <joe.lawrence@stratus.com> - 2015-12-24 15:40 +0100
csiph-web