[v5] media: imx-jpeg: Fix some motion-jpeg decoding

[PATCH v5 2/5] media: imx-jpeg: Reset slot data pointers when free data

Posted by ming.qian@oss.nxp.com 8 months ago

From: Ming Qian <ming.qian@oss.nxp.com>

To make the function mxc_jpeg_alloc_slot_data() and
mxc_jpeg_free_slot_data() safe to be called multiple times. Ensure that
the slot data pointers are reset to NULL and handles are set to 0 after
freeing the coherent memory.

Fixes: 2db16c6ed72c ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder")
Signed-off-by: Ming Qian <ming.qian@oss.nxp.com>
---
v5
- Make a single patch to reset the slot data pointers when free data

 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 2f7ee5dfa93d..b2f7e9ad1885 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -758,16 +758,22 @@ static void mxc_jpeg_free_slot_data(struct mxc_jpeg_dev *jpeg)
 	dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc),
 			  jpeg->slot_data.desc,
 			  jpeg->slot_data.desc_handle);
+	jpeg->slot_data.desc = NULL;
+	jpeg->slot_data.desc_handle = 0;
 
 	/* free descriptor for encoder configuration phase / decoder DHT */
 	dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc),
 			  jpeg->slot_data.cfg_desc,
 			  jpeg->slot_data.cfg_desc_handle);
+	jpeg->slot_data.cfg_desc_handle = 0;
+	jpeg->slot_data.cfg_desc = NULL;
 
 	/* free configuration stream */
 	dma_free_coherent(jpeg->dev, MXC_JPEG_MAX_CFG_STREAM,
 			  jpeg->slot_data.cfg_stream_vaddr,
 			  jpeg->slot_data.cfg_stream_handle);
+	jpeg->slot_data.cfg_stream_vaddr = NULL;
+	jpeg->slot_data.cfg_stream_handle = 0;
 
 	jpeg->slot_data.used = false;
 }
-- 
2.43.0-rc1

Re: [PATCH v5 2/5] media: imx-jpeg: Reset slot data pointers when free data

Posted by Nicolas Dufresne 7 months, 4 weeks ago

Le vendredi 18 avril 2025 à 15:08 +0800, ming.qian@oss.nxp.com a écrit :
> From: Ming Qian <ming.qian@oss.nxp.com>
> 
> To make the function mxc_jpeg_alloc_slot_data() and
> mxc_jpeg_free_slot_data() safe to be called multiple times. Ensure that
> the slot data pointers are reset to NULL and handles are set to 0 after
> freeing the coherent memory.

Perhaps:

   media: imx-jpeg: Reset slot data pointers when freed


   Ensure that the slot data pointers are reset to NULL and handles are
   set to 0 after freeing the coherent memory. This makes he function
   mxc_jpeg_alloc_slot_data() and mxc_jpeg_free_slot_data() safe to be
   called multiple times.

> 
> Fixes: 2db16c6ed72c ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder")
> Signed-off-by: Ming Qian <ming.qian@oss.nxp.com>
> ---
> v5
> - Make a single patch to reset the slot data pointers when free data
> 
>  drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
> index 2f7ee5dfa93d..b2f7e9ad1885 100644
> --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
> +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
> @@ -758,16 +758,22 @@ static void mxc_jpeg_free_slot_data(struct mxc_jpeg_dev *jpeg)
>  	dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc),
>  			  jpeg->slot_data.desc,
>  			  jpeg->slot_data.desc_handle);
> +	jpeg->slot_data.desc = NULL;
> +	jpeg->slot_data.desc_handle = 0;
>  
>  	/* free descriptor for encoder configuration phase / decoder DHT */
>  	dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc),
>  			  jpeg->slot_data.cfg_desc,
>  			  jpeg->slot_data.cfg_desc_handle);
> +	jpeg->slot_data.cfg_desc_handle = 0;
> +	jpeg->slot_data.cfg_desc = NULL;
>  
>  	/* free configuration stream */
>  	dma_free_coherent(jpeg->dev, MXC_JPEG_MAX_CFG_STREAM,
>  			  jpeg->slot_data.cfg_stream_vaddr,
>  			  jpeg->slot_data.cfg_stream_handle);
> +	jpeg->slot_data.cfg_stream_vaddr = NULL;
> +	jpeg->slot_data.cfg_stream_handle = 0;
>  
>  	jpeg->slot_data.used = false;
>  }

Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

