Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <4b337d6c-fac5-5c12-7f62-f70c09fc2518@samsung.com>
Date:   Wed, 19 Jan 2022 09:32:55 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0)
        Gecko/20100101 Thunderbird/91.5.0
Subject: Re: [PATCH] media: videobuf2-dma-contig: Invalidate vmap range
 before DMA range
Content-Language: en-US
To:     Sergey Senozhatsky <senozhatsky@chromium.org>,
        Tomasz Figa <tfiga@chromium.org>,
        Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc:     Christoph Hellwig <hch@lst.de>,
        Dafna Hirschfeld <dafna.hirschfeld@collabora.com>,
        Ricardo Ribalda <ribalda@chromium.org>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
From:   Marek Szyprowski <m.szyprowski@samsung.com>
In-Reply-To: <20220119081417.20604-1-senozhatsky@chromium.org>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
CMS-TYPE: 201P
References: <CGME20220119081426eucas1p14b7ae75dfefd3a268fc7d5b4e5d84eb2@eucas1p1.samsung.com>
        <20220119081417.20604-1-senozhatsky@chromium.org>
Precedence: bulk

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