All of lore.kernel.org
 help / color / mirror / Atom feed
From: Will Deacon <will@kernel.org>
To: Longfang Liu <liulongfang@huawei.com>
Cc: robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org,
	iommu@lists.linux.dev
Subject: Re: [PATCH 2/2] iommu: fix smmu initialization memory leak problem
Date: Mon, 14 Nov 2022 18:08:22 +0000	[thread overview]
Message-ID: <20221114180821.GC31476@willie-the-truck> (raw)
In-Reply-To: <20221021035147.15292-3-liulongfang@huawei.com>

On Fri, Oct 21, 2022 at 11:51:47AM +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.
> 
> Signed-off-by: Longfang Liu <liulongfang@huawei.com>
> ---
>  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;

Doesn't this miss the cases where iommu_device_sysfs_add() or
arm_smmu_device_reset() fail?

We'd probably be better off using something like devres_alloc() to track
the iopf queue here.

Will

WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will@kernel.org>
To: Longfang Liu <liulongfang@huawei.com>
Cc: robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org,
	iommu@lists.linux.dev
Subject: Re: [PATCH 2/2] iommu: fix smmu initialization memory leak problem
Date: Mon, 14 Nov 2022 18:08:22 +0000	[thread overview]
Message-ID: <20221114180821.GC31476@willie-the-truck> (raw)
In-Reply-To: <20221021035147.15292-3-liulongfang@huawei.com>

On Fri, Oct 21, 2022 at 11:51:47AM +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.
> 
> Signed-off-by: Longfang Liu <liulongfang@huawei.com>
> ---
>  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;

Doesn't this miss the cases where iommu_device_sysfs_add() or
arm_smmu_device_reset() fail?

We'd probably be better off using something like devres_alloc() to track
the iopf queue here.

Will

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2022-11-14 18:08 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-21  3:51 [PATCH 0/2] fix the memory leak of iopf Longfang Liu
2022-10-21  3:51 ` Longfang Liu
2022-10-21  3:51 ` [PATCH 1/2] iommu: fix " Longfang Liu
2022-10-21  3:51   ` Longfang Liu
2022-11-02  1:36   ` liulongfang
2022-11-02  1:36     ` liulongfang
2022-10-21  3:51 ` [PATCH 2/2] iommu: fix smmu initialization memory leak problem Longfang Liu
2022-10-21  3:51   ` Longfang Liu
2022-11-14 18:08   ` Will Deacon [this message]
2022-11-14 18:08     ` Will Deacon
2022-11-18  9:28     ` liulongfang
2022-11-18  9:28       ` liulongfang
2022-11-18 11:54       ` Robin Murphy
2022-11-18 11:54         ` Robin Murphy
2022-11-21  2:09         ` liulongfang
2022-11-21  2:09           ` liulongfang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221114180821.GC31476@willie-the-truck \
    --to=will@kernel.org \
    --cc=iommu@lists.linux.dev \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=liulongfang@huawei.com \
    --cc=robin.murphy@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.