Re: [PATCH v5 2/5] media: imx-jpeg: Reset slot data pointers when free data

Posted by Ming Qian(OSS) 7 months, 3 weeks ago

Hi Nicolas,

On 2025/4/18 20:49, Nicolas Dufresne wrote:
> Le vendredi 18 avril 2025 à 15:08 +0800, ming.qian@oss.nxp.com a écrit :
>> From: Ming Qian <ming.qian@oss.nxp.com>
>>
>> To make the function mxc_jpeg_alloc_slot_data() and
>> mxc_jpeg_free_slot_data() safe to be called multiple times. Ensure that
>> the slot data pointers are reset to NULL and handles are set to 0 after
>> freeing the coherent memory.
> 
> Perhaps:
> 
>     media: imx-jpeg: Reset slot data pointers when freed
> 
> 
>     Ensure that the slot data pointers are reset to NULL and handles are
>     set to 0 after freeing the coherent memory. This makes he function
>     mxc_jpeg_alloc_slot_data() and mxc_jpeg_free_slot_data() safe to be
>     called multiple times.
> 

Thanks for help improve the commit message,
I'll apply it and make a v6 patch

Regards,
Ming

>>
>> Fixes: 2db16c6ed72c ("media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder")
>> Signed-off-by: Ming Qian <ming.qian@oss.nxp.com>
>> ---
>> v5
>> - Make a single patch to reset the slot data pointers when free data
>>
>>   drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
>> index 2f7ee5dfa93d..b2f7e9ad1885 100644
>> --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
>> +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
>> @@ -758,16 +758,22 @@ static void mxc_jpeg_free_slot_data(struct mxc_jpeg_dev *jpeg)
>>   	dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc),
>>   			  jpeg->slot_data.desc,
>>   			  jpeg->slot_data.desc_handle);
>> +	jpeg->slot_data.desc = NULL;
>> +	jpeg->slot_data.desc_handle = 0;
>>   
>>   	/* free descriptor for encoder configuration phase / decoder DHT */
>>   	dma_free_coherent(jpeg->dev, sizeof(struct mxc_jpeg_desc),
>>   			  jpeg->slot_data.cfg_desc,
>>   			  jpeg->slot_data.cfg_desc_handle);
>> +	jpeg->slot_data.cfg_desc_handle = 0;
>> +	jpeg->slot_data.cfg_desc = NULL;
>>   
>>   	/* free configuration stream */
>>   	dma_free_coherent(jpeg->dev, MXC_JPEG_MAX_CFG_STREAM,
>>   			  jpeg->slot_data.cfg_stream_vaddr,
>>   			  jpeg->slot_data.cfg_stream_handle);
>> +	jpeg->slot_data.cfg_stream_vaddr = NULL;
>> +	jpeg->slot_data.cfg_stream_handle = 0;
>>   
>>   	jpeg->slot_data.used = false;
>>   }
> 
> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

[PATCH v5 1/5] media: imx-jpeg: Move mxc_jpeg_free_slot_data() ahead
[PATCH v5 2/5] media: imx-jpeg: Reset slot data pointers when free data
[PATCH v5 3/5] media: imx-jpeg: Cleanup after an allocation error
[PATCH v5 4/5] media: imx-jpeg: Change the pattern size to 128x64
[PATCH v5 5/5] media: imx-jpeg: Check decoding is ongoing for motion-jpeg