From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2D25C64EC5 for ; Fri, 10 Feb 2023 09:10:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231521AbjBJJKY (ORCPT ); Fri, 10 Feb 2023 04:10:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231997AbjBJJJ4 (ORCPT ); Fri, 10 Feb 2023 04:09:56 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F31488A5E; Fri, 10 Feb 2023 01:09:54 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8BDEBB82411; Fri, 10 Feb 2023 09:09:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F500C433D2; Fri, 10 Feb 2023 09:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676020192; bh=E0QhmYiydASqfN8MTMYbJ6wSLeRqSYszN21QVpSZuLQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ICIdDTiA6npsxKMecK3CdDuRB2cTb1OM2ac9WOWkHOLtcGvsaLwbOfUvJwGAsyb/k v57MKYYVUE4VWIfvHwjHuS7bPROdCTsNeRvHsTibkYnSquhiC/KOIHTp9/unE6xg2W qE9YO2VEAYLELXEYavYmZp2i97gkvTX7TqAC/xz/UmCut32oEquvl40zPcg0Go+H1v C0Hj9kPIvkBNCofP28B6bUROs6PwygNqIDVqBrGKBbygFqPMsdWeEeb9Bf58y2iiQ1 1mCdhUvP8kTlkToJItV3jIqYS4RRCYOZquQbnbfcmOckSxggsQOd/g4keyjLiqC0uh 1OK2bobecuR2g== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pQPQP-00053R-GH; Fri, 10 Feb 2023 10:10:33 +0100 Date: Fri, 10 Feb 2023 10:10:33 +0100 From: Johan Hovold To: Marc Zyngier Cc: Johan Hovold , Thomas Gleixner , x86@kernel.org, platform-driver-x86@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Dmitry Torokhov , Jon Hunter , Hsin-Yi Wang , Mark-PK Tsai Subject: Re: [PATCH v5 06/19] irqdomain: Fix mapping-creation race Message-ID: References: <20230209132323.4599-1-johan+linaro@kernel.org> <20230209132323.4599-7-johan+linaro@kernel.org> <86edqzylzs.wl-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <86edqzylzs.wl-maz@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 09, 2023 at 02:03:19PM +0000, Marc Zyngier wrote: > On Thu, 09 Feb 2023 13:23:10 +0000, > Johan Hovold wrote: > > > > Parallel probing of devices that share interrupts (e.g. when a driver > > uses asynchronous probing) can currently result in two mappings for the > > same hardware interrupt to be created due to missing serialisation. > > > > Make sure to hold the irq_domain_mutex when creating mappings so that > > looking for an existing mapping before creating a new one is done > > atomically. > > > > Fixes: 765230b5f084 ("driver-core: add asynchronous probing support for drivers") > > Fixes: b62b2cf5759b ("irqdomain: Fix handling of type settings for existing mappings") > > Link: https://lore.kernel.org/r/YuJXMHoT4ijUxnRb@hovoldconsulting.com > > Cc: stable@vger.kernel.org # 4.8 > > Cc: Dmitry Torokhov > > Cc: Jon Hunter > > Tested-by: Hsin-Yi Wang > > Tested-by: Mark-PK Tsai > > Signed-off-by: Johan Hovold > > --- > > kernel/irq/irqdomain.c | 55 ++++++++++++++++++++++++++++++------------ > > 1 file changed, 40 insertions(+), 15 deletions(-) > > > > diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c > > index 7b57949bc79c..1ddb01bd49a4 100644 > > --- a/kernel/irq/irqdomain.c > > +++ b/kernel/irq/irqdomain.c > > @@ -25,6 +25,9 @@ static DEFINE_MUTEX(irq_domain_mutex); > > > > static struct irq_domain *irq_default_domain; > > > > +static int irq_domain_alloc_irqs_locked(struct irq_domain *domain, int irq_base, > > + unsigned int nr_irqs, int node, void *arg, > > + bool realloc, const struct irq_affinity_desc *affinity); > > static void irq_domain_check_hierarchy(struct irq_domain *domain); > > > > struct irqchip_fwid { > > @@ -682,9 +685,9 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain) > > EXPORT_SYMBOL_GPL(irq_create_direct_mapping); > > #endif > > > > -static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain, > > - irq_hw_number_t hwirq, > > - const struct irq_affinity_desc *affinity) > > +static unsigned int irq_create_mapping_affinity_locked(struct irq_domain *domain, > > + irq_hw_number_t hwirq, > > + const struct irq_affinity_desc *affinity) > > { > > struct device_node *of_node = irq_domain_get_of_node(domain); > > int virq; > > @@ -699,7 +702,7 @@ static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain, > > return 0; > > } > > > > - if (irq_domain_associate(domain, virq, hwirq)) { > > + if (irq_domain_associate_locked(domain, virq, hwirq)) { > > irq_free_desc(virq); > > return 0; > > } > > @@ -735,14 +738,20 @@ unsigned int irq_create_mapping_affinity(struct irq_domain *domain, > > return 0; > > } > > > > + mutex_lock(&irq_domain_mutex); > > + > > /* Check if mapping already exists */ > > virq = irq_find_mapping(domain, hwirq); > > if (virq) { > > pr_debug("existing mapping on virq %d\n", virq); > > - return virq; > > + goto out; > > } > > > > - return __irq_create_mapping_affinity(domain, hwirq, affinity); > > + virq = irq_create_mapping_affinity_locked(domain, hwirq, affinity); > > +out: > > + mutex_unlock(&irq_domain_mutex); > > + > > + return virq; > > } > > EXPORT_SYMBOL_GPL(irq_create_mapping_affinity); > > > > @@ -809,6 +818,8 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) > > if (WARN_ON(type & ~IRQ_TYPE_SENSE_MASK)) > > type &= IRQ_TYPE_SENSE_MASK; > > > > + mutex_lock(&irq_domain_mutex); > > + > > /* > > * If we've already configured this interrupt, > > * don't do it again, or hell will break loose. > > @@ -821,7 +832,7 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) > > * interrupt number. > > */ > > if (type == IRQ_TYPE_NONE || type == irq_get_trigger_type(virq)) > > - return virq; > > + goto out; > > > > /* > > * If the trigger type has not been set yet, then set > > @@ -830,36 +841,43 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) > > if (irq_get_trigger_type(virq) == IRQ_TYPE_NONE) { > > irq_data = irq_get_irq_data(virq); > > if (!irq_data) > > - return 0; > > + goto err; > > > > irqd_set_trigger_type(irq_data, type); > > - return virq; > > + goto out; > > } > > > > pr_warn("type mismatch, failed to map hwirq-%lu for %s!\n", > > hwirq, of_node_full_name(to_of_node(fwspec->fwnode))); > > - return 0; > > + goto err; > > } > > > > if (irq_domain_is_hierarchy(domain)) { > > - virq = irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, fwspec); > > + virq = irq_domain_alloc_irqs_locked(domain, -1, 1, NUMA_NO_NODE, > > + fwspec, false, NULL); > > if (virq <= 0) > > - return 0; > > + goto err; > > } else { > > /* Create mapping */ > > - virq = __irq_create_mapping_affinity(domain, hwirq, NULL); > > + virq = irq_create_mapping_affinity_locked(domain, hwirq, NULL); > > if (!virq) > > - return virq; > > + goto err; > > } > > > > irq_data = irq_get_irq_data(virq); > > if (WARN_ON(!irq_data)) > > - return 0; > > + goto err; > > > > /* Store trigger type */ > > irqd_set_trigger_type(irq_data, type); > > +out: > > + mutex_unlock(&irq_domain_mutex); > > > > return virq; > > +err: > > + mutex_unlock(&irq_domain_mutex); > > + > > + return 0; > > nit: it'd look better if we had a single exit path with the unlock, > setting virq to 0 on failure. Not a big deal, as this can be tidied up > when applied. Using a single exit path would result in a slightly bigger diff (5 lines) and would not separate the success and error paths as clearly, but yeah, it's possibly still preferred (see result below). Johan diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 7b57949bc79c..bfda4adc05c0 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -25,6 +25,9 @@ static DEFINE_MUTEX(irq_domain_mutex); static struct irq_domain *irq_default_domain; +static int irq_domain_alloc_irqs_locked(struct irq_domain *domain, int irq_base, + unsigned int nr_irqs, int node, void *arg, + bool realloc, const struct irq_affinity_desc *affinity); static void irq_domain_check_hierarchy(struct irq_domain *domain); struct irqchip_fwid { @@ -682,9 +685,9 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain) EXPORT_SYMBOL_GPL(irq_create_direct_mapping); #endif -static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain, - irq_hw_number_t hwirq, - const struct irq_affinity_desc *affinity) +static unsigned int irq_create_mapping_affinity_locked(struct irq_domain *domain, + irq_hw_number_t hwirq, + const struct irq_affinity_desc *affinity) { struct device_node *of_node = irq_domain_get_of_node(domain); int virq; @@ -699,7 +702,7 @@ static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain, return 0; } - if (irq_domain_associate(domain, virq, hwirq)) { + if (irq_domain_associate_locked(domain, virq, hwirq)) { irq_free_desc(virq); return 0; } @@ -735,14 +738,20 @@ unsigned int irq_create_mapping_affinity(struct irq_domain *domain, return 0; } + mutex_lock(&irq_domain_mutex); + /* Check if mapping already exists */ virq = irq_find_mapping(domain, hwirq); if (virq) { pr_debug("existing mapping on virq %d\n", virq); - return virq; + goto out; } - return __irq_create_mapping_affinity(domain, hwirq, affinity); + virq = irq_create_mapping_affinity_locked(domain, hwirq, affinity); +out: + mutex_unlock(&irq_domain_mutex); + + return virq; } EXPORT_SYMBOL_GPL(irq_create_mapping_affinity); @@ -809,6 +818,8 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) if (WARN_ON(type & ~IRQ_TYPE_SENSE_MASK)) type &= IRQ_TYPE_SENSE_MASK; + mutex_lock(&irq_domain_mutex); + /* * If we've already configured this interrupt, * don't do it again, or hell will break loose. @@ -821,7 +832,7 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) * interrupt number. */ if (type == IRQ_TYPE_NONE || type == irq_get_trigger_type(virq)) - return virq; + goto out; /* * If the trigger type has not been set yet, then set @@ -829,35 +840,45 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) */ if (irq_get_trigger_type(virq) == IRQ_TYPE_NONE) { irq_data = irq_get_irq_data(virq); - if (!irq_data) - return 0; + if (!irq_data) { + virq = 0; + goto out; + } irqd_set_trigger_type(irq_data, type); - return virq; + goto out; } pr_warn("type mismatch, failed to map hwirq-%lu for %s!\n", hwirq, of_node_full_name(to_of_node(fwspec->fwnode))); - return 0; + virq = 0; + goto out; } if (irq_domain_is_hierarchy(domain)) { - virq = irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, fwspec); - if (virq <= 0) - return 0; + virq = irq_domain_alloc_irqs_locked(domain, -1, 1, NUMA_NO_NODE, + fwspec, false, NULL); + if (virq <= 0) { + virq = 0; + goto out; + } } else { /* Create mapping */ - virq = __irq_create_mapping_affinity(domain, hwirq, NULL); + virq = irq_create_mapping_affinity_locked(domain, hwirq, NULL); if (!virq) - return virq; + goto out; } irq_data = irq_get_irq_data(virq); - if (WARN_ON(!irq_data)) - return 0; + if (WARN_ON(!irq_data)) { + virq = 0; + goto out; + } /* Store trigger type */ irqd_set_trigger_type(irq_data, type); +out: + mutex_unlock(&irq_domain_mutex); return virq; } @@ -1888,6 +1909,13 @@ void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, irq_set_handler_data(virq, handler_data); } +static int irq_domain_alloc_irqs_locked(struct irq_domain *domain, int irq_base, + unsigned int nr_irqs, int node, void *arg, + bool realloc, const struct irq_affinity_desc *affinity) +{ + return -EINVAL; +} + static void irq_domain_check_hierarchy(struct irq_domain *domain) { } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE32CC636CD for ; Fri, 10 Feb 2023 09:10:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PAZ5O/RisdcZOnNaOZNyMkmiUfBtQTuoSv+FKad9WFI=; b=ThBO10cBGIhXmp vAIJwYgXw6AQSDz31kH6YuJ7/tD6LJ+zB29s9QD5s2fGVr0XrQs18N21PTU54pTXukIvlzEbbrhik qP7jmGHAIfFugSW/NQgIU1quhbC4s8/bLHIf7Cjx+Yjerr0AwB/DQzAGlvx10sl1nqUhkt3lpdUUO PCpKJwsun4ScaYMZP5hFdLm5WkPiBr/OQknBE5aB3mbnzDwL92rwm6vvPyXp7YhiPiXJ5LKApbgLG OTwc4HW1NTe/PA3soBYOLHhXPWom6N69EViBcebCwwFaLij9lx6WZvdZVi573J5S+TqM6nyAE9K0a 2Y5ABCmBIwOB3b+DuxPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQPPr-004xmy-DU; Fri, 10 Feb 2023 09:09:59 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQPPm-004xkJ-9D for linux-arm-kernel@lists.infradead.org; Fri, 10 Feb 2023 09:09:57 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E7BC361D12; Fri, 10 Feb 2023 09:09:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F500C433D2; Fri, 10 Feb 2023 09:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676020192; bh=E0QhmYiydASqfN8MTMYbJ6wSLeRqSYszN21QVpSZuLQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ICIdDTiA6npsxKMecK3CdDuRB2cTb1OM2ac9WOWkHOLtcGvsaLwbOfUvJwGAsyb/k v57MKYYVUE4VWIfvHwjHuS7bPROdCTsNeRvHsTibkYnSquhiC/KOIHTp9/unE6xg2W qE9YO2VEAYLELXEYavYmZp2i97gkvTX7TqAC/xz/UmCut32oEquvl40zPcg0Go+H1v C0Hj9kPIvkBNCofP28B6bUROs6PwygNqIDVqBrGKBbygFqPMsdWeEeb9Bf58y2iiQ1 1mCdhUvP8kTlkToJItV3jIqYS4RRCYOZquQbnbfcmOckSxggsQOd/g4keyjLiqC0uh 1OK2bobecuR2g== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pQPQP-00053R-GH; Fri, 10 Feb 2023 10:10:33 +0100 Date: Fri, 10 Feb 2023 10:10:33 +0100 From: Johan Hovold To: Marc Zyngier Cc: Johan Hovold , Thomas Gleixner , x86@kernel.org, platform-driver-x86@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Dmitry Torokhov , Jon Hunter , Hsin-Yi Wang , Mark-PK Tsai Subject: Re: [PATCH v5 06/19] irqdomain: Fix mapping-creation race Message-ID: References: <20230209132323.4599-1-johan+linaro@kernel.org> <20230209132323.4599-7-johan+linaro@kernel.org> <86edqzylzs.wl-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <86edqzylzs.wl-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230210_010954_464508_3F456E3E X-CRM114-Status: GOOD ( 40.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Feb 09, 2023 at 02:03:19PM +0000, Marc Zyngier wrote: > On Thu, 09 Feb 2023 13:23:10 +0000, > Johan Hovold wrote: > > > > Parallel probing of devices that share interrupts (e.g. when a driver > > uses asynchronous probing) can currently result in two mappings for the > > same hardware interrupt to be created due to missing serialisation. > > > > Make sure to hold the irq_domain_mutex when creating mappings so that > > looking for an existing mapping before creating a new one is done > > atomically. > > > > Fixes: 765230b5f084 ("driver-core: add asynchronous probing support for drivers") > > Fixes: b62b2cf5759b ("irqdomain: Fix handling of type settings for existing mappings") > > Link: https://lore.kernel.org/r/YuJXMHoT4ijUxnRb@hovoldconsulting.com > > Cc: stable@vger.kernel.org # 4.8 > > Cc: Dmitry Torokhov > > Cc: Jon Hunter > > Tested-by: Hsin-Yi Wang > > Tested-by: Mark-PK Tsai > > Signed-off-by: Johan Hovold > > --- > > kernel/irq/irqdomain.c | 55 ++++++++++++++++++++++++++++++------------ > > 1 file changed, 40 insertions(+), 15 deletions(-) > > > > diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c > > index 7b57949bc79c..1ddb01bd49a4 100644 > > --- a/kernel/irq/irqdomain.c > > +++ b/kernel/irq/irqdomain.c > > @@ -25,6 +25,9 @@ static DEFINE_MUTEX(irq_domain_mutex); > > > > static struct irq_domain *irq_default_domain; > > > > +static int irq_domain_alloc_irqs_locked(struct irq_domain *domain, int irq_base, > > + unsigned int nr_irqs, int node, void *arg, > > + bool realloc, const struct irq_affinity_desc *affinity); > > static void irq_domain_check_hierarchy(struct irq_domain *domain); > > > > struct irqchip_fwid { > > @@ -682,9 +685,9 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain) > > EXPORT_SYMBOL_GPL(irq_create_direct_mapping); > > #endif > > > > -static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain, > > - irq_hw_number_t hwirq, > > - const struct irq_affinity_desc *affinity) > > +static unsigned int irq_create_mapping_affinity_locked(struct irq_domain *domain, > > + irq_hw_number_t hwirq, > > + const struct irq_affinity_desc *affinity) > > { > > struct device_node *of_node = irq_domain_get_of_node(domain); > > int virq; > > @@ -699,7 +702,7 @@ static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain, > > return 0; > > } > > > > - if (irq_domain_associate(domain, virq, hwirq)) { > > + if (irq_domain_associate_locked(domain, virq, hwirq)) { > > irq_free_desc(virq); > > return 0; > > } > > @@ -735,14 +738,20 @@ unsigned int irq_create_mapping_affinity(struct irq_domain *domain, > > return 0; > > } > > > > + mutex_lock(&irq_domain_mutex); > > + > > /* Check if mapping already exists */ > > virq = irq_find_mapping(domain, hwirq); > > if (virq) { > > pr_debug("existing mapping on virq %d\n", virq); > > - return virq; > > + goto out; > > } > > > > - return __irq_create_mapping_affinity(domain, hwirq, affinity); > > + virq = irq_create_mapping_affinity_locked(domain, hwirq, affinity); > > +out: > > + mutex_unlock(&irq_domain_mutex); > > + > > + return virq; > > } > > EXPORT_SYMBOL_GPL(irq_create_mapping_affinity); > > > > @@ -809,6 +818,8 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) > > if (WARN_ON(type & ~IRQ_TYPE_SENSE_MASK)) > > type &= IRQ_TYPE_SENSE_MASK; > > > > + mutex_lock(&irq_domain_mutex); > > + > > /* > > * If we've already configured this interrupt, > > * don't do it again, or hell will break loose. > > @@ -821,7 +832,7 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) > > * interrupt number. > > */ > > if (type == IRQ_TYPE_NONE || type == irq_get_trigger_type(virq)) > > - return virq; > > + goto out; > > > > /* > > * If the trigger type has not been set yet, then set > > @@ -830,36 +841,43 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) > > if (irq_get_trigger_type(virq) == IRQ_TYPE_NONE) { > > irq_data = irq_get_irq_data(virq); > > if (!irq_data) > > - return 0; > > + goto err; > > > > irqd_set_trigger_type(irq_data, type); > > - return virq; > > + goto out; > > } > > > > pr_warn("type mismatch, failed to map hwirq-%lu for %s!\n", > > hwirq, of_node_full_name(to_of_node(fwspec->fwnode))); > > - return 0; > > + goto err; > > } > > > > if (irq_domain_is_hierarchy(domain)) { > > - virq = irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, fwspec); > > + virq = irq_domain_alloc_irqs_locked(domain, -1, 1, NUMA_NO_NODE, > > + fwspec, false, NULL); > > if (virq <= 0) > > - return 0; > > + goto err; > > } else { > > /* Create mapping */ > > - virq = __irq_create_mapping_affinity(domain, hwirq, NULL); > > + virq = irq_create_mapping_affinity_locked(domain, hwirq, NULL); > > if (!virq) > > - return virq; > > + goto err; > > } > > > > irq_data = irq_get_irq_data(virq); > > if (WARN_ON(!irq_data)) > > - return 0; > > + goto err; > > > > /* Store trigger type */ > > irqd_set_trigger_type(irq_data, type); > > +out: > > + mutex_unlock(&irq_domain_mutex); > > > > return virq; > > +err: > > + mutex_unlock(&irq_domain_mutex); > > + > > + return 0; > > nit: it'd look better if we had a single exit path with the unlock, > setting virq to 0 on failure. Not a big deal, as this can be tidied up > when applied. Using a single exit path would result in a slightly bigger diff (5 lines) and would not separate the success and error paths as clearly, but yeah, it's possibly still preferred (see result below). Johan diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 7b57949bc79c..bfda4adc05c0 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -25,6 +25,9 @@ static DEFINE_MUTEX(irq_domain_mutex); static struct irq_domain *irq_default_domain; +static int irq_domain_alloc_irqs_locked(struct irq_domain *domain, int irq_base, + unsigned int nr_irqs, int node, void *arg, + bool realloc, const struct irq_affinity_desc *affinity); static void irq_domain_check_hierarchy(struct irq_domain *domain); struct irqchip_fwid { @@ -682,9 +685,9 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain) EXPORT_SYMBOL_GPL(irq_create_direct_mapping); #endif -static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain, - irq_hw_number_t hwirq, - const struct irq_affinity_desc *affinity) +static unsigned int irq_create_mapping_affinity_locked(struct irq_domain *domain, + irq_hw_number_t hwirq, + const struct irq_affinity_desc *affinity) { struct device_node *of_node = irq_domain_get_of_node(domain); int virq; @@ -699,7 +702,7 @@ static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain, return 0; } - if (irq_domain_associate(domain, virq, hwirq)) { + if (irq_domain_associate_locked(domain, virq, hwirq)) { irq_free_desc(virq); return 0; } @@ -735,14 +738,20 @@ unsigned int irq_create_mapping_affinity(struct irq_domain *domain, return 0; } + mutex_lock(&irq_domain_mutex); + /* Check if mapping already exists */ virq = irq_find_mapping(domain, hwirq); if (virq) { pr_debug("existing mapping on virq %d\n", virq); - return virq; + goto out; } - return __irq_create_mapping_affinity(domain, hwirq, affinity); + virq = irq_create_mapping_affinity_locked(domain, hwirq, affinity); +out: + mutex_unlock(&irq_domain_mutex); + + return virq; } EXPORT_SYMBOL_GPL(irq_create_mapping_affinity); @@ -809,6 +818,8 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) if (WARN_ON(type & ~IRQ_TYPE_SENSE_MASK)) type &= IRQ_TYPE_SENSE_MASK; + mutex_lock(&irq_domain_mutex); + /* * If we've already configured this interrupt, * don't do it again, or hell will break loose. @@ -821,7 +832,7 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) * interrupt number. */ if (type == IRQ_TYPE_NONE || type == irq_get_trigger_type(virq)) - return virq; + goto out; /* * If the trigger type has not been set yet, then set @@ -829,35 +840,45 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) */ if (irq_get_trigger_type(virq) == IRQ_TYPE_NONE) { irq_data = irq_get_irq_data(virq); - if (!irq_data) - return 0; + if (!irq_data) { + virq = 0; + goto out; + } irqd_set_trigger_type(irq_data, type); - return virq; + goto out; } pr_warn("type mismatch, failed to map hwirq-%lu for %s!\n", hwirq, of_node_full_name(to_of_node(fwspec->fwnode))); - return 0; + virq = 0; + goto out; } if (irq_domain_is_hierarchy(domain)) { - virq = irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, fwspec); - if (virq <= 0) - return 0; + virq = irq_domain_alloc_irqs_locked(domain, -1, 1, NUMA_NO_NODE, + fwspec, false, NULL); + if (virq <= 0) { + virq = 0; + goto out; + } } else { /* Create mapping */ - virq = __irq_create_mapping_affinity(domain, hwirq, NULL); + virq = irq_create_mapping_affinity_locked(domain, hwirq, NULL); if (!virq) - return virq; + goto out; } irq_data = irq_get_irq_data(virq); - if (WARN_ON(!irq_data)) - return 0; + if (WARN_ON(!irq_data)) { + virq = 0; + goto out; + } /* Store trigger type */ irqd_set_trigger_type(irq_data, type); +out: + mutex_unlock(&irq_domain_mutex); return virq; } @@ -1888,6 +1909,13 @@ void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, irq_set_handler_data(virq, handler_data); } +static int irq_domain_alloc_irqs_locked(struct irq_domain *domain, int irq_base, + unsigned int nr_irqs, int node, void *arg, + bool realloc, const struct irq_affinity_desc *affinity) +{ + return -EINVAL; +} + static void irq_domain_check_hierarchy(struct irq_domain *domain) { } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel