media: videobuf2-dma-contig: Invalidate vmap range before DMA range

[PATCH] media: videobuf2-dma-contig: Invalidate vmap range before DMA range

Posted by Sergey Senozhatsky 4 years, 5 months ago

Christoph suggests [1] that invalidating vmap range before
direct mapping range makes more sense.

[1]: https://lore.kernel.org/all/20220111085958.GA22795@lst.de/
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
 .../media/common/videobuf2/videobuf2-dma-contig.c    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
index 7c4096e62173..0e3f264122af 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
@@ -132,12 +132,12 @@ static void vb2_dc_prepare(void *buf_priv)
 	if (!buf->non_coherent_mem)
 		return;
 
-	/* For both USERPTR and non-coherent MMAP */
-	dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir);
-
 	/* Non-coherent MMAP only */
 	if (buf->vaddr)
 		flush_kernel_vmap_range(buf->vaddr, buf->size);
+
+	/* For both USERPTR and non-coherent MMAP */
+	dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir);
 }
 
 static void vb2_dc_finish(void *buf_priv)
@@ -152,12 +152,12 @@ static void vb2_dc_finish(void *buf_priv)
 	if (!buf->non_coherent_mem)
 		return;
 
-	/* For both USERPTR and non-coherent MMAP */
-	dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir);
-
 	/* Non-coherent MMAP only */
 	if (buf->vaddr)
 		invalidate_kernel_vmap_range(buf->vaddr, buf->size);
+
+	/* For both USERPTR and non-coherent MMAP */
+	dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir);
 }
 
 /*********************************************/
-- 
2.34.1.703.g22d0c6ccf7-goog

Re: [PATCH] media: videobuf2-dma-contig: Invalidate vmap range before DMA range

Posted by Marek Szyprowski 4 years, 5 months ago

On 19.01.2022 09:14, Sergey Senozhatsky wrote:
> Christoph suggests [1] that invalidating vmap range before
> direct mapping range makes more sense.
>
> [1]: https://lore.kernel.org/all/20220111085958.GA22795@lst.de/
> Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>

Right.

Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>

> ---
>   .../media/common/videobuf2/videobuf2-dma-contig.c    | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> index 7c4096e62173..0e3f264122af 100644
> --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> @@ -132,12 +132,12 @@ static void vb2_dc_prepare(void *buf_priv)
>   	if (!buf->non_coherent_mem)
>   		return;
>   
> -	/* For both USERPTR and non-coherent MMAP */
> -	dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir);
> -
>   	/* Non-coherent MMAP only */
>   	if (buf->vaddr)
>   		flush_kernel_vmap_range(buf->vaddr, buf->size);
> +
> +	/* For both USERPTR and non-coherent MMAP */
> +	dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir);
>   }
>   
>   static void vb2_dc_finish(void *buf_priv)
> @@ -152,12 +152,12 @@ static void vb2_dc_finish(void *buf_priv)
>   	if (!buf->non_coherent_mem)
>   		return;
>   
> -	/* For both USERPTR and non-coherent MMAP */
> -	dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir);
> -
>   	/* Non-coherent MMAP only */
>   	if (buf->vaddr)
>   		invalidate_kernel_vmap_range(buf->vaddr, buf->size);
> +
> +	/* For both USERPTR and non-coherent MMAP */
> +	dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir);
>   }
>   
>   /*********************************************/

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Re: [PATCH] media: videobuf2-dma-contig: Invalidate vmap range before DMA range

Posted by Christoph Hellwig 4 years, 5 months ago

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>