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 2772AC43217 for ; Thu, 1 Dec 2022 12:44:00 +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:Date: Message-ID:From:References:CC:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=jdmR1A431rLmacH6e3dR3h+ncdk8N4SuAU6a07aYrk0=; b=aId2Zsl5v6CnTELDDQvb5C6RZn IA/1W2PRvJPCi4oTuQ1YRpUENQv12lzyLbonRxi8QV+hyE8ln2rTFfhtp/z4wu2//KOuXbejEwYrV zHkhmBZdQ3GXsax8a1FdVQRVlqGvVcPn1ccEJhb5aCTbGG5h374Og6Wp8CAdjrfpuSE+qu8iOdO6J dmJE3XR+b2PRDJBycDaU+PfvxIG5U+L47UAD5IUwhgcYzWr/dqQeOF0kMTkLM/4zMzXLjIE7/g8v3 kB6oMtItsH7Hj4PrEUVvCGQfqnXDJD8pEe7l9pX2xhsPqSMhU2kSjUky1GN1y80wedkqHib9Uozoo ZfzW3Gzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0itt-007M6P-Sh; Thu, 01 Dec 2022 12:42:49 +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 1p0itq-007M4K-Fl for linux-arm-kernel@lists.infradead.org; Thu, 01 Dec 2022 12:42:48 +0000 Received: from kwepemm600005.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NNG0N5xNnzHw22; Thu, 1 Dec 2022 20:41:24 +0800 (CST) Received: from [10.67.103.158] (10.67.103.158) 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; Thu, 1 Dec 2022 20:42:03 +0800 Subject: Re: [PATCH v2] iommu: fix smmu initialization memory leak problem To: Will Deacon CC: , , References: <20221121030421.19295-1-liulongfang@huawei.com> <20221121180552.GB7645@willie-the-truck> <20221129152452.GB26561@willie-the-truck> From: liulongfang Message-ID: Date: Thu, 1 Dec 2022 20:42:02 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20221129152452.GB26561@willie-the-truck> X-Originating-IP: [10.67.103.158] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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-20221201_044246_917485_5F74B490 X-CRM114-Status: GOOD ( 16.82 ) 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 2022/11/29 23:24, Will Deacon wrote: > On Tue, Nov 22, 2022 at 08:00:39PM +0800, liulongfang wrote: >> On 2022/11/22 2:05, Will Deacon wrote: >>> 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? >>> >> >> This patch is only for fixing iopf's memory leak. >> The use of devres_alloc() is an optimization solution for iopf queue management, >> which is another set of patch matters. > > Great, I look forward to that set of patches! > > Will > . > Will this patch be merged into the next branch? Thanks, Longfang. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel