From patchwork Fri Oct 21 03:51:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 13014261 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 3986CC43217 for ; Fri, 21 Oct 2022 03:54:01 +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:References:In-Reply-To: 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: List-Owner; bh=xQ/4mijbelalBK7WEZ4T1FvN+N0JwXI9oYu9kICuNAo=; b=eEOM9Vtiy7XtnS 39s1fHoMlJFrl3CpE4PlYeEWxTTVmJYGwyMnb3THPnBNw0UMbwcWpmGSLq4sFHFHYBlWTPfmSzQjr AY0YCDAmNhjRNNNWV3JvnPFCZuN8BPNfWvWJmPUZ9kVU9SR/KE7aag9b6YR/0A/uFPnElbNh7p6ve oEkQmPcrQ8HgVCUydpZULVAG1zIwaTcqHkg3KaqAXCBLUorv5eN0tm7ms9JzW5WCS+Qg4qiGICwhO 33uux6xPrW8YYJlOtRojtzR3G6Wv6ud/L1e6gDg0QczCcxO+69G159uwcyaA4MLNxFNHiyP8txy2e If/zdnbRrp/Sdr3aLI0Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1olj5h-004rhb-AL; Fri, 21 Oct 2022 03:53:01 +0000 Received: from szxga08-in.huawei.com ([45.249.212.255]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1olj5d-004rfp-SU for linux-arm-kernel@lists.infradead.org; Fri, 21 Oct 2022 03:52:59 +0000 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Mtr5z6QqKz1P74j; Fri, 21 Oct 2022 11:48:07 +0800 (CST) Received: from kwepemm600005.china.huawei.com (7.193.23.191) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 21 Oct 2022 11:52:51 +0800 Received: from huawei.com (10.67.164.66) by kwepemm600005.china.huawei.com (7.193.23.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 21 Oct 2022 11:52:51 +0800 From: Longfang Liu To: , CC: , , Subject: [PATCH 1/2] iommu: fix memory leak of iopf Date: Fri, 21 Oct 2022 11:51:46 +0800 Message-ID: <20221021035147.15292-2-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20221021035147.15292-1-liulongfang@huawei.com> References: <20221021035147.15292-1-liulongfang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221020_205258_109223_BF05E680 X-CRM114-Status: UNSURE ( 9.94 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In arm_smmu_init_queues(), if ARM_SMMU_FEAT_SVA and ARM_SMMU_FEAT_STALLS are enabled, iopf will be allocated a queue memory, and after arm_smmu_init_one_queue() processing fails, this part of iopf memory is not released, and there is a memory leak problem. Signed-off-by: Longfang Liu --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 6 +++++- 1 file changed, 5 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 b788a38d8fdf..a1db07bed6a9 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2939,9 +2939,13 @@ static int arm_smmu_init_queues(struct arm_smmu_device *smmu) if (!(smmu->features & ARM_SMMU_FEAT_PRI)) return 0; - return arm_smmu_init_one_queue(smmu, &smmu->priq.q, smmu->page1, + ret = arm_smmu_init_one_queue(smmu, &smmu->priq.q, smmu->page1, ARM_SMMU_PRIQ_PROD, ARM_SMMU_PRIQ_CONS, PRIQ_ENT_DWORDS, "priq"); + if (ret) + iopf_queue_free(smmu->evtq.iopf); + + return ret; } static int arm_smmu_init_l1_strtab(struct arm_smmu_device *smmu) From patchwork Fri Oct 21 03:51:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liulongfang X-Patchwork-Id: 13014262 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 9EA77C433FE for ; Fri, 21 Oct 2022 03:54:20 +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:References:In-Reply-To: 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: List-Owner; bh=X511aRrsV1wUZooGsWAP7/fURyzSZJDb4qQa3VxoXUk=; b=qPB9tI5vrkHbrG Oi0oIcFx/sFpVjDfWsJyyLk165Q9HKoGnOOxGpJAdBmVxxRBVAFVx6z2jATscrD33hNdB2wKQGuem tHFyyCP7FWdFvMMED9SsKqYwlWXOyeTn3Ntlypi88Fo74RfTxNGFHrmtGvu6u73RurmbBCASD0uDX pSrCBBxqeUTtb5RMHlr3FcGeTX52aE02ozHhJp4KlCGcLGuzGfltU+v1NUAF9h8UOPSqmaGULHAVF GGE5AvDQ8A3NkkQtc782qd7i9oTGH8Am8d0JCd9gE3QR+JG3XhjQE3p1arURx1Ow72umrDBJChmtA tNxfXkdHuuprttsFXIBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1olj67-004rqL-Cm; Fri, 21 Oct 2022 03:53:27 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1olj64-004rov-Dc for linux-arm-kernel@lists.infradead.org; Fri, 21 Oct 2022 03:53:25 +0000 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MtrCt2xXBzHv1k; Fri, 21 Oct 2022 11:53:14 +0800 (CST) Received: from kwepemm600005.china.huawei.com (7.193.23.191) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 21 Oct 2022 11:53:22 +0800 Received: from huawei.com (10.67.164.66) by kwepemm600005.china.huawei.com (7.193.23.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 21 Oct 2022 11:53:21 +0800 From: Longfang Liu To: , CC: , , Subject: [PATCH 2/2] iommu: fix smmu initialization memory leak problem Date: Fri, 21 Oct 2022 11:51:47 +0800 Message-ID: <20221021035147.15292-3-liulongfang@huawei.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20221021035147.15292-1-liulongfang@huawei.com> References: <20221021035147.15292-1-liulongfang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221020_205324_645224_98B23D59 X-CRM114-Status: UNSURE ( 9.88 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When iommu_device_register() in arm_smmu_device_probe() fails, in addition to sysfs needs to be deleted, device should also be disabled, and the memory of iopf needs to be released to prevent memory leak of iopf. Signed-off-by: Longfang Liu --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 a1db07bed6a9..c70defb0c866 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3816,11 +3816,16 @@ static int arm_smmu_device_probe(struct platform_device *pdev) ret = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev); if (ret) { dev_err(dev, "Failed to register iommu\n"); - iommu_device_sysfs_remove(&smmu->iommu); - return ret; + goto err_sysfs_remove; } return 0; + +err_sysfs_remove: + iommu_device_sysfs_remove(&smmu->iommu); + arm_smmu_device_disable(smmu); + iopf_queue_free(smmu->evtq.iopf); + return ret; } static int arm_smmu_device_remove(struct platform_device *pdev)