Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757293AbbLWOLK (ORCPT ); Wed, 23 Dec 2015 09:11:10 -0500 Received: from mga14.intel.com ([192.55.52.115]:41947 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757176AbbLWOK1 (ORCPT ); Wed, 23 Dec 2015 09:10:27 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,469,1444719600"; d="scan'208";a="622778088" From: Jiang Liu To: Thomas Gleixner , Joe Lawrence , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Jiang Liu Cc: Jeremiah Mahler , Borislav Petkov , andy.shevchenko@gmail.com, Guenter Roeck , linux-kernel@vger.kernel.org Subject: [Bugfix v2 2/5] x86/irq: Enhance __assign_irq_vector() to rollback in case of failure Date: Wed, 23 Dec 2015 22:13:27 +0800 Message-Id: <1450880014-11741-2-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1450880014-11741-1-git-send-email-jiang.liu@linux.intel.com> References: <1450880014-11741-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3045 Lines: 95 Enhance __assign_irq_vector() to rollback in case of failure so the caller doesn't need to explicitly rollback. Signed-off-by: Jiang Liu --- 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/