Received: by 2002:ab2:1149:0:b0:1f3:1f8c:d0c6 with SMTP id z9csp2503144lqz; Tue, 2 Apr 2024 22:38:43 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUc9tcHvWCV3/m8XJDHStA2qk2/NSEksEJozpWKOoLx+pP/DmsiYVW/6HXQP35H8xDsRQq7gEddnTgestsam2hbJmAosCBmdfUEYnkfqg== X-Google-Smtp-Source: AGHT+IHuMi4ByVXZgXeM2GPtVzpPmR46oJL4mUe/xOQkA3K10nwpmQPSw94Jd1dhMtShiJyjnDrG X-Received: by 2002:a25:ab41:0:b0:dcf:a52d:6134 with SMTP id u59-20020a25ab41000000b00dcfa52d6134mr1654333ybi.26.1712122723175; Tue, 02 Apr 2024 22:38:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712122723; cv=pass; d=google.com; s=arc-20160816; b=eGjOZNqMYuB9TVNApHwmr+VdbW5PUnruikl40Ar4FgYLbDD44P9X+pG5RAoYx6w//X Y8jl7aeNi64D2n1/dPf14F3BDUI2F38NUv5yccf3HBUeAykaG1w3mBvsEipsFm2bhUR1 8atL2vWI9QrNgcnOqXOXxISQLIr2JBV4KubTcx9QRuI09gYyoOe1Oo0GYzKDxTrAko2Z mA0F8xfVW7jhBSDmYt3StUdSrIm6se5MY4HzzdR9iVZ7VOqsZctjML3P6JFBjvBO2cZk l/TnZaGHj9EE9CpVGj2YfMUf8eOAGcsuJFS/EfJdIhLT+NhGGG9sb01Ku7uDts8fFOik DbNQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from; bh=vNcHTifbesH0w/L+uoEgQXfaokdI1N3Wt7GnEsYJjcE=; fh=xXpCvVa4Ge6EXjmbPT7M9T9vlEj9C5andg/LHi+yD/E=; b=cQZ/BPSXza+mVc3VrPncHfBcCkyWulokuQT5ruBFDSb0MaoHksf+E5IEzjiv4ohgOq 0fzLOyzUvZh01c2IHssanUfgWt2XWjKsTDI4x916FnjcC4QFNpehXeNYibusocGB731a ZsP93/8eFPI0gxwAw4FbwdbSjCElzDAPwWsQ00gRxcT8yLjFdB5Zw+36qhGsKpaMR6e9 GuOIiIpkbgf/TpjtyuVg+Abcwf/y7TcF1aLR7IQSu9zQ5p0TtSHt6k8r90mrjy9mgXwc 9/n0NQVKg9nZJJuaSFHjJy45aqLQEI7nJCN6mgg1f3is/JTY9avtg53qHE9Fne9SkEKf rcRw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=usergate.com dmarc=pass fromdomain=usergate.com); spf=pass (google.com: domain of linux-kernel+bounces-129060-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-129060-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=usergate.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id t17-20020a05622a181100b00432f67ee8a8si5580072qtc.502.2024.04.02.22.38.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 22:38:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-129060-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=usergate.com dmarc=pass fromdomain=usergate.com); spf=pass (google.com: domain of linux-kernel+bounces-129060-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-129060-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=usergate.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id DF7CD1C22B50 for ; Wed, 3 Apr 2024 05:38:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 98BC54CB2B; Wed, 3 Apr 2024 05:38:38 +0000 (UTC) Received: from mx2.usergate.com (mx2.usergate.com [46.229.79.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3BD0481B9; Wed, 3 Apr 2024 05:38:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.229.79.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712122718; cv=none; b=Be1zPWR4kOhI3qfGzQP6xWt7QHIpCqQ7roxfpbSKiYw2g6HjKx5MuojOwDXGUKZ3gMDU9q9G/99Whw4vqI37tCSUIH75JGUqdk1TxWH8W0lh0bncNwT0YOR9/7ZMlAk74ZluE5SfrjPPTLVa4Z9gNUJzqvwfHA4taL/wVU6vfww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712122718; c=relaxed/simple; bh=CcOvEUgR8chhkIdWxTxpLG3HR9fLkgvm9yVe5mo91c8=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=B/BeZ285LQKEYvF9W+LTcWiTbL/RZsoykAQ0ngkAXkTQYzAvUgXa8AnPZcJhrjVvpVGB20jbenwTnC35kjAcsvkXfSzreE5h1HXo4pifPlWvnWU1bKNfgIqtP2n+yimkke+BMiObLJSGcXuQzMzRaORqqQPmJutwsvQP2trTcaM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=usergate.com; spf=pass smtp.mailfrom=usergate.com; arc=none smtp.client-ip=46.229.79.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=usergate.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=usergate.com 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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 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