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 34E88CD1288 for ; Wed, 3 Apr 2024 05:40:46 +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:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=KM1Pte2slcSSUJa5lhO76Y/wFnWY0KiWxcT+p8/950g=; b=d8xXMj8X150OoZ D5hbgyzDAsis8F4uLgIO02EQ1JKsuKsFQUKTr/Pfj6fHbic8vQfVUYVbKZ5FzqjoYx+8OeCNPw5MG 0NYmZZfzdwmJHEtHNFYqatWTua8uCh1t47qkIUqb56djUfuvwAIqzN1r/SVU4LPDOnbiV7y1RiQpV qcnotSWeJajNFyKRGvvAbBX+xrfh7RDIJE+8x8Ov9xb4NUvtQUzx4ZaXPHYPuMwHdypWx/fwwUTh8 gKFkdDlSqVmQAZmYxoslriYNibXTC5Vh6UWSIdWbYVPGLqYBPMoTVZwib5shfBgJSppM8H+6wdCPw 3ZT+lA4GaKTlqqGANo/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrtMS-0000000E9EB-1zu1; Wed, 03 Apr 2024 05:40:36 +0000 Received: from mx2.usergate.com ([46.229.79.1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrtMP-0000000E8fU-0bcJ for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2024 05:40:35 +0000 Received: from mail.usergate.com[192.168.90.36] by mx2.usergate.com with ESMTP id A452EB77F704403199B0207900608AD4; Wed, 3 Apr 2024 12:38:16 +0700 From: Aleksandr Aprelkov To: Will Deacon CC: Aleksandr Aprelkov ,Robin Murphy ,Joerg Roedel ,Jason Gunthorpe ,Nicolin Chen ,Michael Shavit ,Lu Baolu ,Marc Zyngier ,,, Subject: [PATCH v2] iommu/arm-smmu-v3: Free MSIs in case of ENOMEM Date: Wed, 3 Apr 2024 12:37:59 +0700 Message-ID: <20240403053759.643164-1-aaprelkov@usergate.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [192.168.54.39] X-ClientProxiedBy: ESLSRV-EXCH-01.esafeline.com (192.168.90.36) To nsk02-mbx01.esafeline.com (10.10.1.35) X-Message-Id: 1272D41AA31D440C91BED49E08E93E6E X-MailFileId: C27D6DCE0D394F88AD178F0EA783DDC3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240402_224033_746973_70EF4D17 X-CRM114-Status: UNSURE ( 9.00 ) X-CRM114-Notice: Please train this message. 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 If devm_add_action() returns ENOMEM, then MSIs allocated but not freed on teardown. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 166bdbd23161 ("iommu/arm-smmu: Add support for MSI on SMMUv3") Signed-off-by: Aleksandr Aprelkov --- v2: Use appropriate function for registration failure as Jonathan Cameron suggested. drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 41f93c3ab160..8800af041e5f 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3402,7 +3402,9 @@ static void arm_smmu_setup_msis(struct arm_smmu_device *smmu) smmu->priq.q.irq = msi_get_virq(dev, PRIQ_MSI_INDEX); /* Add callback to free MSIs on teardown */ - devm_add_action(dev, arm_smmu_free_msis, dev); + ret = devm_add_action_or_reset(dev, arm_smmu_free_msis, dev); + if (ret) + dev_warn(dev, "failed to add free MSIs callback - falling back to wired irqs\n"); } static void arm_smmu_setup_unique_irqs(struct arm_smmu_device *smmu) -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel