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 DD50DC433FE for ; Mon, 21 Nov 2022 18:06:57 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4xz7PmAdBG4jS2I6jT3LmUSvRz7gbW5A9Hc/8euZHBg=; b=CVz5vEUfwYtnT+ Tmb88GfM5/muWdpWq0rNJxg675PewBhIpjyDloznJ26UklYFV3aUDzqWh+TqxgVnTwp42I+g4y3Dr 1Oh7eMtWRQHrQcJsJ+oH27RGRHRTfyTXohE934+o8H9lWZuhbrAL5wfd+KyGdUyYFIQj4D37YUotf nH6YlR7jWNdmKRpaPsFUQUW3IHnb6/phqKo5wQWjidquI7hnNRWEgdALi35PQQaYKKK/yRzWsK9Fr AmiLLV9XN+w5XvqLa35Q0QeiX8GKc1M4ZRTJwnPOFuGjDJe0e/89UImMxwi2jiXJyBCZOHyj0e5qx vDIRlMIVcNewAguBZfTg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxBBC-00GdJ9-2f; Mon, 21 Nov 2022 18:06:02 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxBB9-00GdIh-Oq for linux-arm-kernel@lists.infradead.org; Mon, 21 Nov 2022 18:06:01 +0000 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 2442E61374; Mon, 21 Nov 2022 18:05:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 931F9C433C1; Mon, 21 Nov 2022 18:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669053958; bh=2lsKTqMwT3+dFZ/UNz0+idX/0zWQNI0kZA93uSAEzok=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jNE83fCrpTjfNKpfavKQY0d8ZCGu+vrkGg/8UyFeYRvXlX1NfEZcNR/tYILbpqLLr /XZ7a/uc811rQ0jPlBBMo1llNzphr+iZpkz+odRkW40P656uPlQi3r49C39atQkCl3 eG6dpAhOioHmpQX1FY1iq0PToG+Jq4dLKxxLUhMIEgBHpC3mZULCOgsIiPpcz0EJIX KLk58eVphGBPJSWXFkPnErSMUKwP18Yyy5q9oINMj+PKrK1RMfpcWZ6ESMSEUeOjYY WpHFXSodtjxs6v+WD8j+7uqx+HaPaKRFsTEtovoOBIHNwI2+itL2wywcsfYuF76zJh DV9BckaYUyxag== Date: Mon, 21 Nov 2022 18:05:53 +0000 From: Will Deacon To: Longfang Liu Cc: robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev Subject: Re: [PATCH v2] iommu: fix smmu initialization memory leak problem Message-ID: <20221121180552.GB7645@willie-the-truck> References: <20221121030421.19295-1-liulongfang@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221121030421.19295-1-liulongfang@huawei.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_100559_865044_27A2F90C X-CRM114-Status: GOOD ( 21.77 ) 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 On Mon, Nov 21, 2022 at 11:04:21AM +0800, Longfang Liu wrote: > 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. > > Changes v1 -> v2: > -Improve arm_smmu_device_probe() abnormal exit function. > > Signed-off-by: Longfang Liu > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 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 ab160198edd6..b892f5233f88 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -3815,7 +3815,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev) > /* Initialise in-memory data structures */ > ret = arm_smmu_init_structures(smmu); > if (ret) > - return ret; > + goto err_iopf; > > /* Record our private device structure */ > platform_set_drvdata(pdev, smmu); > @@ -3826,22 +3826,28 @@ static int arm_smmu_device_probe(struct platform_device *pdev) > /* Reset the device */ > ret = arm_smmu_device_reset(smmu, bypass); > if (ret) > - return ret; > + goto err_iopf; > > /* And we're up. Go go go! */ > ret = iommu_device_sysfs_add(&smmu->iommu, dev, NULL, > "smmu3.%pa", &ioaddr); > if (ret) > - return ret; > + goto err_reset; > > 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_add; > } > > return 0; > +err_sysfs_add: > + iommu_device_sysfs_remove(&smmu->iommu); > +err_reset: > + arm_smmu_device_disable(smmu); > +err_iopf: > + iopf_queue_free(smmu->evtq.iopf); > + return ret; I previously suggested using devres_alloc() for this instead. Did that not work? Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel