From patchwork Mon Feb 13 19:40:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 56526 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2538728wrn; Mon, 13 Feb 2023 11:46:28 -0800 (PST) X-Google-Smtp-Source: AK7set/4lKY+E1pHfZBD2fAAdGkOLyPJ+vSd/zq7i5OsFxTlWmYEtlQec6+jn4AX0dgSz2ofporA X-Received: by 2002:a50:d58f:0:b0:49e:45a8:1ac9 with SMTP id v15-20020a50d58f000000b0049e45a81ac9mr27513312edi.24.1676317588746; Mon, 13 Feb 2023 11:46:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676317588; cv=none; d=google.com; s=arc-20160816; b=FLE2OReTl9Xo0tSx0m8Ebe4z//p8SAOHSOba8tFTOemJUsTuOipAVXguVX+IynMb7+ brX5nvpWTP2vCheZ9BGcQ53Y/tMS4CVkDJdX/WQI0oPJyil9LYyb3Bg5RubAWqwxvjru QeS7QZdFuqRWCI8uQC6oluDIeaPRNjsRAlu81dTXonkZ3kJUpM7rYV76GIc+10wrEu3l XSerC/3tVa3teOQAuRD9+NIBe6KG74AVMJcX4qWolwYgXU9KQUgsqGFXhosPV//K5MY+ 1+0i5oB+JMe++j08vIIhJRsj+TGDRvnwshrUVgOlk2SjFg8MUbSDabIFSjs+N3Gfupvm YqJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=KzeHGgvkX+Nt+MgOfx9ti11J/vWu5266SjUSl8+hVOc=; b=YENLNfbophvPdEv+SIyckZRjidVNrzuR7x8za6lQXEK03rvPTTqO8K0p/MpalwqLi8 WwO4qRcqiIXZE1T4RGFOKe6jD84H90uMWsi1W+nAoPvrrgemS/iZ4tAPgRT694YzF9Am bmwcsCsQk9joDNYuxEt0kcphVlrk9pq3nCckZHKQR8RwQ7g2eVVmZsONpyXIVMm1zkGK ElcIK0hxjonZspvLLvKrJhaOBa7MZjjI35KHpX7Pji09VzzXgB/tqvgxRhTd85hhOnMt SRSxkKqMefs8RZplcYhOaifkafrAFxgsaw+bizoRp2JufD+/9PnymkL8erQSpvoPYeZi 4tng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="W/ZkWIYX"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=vf5tOxgq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r26-20020aa7d15a000000b004acbebc9408si5997662edo.383.2023.02.13.11.46.04; Mon, 13 Feb 2023 11:46:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="W/ZkWIYX"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=vf5tOxgq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231451AbjBMTlZ (ORCPT + 99 others); Mon, 13 Feb 2023 14:41:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231332AbjBMTkx (ORCPT ); Mon, 13 Feb 2023 14:40:53 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CC5E1A652; Mon, 13 Feb 2023 11:40:47 -0800 (PST) Date: Mon, 13 Feb 2023 19:40:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1676317246; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KzeHGgvkX+Nt+MgOfx9ti11J/vWu5266SjUSl8+hVOc=; b=W/ZkWIYXBZHcec/LUSm3xMkOS7Z0p2WykYpX1H5pU/k1kgL+IhwLUTaVGDT7ZGecAD1Noc 4uqt+J7xmhZSfqn1Ctp/PHcL0atJksrGXtV6hJ9uPxaHPf99wpQF9W+/5VS/yTERnBub6l gDVZ6YZrD9Q3WvmSKJoRrWSLbyMoyDdih74R+Dem18PtIq4p2pTvKZ3YuQdFW94/2/i3aD hzCZGDdWQlj0t/1Vpq02xSgLIP2p+gz7A1K+7LINEU9DctzYaEDFlImEcjTilyCk+9xXC3 3KNT7VJPAAeGOkliGADRINSKOBgEjdSwpTpWPwRlTkSscD90u93fCls9K4uMLQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1676317246; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KzeHGgvkX+Nt+MgOfx9ti11J/vWu5266SjUSl8+hVOc=; b=vf5tOxgqZ4NUqxcTyOadOzeOgmiLUxPaDnS5mrwaIBvO5IMgPpNdC4CeTFbWxt+HLp7+6b GEu7JwQx9Z75uqAw== From: "irqchip-bot for Johan Hovold" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-kernel@vger.kernel.org Subject: [irqchip: irq/irqchip-next] irqdomain: Fix mapping-creation race Cc: stable@vger.kernel.org, #@tip-bot2.tec.linutronix.de, 4.8@tip-bot2.tec.linutronix.de, Dmitry Torokhov , Jon Hunter , "Hsin-Yi Wang" , "Mark-PK Tsai" , Johan Hovold , Marc Zyngier , tglx@linutronix.de In-Reply-To: References: MIME-Version: 1.0 Message-ID: <167631724582.4906.1030848345430656452.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757746391998645316?= X-GMAIL-MSGID: =?utf-8?q?1757746391998645316?= The following commit has been merged into the irq/irqchip-next branch of irqchip: Commit-ID: 601363cc08da25747feb87c55573dd54de91d66a Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/601363cc08da25747feb87c55573dd54de91d66a Author: Johan Hovold AuthorDate: Mon, 13 Feb 2023 11:42:48 +01:00 Committer: Marc Zyngier CommitterDate: Mon, 13 Feb 2023 19:31:24 irqdomain: Fix mapping-creation race 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 Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20230213104302.17307-7-johan+linaro@kernel.org --- kernel/irq/irqdomain.c | 64 +++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 78fb480..df0cbad 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) { }