From patchwork Fri Jun 7 22:30:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 249878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EB0ED2C00B8 for ; Sat, 8 Jun 2013 08:36:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757422Ab3FGWdG (ORCPT ); Fri, 7 Jun 2013 18:33:06 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:22295 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753181Ab3FGWdD (ORCPT ); Fri, 7 Jun 2013 18:33:03 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r57MVGa6022726 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 7 Jun 2013 22:31:17 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r57MVGl0008271 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 7 Jun 2013 22:31:16 GMT Received: from abhmt103.oracle.com (abhmt103.oracle.com [141.146.116.55]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r57MVFja008253; Fri, 7 Jun 2013 22:31:15 GMT Received: from linux-siqj.site (/10.132.126.191) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 07 Jun 2013 15:31:15 -0700 From: Yinghai Lu To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Bjorn Helgaas , "Rafael J. Wysocki" Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu , Joerg Roedel , Konrad Rzeszutek Wilk , Sebastian Andrzej Siewior Subject: [PATCH v3 11/27] x86, irq: Add realloc_irq_and_cfg_at() Date: Fri, 7 Jun 2013 15:30:57 -0700 Message-Id: <1370644273-10495-12-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370644273-10495-1-git-send-email-yinghai@kernel.org> References: <1370644273-10495-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org For ioapic hot-add support, it would be easy if we put all irqs for that ioapic controller together. We can reserve irq range at first, then reallocate those pre-reserved one when it is needed. Add realloc_irq_and_cfg_at() to really allocate irq_desc and cfg, because pre-reserved only mark bits in allocate_irqs bit maps. The reasons for not allocating them during reserving: 1. only several pins in ioapic are used, allocate for all pins, will waste memory for not used pins. 2. relocate later could make sure irq_desc is allocated on local node ram. as dev->node is set at that point. -v2: update changelog by adding reasons, requested by Konrad. Signed-off-by: Yinghai Lu Cc: Joerg Roedel Cc: Konrad Rzeszutek Wilk Cc: Sebastian Andrzej Siewior --- arch/x86/kernel/apic/io_apic.c | 32 +++++++++++++++++++++++++++++++- include/linux/irq.h | 5 +++++ kernel/irq/irqdesc.c | 26 ++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 670c538..a157a56 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -301,6 +301,36 @@ static void free_irq_at(unsigned int at, struct irq_cfg *cfg) irq_free_desc(at); } +static struct irq_cfg *realloc_irq_and_cfg_at(unsigned int at, int node) +{ + struct irq_desc *desc = irq_to_desc(at); + struct irq_cfg *cfg; + int res; + + if (desc) { + if (irq_desc_get_irq_data(desc)->node == node) + return alloc_irq_and_cfg_at(at, node); + + cfg = irq_desc_get_chip_data(desc); + if (cfg) { + /* shared irq */ + if (!list_empty(&cfg->irq_2_pin)) + return cfg; + free_irq_cfg(at, cfg); + } + } + + res = irq_realloc_desc_at(at, node); + if (res >= 0) { + cfg = alloc_irq_cfg(at, node); + if (cfg) { + irq_set_chip_data(at, cfg); + return cfg; + } + } + + return alloc_irq_and_cfg_at(at, node); +} struct io_apic { unsigned int index; @@ -3352,7 +3382,7 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) static int io_apic_setup_irq_pin(unsigned int irq, int node, struct io_apic_irq_attr *attr) { - struct irq_cfg *cfg = alloc_irq_and_cfg_at(irq, node); + struct irq_cfg *cfg = realloc_irq_and_cfg_at(irq, node); int ret; if (!cfg) diff --git a/include/linux/irq.h b/include/linux/irq.h index 4e0fcbb..9c6c047 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -602,6 +602,11 @@ void irq_free_descs(unsigned int irq, unsigned int cnt); int irq_reserve_irqs(unsigned int from, unsigned int cnt); int __irq_reserve_irqs(int irq, unsigned int from, unsigned int cnt); +int __irq_realloc_desc(int at, int node, struct module *owner); +/* use macros to avoid needing export.h for THIS_MODULE */ +#define irq_realloc_desc_at(at, node) \ + __irq_realloc_desc(at, node, THIS_MODULE) + static inline void irq_free_desc(unsigned int irq) { irq_free_descs(irq, 1); diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 3b9fb92..b48f65b 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -99,6 +99,11 @@ EXPORT_SYMBOL_GPL(nr_irqs); static DEFINE_MUTEX(sparse_irq_lock); static DECLARE_BITMAP(allocated_irqs, IRQ_BITMAP_BITS); +static bool __irq_is_reserved(int irq) +{ + return !!test_bit(irq, allocated_irqs); +} + #ifdef CONFIG_SPARSE_IRQ static RADIX_TREE(irq_desc_tree, GFP_KERNEL); @@ -410,6 +415,27 @@ __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node, EXPORT_SYMBOL_GPL(__irq_alloc_descs); /** + * irq_realloc_desc - allocate irq descriptor for irq that is already reserved + * @irq: Allocate for specific irq number if irq >= 0 + * @node: Preferred node on which the irq descriptor should be allocated + * @owner: Owning module (can be NULL) + * + * Returns the irq number or error code + */ +int __ref +__irq_realloc_desc(int irq, int node, struct module *owner) +{ + if (!__irq_is_reserved(irq)) + return -EINVAL; + + if (irq_to_desc(irq)) + free_desc(irq); + + return alloc_descs(irq, 1, node, owner); +} +EXPORT_SYMBOL_GPL(__irq_realloc_desc); + +/** * irq_reserve_irqs - mark irqs allocated * @from: mark from irq number * @cnt: number of irqs to mark