From patchwork Thu Feb 9 13:23:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 54954 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp333817wrn; Thu, 9 Feb 2023 05:31:21 -0800 (PST) X-Google-Smtp-Source: AK7set+0CDrFbIcL9CjyAu0YoA6uAGKnNCi/1N/0DR/Esf1mI9l4GeDTec10uRHxXItM5Um8kv99 X-Received: by 2002:a17:902:e2d4:b0:199:1eba:e0e2 with SMTP id l20-20020a170902e2d400b001991ebae0e2mr9297742plc.48.1675949481316; Thu, 09 Feb 2023 05:31:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675949481; cv=none; d=google.com; s=arc-20160816; b=B+IPWJVoJmIk9KBJmQ+N1Jgoxg830QLw5pU3cKxjLw7/DH5ndQN4hH0G83lQ2F7NVB X3eDYPdVXlA8gAXWGW1NkQWwDJZju7m5WYLVMyYPM3IOxAnRCI1DCLEDCVSQKmY6uu+k Hgl2itu0QBPO41Vnh6gvYIBk+xjFBu6zefv8oKFmoZJIhd+UKzgZW8GIwqu1GDaQniu5 do8uXRFeTehkUDo+IE1kZufm/dSxgvDzdgxpf+2xaXIgGhTPoLmz7+JtoQcagXY6ZFFS kTwWyXFyKu0tG4ruMfTltWfl3FGdcryHBd0G5nn1yuBOCGQiXwubnzZc/4oU01Qz7Xuu i9wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bHucTcZl/jD6O2+OJrhTP0IRhn3SS+CrVkBfUUo54gs=; b=jb8aVnFkOomRBTV5VUYPoafrV1/JAtGANA7bzZHqDFjGqr4J0BWBxKY4rVFEyZri3P yDN9sBkBIi1CExRvd1GUWb+gHOhN/3WWMGWHp3Oot5d0vEJ++zkUWEuZbYzGMkiQOHCV bB53fTmWi3vjV9RBAzwJXuuD2cq0hLXsFRELd6OSWr2jDh62IMLN0L79bb4Ncyr7kgFP yWBIejTHyNQ5Mt1yp75EZnrOjH2Dzj3Jlnc1VIhIUSxDf4D1rIHr71BXpdzI/HsVQUwW m/5MW0OYPCnX+lKjNVz2pVGP6M8meJqaCUVcwb2iglDeTklWOqwR/TsuYcYF3toswjtk 6Xbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="sa/Ksdyj"; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j7-20020a170903024700b001933989d4f8si1890474plh.344.2023.02.09.05.31.07; Thu, 09 Feb 2023 05:31:21 -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=@kernel.org header.s=k20201202 header.b="sa/Ksdyj"; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230216AbjBINar (ORCPT + 99 others); Thu, 9 Feb 2023 08:30:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229677AbjBINao (ORCPT ); Thu, 9 Feb 2023 08:30:44 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D456A23C66; Thu, 9 Feb 2023 05:30:43 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 5E37861A51; Thu, 9 Feb 2023 13:30:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC8A9C433EF; Thu, 9 Feb 2023 13:30:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675949442; bh=m6miDDXDPE0i8gfLkqlExqia0yJKU93vQt0xdTn6QTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sa/KsdyjZtn4lNGlYVyABiISMRaa4wwQBRmFtr+M+MjPvP8y+PRzLXqo89kivIomd S/PCuMrHmTTouqFOVc51sYPzkBJAh1CO89W1KzQu+w33SmAmW0PJ0+aHDsv0d4PRIb POhLEV8bZceaHkWq1M1Jl1P1xV+UEelGyBJFWe3XIspLbOqyhP7frvAjajH46LDiPi ObKuQb4r08H88CaO5GAFSC4Tx9igwxJcaE6yhq/+OYeIJeDpy9ldfhIeNXvAa6zog6 X8cGet21q1o9Of7xfeIVLhj6vsJg4PDJcN77OFOI26NWCu/aM5WeY9WuYpi48SqMk3 V2Rq26Ho7O1Fg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pQ71G-0001Kl-B0; Thu, 09 Feb 2023 14:31:22 +0100 From: Johan Hovold To: Marc Zyngier , Thomas Gleixner Cc: 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, Johan Hovold , stable@vger.kernel.org, Hsin-Yi Wang , Mark-PK Tsai Subject: [PATCH v5 03/19] irqdomain: Drop bogus fwspec-mapping error handling Date: Thu, 9 Feb 2023 14:23:07 +0100 Message-Id: <20230209132323.4599-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209132323.4599-1-johan+linaro@kernel.org> References: <20230209132323.4599-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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?1757360403374970753?= X-GMAIL-MSGID: =?utf-8?q?1757360403374970753?= In case a newly allocated IRQ ever ends up not having any associated struct irq_data it would not even be possible to dispose the mapping. Replace the bogus disposal with a WARN_ON(). This will also be used to fix a shared-interrupt mapping race, hence the CC-stable tag. Fixes: 1e2a7d78499e ("irqdomain: Don't set type when mapping an IRQ") Cc: stable@vger.kernel.org # 4.8 Tested-by: Hsin-Yi Wang Tested-by: Mark-PK Tsai Signed-off-by: Johan Hovold --- kernel/irq/irqdomain.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 981cd636275e..b4326c364ae7 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -847,13 +847,8 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) } irq_data = irq_get_irq_data(virq); - if (!irq_data) { - if (irq_domain_is_hierarchy(domain)) - irq_domain_free_irqs(virq, 1); - else - irq_dispose_mapping(virq); + if (WARN_ON(!irq_data)) return 0; - } /* Store trigger type */ irqd_set_trigger_type(irq_data, type);