* [PATCH 0/2] media: rkisp1: Fix memory leaks
@ 2023-11-22 14:42 Tomi Valkeinen
2023-11-22 14:42 ` [PATCH 1/2] media: rkisp1: Fix media device memory leak Tomi Valkeinen
2023-11-22 14:42 ` [PATCH 2/2] media: rkisp1: Fix memory leaks in rkisp1_isp_unregister() Tomi Valkeinen
0 siblings, 2 replies; 8+ messages in thread
From: Tomi Valkeinen @ 2023-11-22 14:42 UTC (permalink / raw)
To: Dafna Hirschfeld, Laurent Pinchart, Mauro Carvalho Chehab,
Heiko Stuebner, Jacob Chen, Yichong Zhong, Shunqian Zheng,
Paul Elder, Sakari Ailus
Cc: Kieran Bingham, Hans Verkuil, Eddie Cai, Allon Huang, Jeffy Chen,
linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
Tomi Valkeinen
Fix two memory leaks in rkisp1 driver.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
Tomi Valkeinen (2):
media: rkisp1: Fix media device memory leak
media: rkisp1: Fix memory leaks in rkisp1_isp_unregister()
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 +++
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 1 +
2 files changed, 4 insertions(+)
---
base-commit: 1865913dd590ca6d5e3207b15099a1210dd62f29
change-id: 20231122-rkisp-fixes-c2795cafda52
Best regards,
--
Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] media: rkisp1: Fix media device memory leak
2023-11-22 14:42 [PATCH 0/2] media: rkisp1: Fix memory leaks Tomi Valkeinen
@ 2023-11-22 14:42 ` Tomi Valkeinen
2023-11-22 15:12 ` Tommaso Merciai
2023-11-22 15:42 ` Laurent Pinchart
2023-11-22 14:42 ` [PATCH 2/2] media: rkisp1: Fix memory leaks in rkisp1_isp_unregister() Tomi Valkeinen
1 sibling, 2 replies; 8+ messages in thread
From: Tomi Valkeinen @ 2023-11-22 14:42 UTC (permalink / raw)
To: Dafna Hirschfeld, Laurent Pinchart, Mauro Carvalho Chehab,
Heiko Stuebner, Jacob Chen, Yichong Zhong, Shunqian Zheng,
Paul Elder, Sakari Ailus
Cc: Kieran Bingham, Hans Verkuil, Eddie Cai, Allon Huang, Jeffy Chen,
linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
Tomi Valkeinen
Add missing calls to media_device_cleanup() to fix memory leak.
Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver")
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index c41abd2833f1..e10cc2881757 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -617,6 +617,7 @@ static int rkisp1_probe(struct platform_device *pdev)
media_device_unregister(&rkisp1->media_dev);
err_unreg_v4l2_dev:
v4l2_device_unregister(&rkisp1->v4l2_dev);
+ media_device_cleanup(&rkisp1->media_dev);
err_pm_runtime_disable:
pm_runtime_disable(&pdev->dev);
return ret;
@@ -637,6 +638,8 @@ static void rkisp1_remove(struct platform_device *pdev)
media_device_unregister(&rkisp1->media_dev);
v4l2_device_unregister(&rkisp1->v4l2_dev);
+ media_device_cleanup(&rkisp1->media_dev);
+
pm_runtime_disable(&pdev->dev);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] media: rkisp1: Fix media device memory leak
2023-11-22 14:42 ` [PATCH 1/2] media: rkisp1: Fix media device memory leak Tomi Valkeinen
@ 2023-11-22 15:12 ` Tommaso Merciai
2023-11-22 15:42 ` Laurent Pinchart
1 sibling, 0 replies; 8+ messages in thread
From: Tommaso Merciai @ 2023-11-22 15:12 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Dafna Hirschfeld, Laurent Pinchart, Mauro Carvalho Chehab,
Heiko Stuebner, Jacob Chen, Yichong Zhong, Shunqian Zheng,
Paul Elder, Sakari Ailus, Kieran Bingham, Hans Verkuil, Eddie Cai,
Allon Huang, Jeffy Chen, linux-media, linux-rockchip,
linux-arm-kernel, linux-kernel
Hi Tomi,
On Wed, Nov 22, 2023 at 04:42:22PM +0200, Tomi Valkeinen wrote:
> Add missing calls to media_device_cleanup() to fix memory leak.
>
> Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver")
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> ---
> drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index c41abd2833f1..e10cc2881757 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -617,6 +617,7 @@ static int rkisp1_probe(struct platform_device *pdev)
> media_device_unregister(&rkisp1->media_dev);
> err_unreg_v4l2_dev:
> v4l2_device_unregister(&rkisp1->v4l2_dev);
> + media_device_cleanup(&rkisp1->media_dev);
> err_pm_runtime_disable:
> pm_runtime_disable(&pdev->dev);
> return ret;
> @@ -637,6 +638,8 @@ static void rkisp1_remove(struct platform_device *pdev)
> media_device_unregister(&rkisp1->media_dev);
> v4l2_device_unregister(&rkisp1->v4l2_dev);
>
> + media_device_cleanup(&rkisp1->media_dev);
> +
> pm_runtime_disable(&pdev->dev);
> }
Looks good to me.
Reviewed-by: Tommaso Merciai <tomm.merciai@gmail.com>
Thanks & Regards,
Tommaso
>
>
> --
> 2.34.1
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] media: rkisp1: Fix media device memory leak
2023-11-22 14:42 ` [PATCH 1/2] media: rkisp1: Fix media device memory leak Tomi Valkeinen
2023-11-22 15:12 ` Tommaso Merciai
@ 2023-11-22 15:42 ` Laurent Pinchart
2023-11-22 15:44 ` Tomi Valkeinen
1 sibling, 1 reply; 8+ messages in thread
From: Laurent Pinchart @ 2023-11-22 15:42 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Dafna Hirschfeld, Mauro Carvalho Chehab, Heiko Stuebner,
Jacob Chen, Yichong Zhong, Shunqian Zheng, Paul Elder,
Sakari Ailus, Kieran Bingham, Hans Verkuil, Eddie Cai,
Allon Huang, Jeffy Chen, linux-media, linux-rockchip,
linux-arm-kernel, linux-kernel
Hi Tomi,
Thank you for the patch.
On Wed, Nov 22, 2023 at 04:42:22PM +0200, Tomi Valkeinen wrote:
> Add missing calls to media_device_cleanup() to fix memory leak.
>
> Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver")
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> ---
> drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index c41abd2833f1..e10cc2881757 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -617,6 +617,7 @@ static int rkisp1_probe(struct platform_device *pdev)
> media_device_unregister(&rkisp1->media_dev);
> err_unreg_v4l2_dev:
> v4l2_device_unregister(&rkisp1->v4l2_dev);
> + media_device_cleanup(&rkisp1->media_dev);
As media_device_cleanup() cleans up for media_device_init(), shouldn't
it go to the err_pm_runtime_disable label ? The label may need to be
renamed to err_media_cleanup then.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> err_pm_runtime_disable:
> pm_runtime_disable(&pdev->dev);
> return ret;
> @@ -637,6 +638,8 @@ static void rkisp1_remove(struct platform_device *pdev)
> media_device_unregister(&rkisp1->media_dev);
> v4l2_device_unregister(&rkisp1->v4l2_dev);
>
> + media_device_cleanup(&rkisp1->media_dev);
> +
> pm_runtime_disable(&pdev->dev);
> }
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] media: rkisp1: Fix media device memory leak
2023-11-22 15:42 ` Laurent Pinchart
@ 2023-11-22 15:44 ` Tomi Valkeinen
0 siblings, 0 replies; 8+ messages in thread
From: Tomi Valkeinen @ 2023-11-22 15:44 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Dafna Hirschfeld, Mauro Carvalho Chehab, Heiko Stuebner,
Jacob Chen, Yichong Zhong, Shunqian Zheng, Paul Elder,
Sakari Ailus, Kieran Bingham, Hans Verkuil, Eddie Cai,
Allon Huang, Jeffy Chen, linux-media, linux-rockchip,
linux-arm-kernel, linux-kernel
On 22/11/2023 17:42, Laurent Pinchart wrote:
> Hi Tomi,
>
> Thank you for the patch.
>
> On Wed, Nov 22, 2023 at 04:42:22PM +0200, Tomi Valkeinen wrote:
>> Add missing calls to media_device_cleanup() to fix memory leak.
>>
>> Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver")
>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
>> ---
>> drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
>> index c41abd2833f1..e10cc2881757 100644
>> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
>> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
>> @@ -617,6 +617,7 @@ static int rkisp1_probe(struct platform_device *pdev)
>> media_device_unregister(&rkisp1->media_dev);
>> err_unreg_v4l2_dev:
>> v4l2_device_unregister(&rkisp1->v4l2_dev);
>> + media_device_cleanup(&rkisp1->media_dev);
>
> As media_device_cleanup() cleans up for media_device_init(), shouldn't
> it go to the err_pm_runtime_disable label ? The label may need to be
> renamed to err_media_cleanup then.
Oops, you're right. I'll fix that.
Tomi
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
>> err_pm_runtime_disable:
>> pm_runtime_disable(&pdev->dev);
>> return ret;
>> @@ -637,6 +638,8 @@ static void rkisp1_remove(struct platform_device *pdev)
>> media_device_unregister(&rkisp1->media_dev);
>> v4l2_device_unregister(&rkisp1->v4l2_dev);
>>
>> + media_device_cleanup(&rkisp1->media_dev);
>> +
>> pm_runtime_disable(&pdev->dev);
>> }
>>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] media: rkisp1: Fix memory leaks in rkisp1_isp_unregister()
2023-11-22 14:42 [PATCH 0/2] media: rkisp1: Fix memory leaks Tomi Valkeinen
2023-11-22 14:42 ` [PATCH 1/2] media: rkisp1: Fix media device memory leak Tomi Valkeinen
@ 2023-11-22 14:42 ` Tomi Valkeinen
2023-11-22 15:15 ` Tommaso Merciai
2023-11-22 15:43 ` Laurent Pinchart
1 sibling, 2 replies; 8+ messages in thread
From: Tomi Valkeinen @ 2023-11-22 14:42 UTC (permalink / raw)
To: Dafna Hirschfeld, Laurent Pinchart, Mauro Carvalho Chehab,
Heiko Stuebner, Jacob Chen, Yichong Zhong, Shunqian Zheng,
Paul Elder, Sakari Ailus
Cc: Kieran Bingham, Hans Verkuil, Eddie Cai, Allon Huang, Jeffy Chen,
linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
Tomi Valkeinen
Add missing call to v4l2_subdev_cleanup() to fix memory leak.
Fixes: 2cce0a369dbd ("media: rkisp1: isp: Use V4L2 subdev active state")
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index 88ca8b2283b7..45d1ab96fc6e 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -933,6 +933,7 @@ void rkisp1_isp_unregister(struct rkisp1_device *rkisp1)
return;
v4l2_device_unregister_subdev(&isp->sd);
+ v4l2_subdev_cleanup(&isp->sd);
media_entity_cleanup(&isp->sd.entity);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] media: rkisp1: Fix memory leaks in rkisp1_isp_unregister()
2023-11-22 14:42 ` [PATCH 2/2] media: rkisp1: Fix memory leaks in rkisp1_isp_unregister() Tomi Valkeinen
@ 2023-11-22 15:15 ` Tommaso Merciai
2023-11-22 15:43 ` Laurent Pinchart
1 sibling, 0 replies; 8+ messages in thread
From: Tommaso Merciai @ 2023-11-22 15:15 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Dafna Hirschfeld, Laurent Pinchart, Mauro Carvalho Chehab,
Heiko Stuebner, Jacob Chen, Yichong Zhong, Shunqian Zheng,
Paul Elder, Sakari Ailus, Kieran Bingham, Hans Verkuil, Eddie Cai,
Allon Huang, Jeffy Chen, linux-media, linux-rockchip,
linux-arm-kernel, linux-kernel
Hi Tomi,
On Wed, Nov 22, 2023 at 04:42:23PM +0200, Tomi Valkeinen wrote:
> Add missing call to v4l2_subdev_cleanup() to fix memory leak.
>
> Fixes: 2cce0a369dbd ("media: rkisp1: isp: Use V4L2 subdev active state")
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> ---
> drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 88ca8b2283b7..45d1ab96fc6e 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -933,6 +933,7 @@ void rkisp1_isp_unregister(struct rkisp1_device *rkisp1)
> return;
>
> v4l2_device_unregister_subdev(&isp->sd);
> + v4l2_subdev_cleanup(&isp->sd);
> media_entity_cleanup(&isp->sd.entity);
> }
>
>
> --
> 2.34.1
>
>
Reviewed-by: Tommaso Merciai <tomm.merciai@gmail.com>
Thanks & Regards,
Tommaso
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] media: rkisp1: Fix memory leaks in rkisp1_isp_unregister()
2023-11-22 14:42 ` [PATCH 2/2] media: rkisp1: Fix memory leaks in rkisp1_isp_unregister() Tomi Valkeinen
2023-11-22 15:15 ` Tommaso Merciai
@ 2023-11-22 15:43 ` Laurent Pinchart
1 sibling, 0 replies; 8+ messages in thread
From: Laurent Pinchart @ 2023-11-22 15:43 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Dafna Hirschfeld, Mauro Carvalho Chehab, Heiko Stuebner,
Jacob Chen, Yichong Zhong, Shunqian Zheng, Paul Elder,
Sakari Ailus, Kieran Bingham, Hans Verkuil, Eddie Cai,
Allon Huang, Jeffy Chen, linux-media, linux-rockchip,
linux-arm-kernel, linux-kernel
Hi Tomi,
Thank you for the patch.
On Wed, Nov 22, 2023 at 04:42:23PM +0200, Tomi Valkeinen wrote:
> Add missing call to v4l2_subdev_cleanup() to fix memory leak.
>
> Fixes: 2cce0a369dbd ("media: rkisp1: isp: Use V4L2 subdev active state")
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 88ca8b2283b7..45d1ab96fc6e 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -933,6 +933,7 @@ void rkisp1_isp_unregister(struct rkisp1_device *rkisp1)
> return;
>
> v4l2_device_unregister_subdev(&isp->sd);
> + v4l2_subdev_cleanup(&isp->sd);
> media_entity_cleanup(&isp->sd.entity);
> }
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-11-22 15:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-22 14:42 [PATCH 0/2] media: rkisp1: Fix memory leaks Tomi Valkeinen
2023-11-22 14:42 ` [PATCH 1/2] media: rkisp1: Fix media device memory leak Tomi Valkeinen
2023-11-22 15:12 ` Tommaso Merciai
2023-11-22 15:42 ` Laurent Pinchart
2023-11-22 15:44 ` Tomi Valkeinen
2023-11-22 14:42 ` [PATCH 2/2] media: rkisp1: Fix memory leaks in rkisp1_isp_unregister() Tomi Valkeinen
2023-11-22 15:15 ` Tommaso Merciai
2023-11-22 15:43 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox