Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755371AbbLJSkK (ORCPT ); Thu, 10 Dec 2015 13:40:10 -0500 Received: from terminus.zytor.com ([198.137.202.10]:34100 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754424AbbLJSkI (ORCPT ); Thu, 10 Dec 2015 13:40:08 -0500 Date: Thu, 10 Dec 2015 10:39:56 -0800 From: tip-bot for Jiang Liu Message-ID: Cc: joe.lawrence@stratus.com, hpa@zytor.com, jiang.liu@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org Reply-To: mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, jiang.liu@linux.intel.com, joe.lawrence@stratus.com, hpa@zytor.com In-Reply-To: <1448870970-1461-2-git-send-email-jiang.liu@linux.intel.com> References: <1448870970-1461-2-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/irq: Enhance __assign_irq_vector() to rollback in case of failure Git-Commit-ID: 4c24cee6b2aeaee3dab896f76fef4fe79d9e4183 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3429 Lines: 98 Commit-ID: 4c24cee6b2aeaee3dab896f76fef4fe79d9e4183 Gitweb: http://git.kernel.org/tip/4c24cee6b2aeaee3dab896f76fef4fe79d9e4183 Author: Jiang Liu AuthorDate: Mon, 30 Nov 2015 16:09:27 +0800 Committer: Thomas Gleixner CommitDate: Thu, 10 Dec 2015 19:32:07 +0100 x86/irq: Enhance __assign_irq_vector() to rollback in case of failure Enhance __assign_irq_vector() to rollback in case of failure so the caller doesn't need to explicitly rollback. Fixes: a782a7e46bb5 "x86/irq: Store irq descriptor in vector array" Reported-and-tested-by: Joe Lawrence Signed-off-by: Jiang Liu Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/1448870970-1461-2-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/vector.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index d6ec36b..f03957e 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 = d->cfg.dest_apicid; if (d->move_in_progress) return -EBUSY; @@ -140,11 +141,16 @@ static int __assign_irq_vector(int irq, struct apic_chip_data *d, * 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) + 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 +173,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 +198,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 +500,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 = { -- 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/