Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <7a9bcf6e-45e8-0be5-b716-5b71c9cc0623@amd.com>
Date:   Thu, 1 Sep 2022 09:04:48 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH v4 13/21] media: videobuf2: Prepare to dynamic dma-buf
 locking specification
Content-Language: en-US
To:     Dmitry Osipenko <dmitry.osipenko@collabora.com>,
        David Airlie <airlied@linux.ie>,
        Gerd Hoffmann <kraxel@redhat.com>,
        Gurchetan Singh <gurchetansingh@chromium.org>,
        Chia-I Wu <olvaffe@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
        Daniel Almeida <daniel.almeida@collabora.com>,
        Gert Wollny <gert.wollny@collabora.com>,
        Gustavo Padovan <gustavo.padovan@collabora.com>,
        Daniel Stone <daniel@fooishbar.org>,
        Tomeu Vizoso <tomeu.vizoso@collabora.com>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Rob Clark <robdclark@gmail.com>,
        Sumit Semwal <sumit.semwal@linaro.org>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        Thierry Reding <thierry.reding@gmail.com>,
        Tomasz Figa <tfiga@chromium.org>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Alex Deucher <alexander.deucher@amd.com>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= <thomas_os@shipmail.org>,
        Qiang Yu <yuq825@gmail.com>,
        Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
        Amol Maheshwari <amahesh@qti.qualcomm.com>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Leon Romanovsky <leon@kernel.org>,
        Juergen Gross <jgross@suse.com>,
        Stefano Stabellini <sstabellini@kernel.org>,
        Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>,
        Tomi Valkeinen <tomba@kernel.org>,
        Russell King <linux@armlinux.org.uk>,
        Lucas Stach <l.stach@pengutronix.de>,
        Christian Gmeiner <christian.gmeiner@gmail.com>
Cc:     dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        Dmitry Osipenko <digetx@gmail.com>,
        linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org,
        amd-gfx@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
        kernel@collabora.com, virtualization@lists.linux-foundation.org,
        linux-rdma@vger.kernel.org, linux-arm-msm@vger.kernel.org
References: <20220831153757.97381-1-dmitry.osipenko@collabora.com>
 <20220831153757.97381-14-dmitry.osipenko@collabora.com>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <20220831153757.97381-14-dmitry.osipenko@collabora.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eUlXNTl5Vmd3THJ5NjJyZHZOTTZDQlJoMnRtNTg2Q1dLMHBWc2RMeWFhMjdk?=
 =?utf-8?B?dUF5Zk5waW1nS25kYUhkTjhZV0RadVFBN2ppTW53YmtKVFFOUVJzeHhTTWtx?=
 =?utf-8?B?NlJWUjlnUGpXRVkzTWh6Nzg0ZVo2RGgvdnhZR0t2dFdhZ05jT2dsNFhHSEpj?=
 =?utf-8?B?M3VYeVZGRDVja1U2SEJYbDVrRWFyL2NBSis0OHdVVXpKeGFCL1lGOU5YaGFp?=
 =?utf-8?B?UEgxbVRmQkttVzV6TU1YWVRwN2c5dzRxM1R0UVZNcWU3VTZsOHpXQW00NThS?=
 =?utf-8?B?aWpkVS9hVTl4VnFDOExGVWdKaGZDRGJTNk9YWkFGWVpsdUxQYzhWQVI1WWtO?=
 =?utf-8?B?M3d2Rlk3akIvdi80UW9lVGkyRjNZT1F1TnNGQmVRT0ExZk14SVJ0R2prcGlh?=
 =?utf-8?B?blNmRHY3dGNSaThsWmt3Zm5JaDJjV2VxY2VXbEJzTjlxaDJleUpiejdqRml1?=
 =?utf-8?B?VnpabUl3ZnV6d0xnWmR0ZFN3ck5UNE5nTm1yNmlVYXZSUTVTQ09xZi9QTGY0?=
 =?utf-8?B?UktDZ01xYjFsOUxFang0WmhQT1BqODhocVJVYTFlaGNvT05uZ2pBTWR6RTZW?=
 =?utf-8?B?dnFOVVJITVg0aFhQVHFkM2hVTUJtL1lkM1hsVDRoZTBjS1o2YXZTSzJWMHBQ?=
 =?utf-8?B?a3A1SGt3Z0UrRnpnckFkUVVLQzNQR2V3RGpqUk5ONWZ2Wk5LN3l3dFAvbEJG?=
 =?utf-8?B?a3dLR3pOVE00QnZUaVQ5VUZFSTR6d2ZlbzA4REdjR01XWVorZEE2TkR0ZThp?=
 =?utf-8?B?c3lSaFBMeUFDcWhtOTBleCtGSnFkaW52bmhYV3ZjekpWTDQxNE9ZbUxLbzd5?=
 =?utf-8?B?NFRxZm1odytBVXBFUGhDSGZvTmJ4bERZUVYyS0NLdUpVY1BEb0cwYmt6Z0Fu?=
 =?utf-8?B?dTh0U1pHOC9NY0xOamVrQXJ1a1I1WEdXdnphbDRrd0o4SldHT1pNTUM0Ykxh?=
 =?utf-8?B?UFpXS2NWT3VGcE0wUjhMTURPSlQzZDlBRFdWNWd0QWh0TUtTa1hPZ2pMeUtz?=
 =?utf-8?B?QUl4cmRJaHZOUE82T045S1lGUDlrS001SXlwTWhmVTBoVUUzYWY2UUxBUlhl?=
 =?utf-8?B?bXhEbUx4NWtDTUJadThGSVBrcm1ZcHl5c05iQjh1dms5VTZ3SCtUZU9RUFg5?=
 =?utf-8?B?ZklHenpnWDVrWnFDU2FOdEVlYm1tK2syaERQdkN1YkhvOW1hQ3FkNjVwTFVG?=
 =?utf-8?B?dzhRLzVzb2lUdllZUktUemw5eTZpY1pueGo5Z3d1MHhSNmlLSE1kS2tGcWk4?=
 =?utf-8?B?TUpEMFJjNmhlUmFwZ3Nib2xlWGRVaWNCdy9tVGJjdWtFRUdBUGxKS1B3cGd5?=
 =?utf-8?B?T0tHbUtqdXV6cTJISnhDeUEveWt1bE52K1NSLzBCTEZ6YmZ0T2QwVzQ1WW9h?=
 =?utf-8?B?MlhZSTN0WFFGSGpSOE9sU05LeUg2aGFhd0doL0pjcjgwajdHUHFKM1dKR2VI?=
 =?utf-8?B?Q1JJT3c4RVdWWlA2dndDRkJ2NmRDbWlQblJ1QUh5OC92aWttSm9sZko4SFc2?=
 =?utf-8?B?Z21kOUswUjYzNHhpYWN0Ym0yYTViaGlta21weDBHZCs0V3FscVA4QlZUZlpy?=
 =?utf-8?B?V1FabXNyZlJXb0JIR2tST3NnTHV4MDlLZmx5ZVNmZklzNFBLR3NOM2tUbFpy?=
 =?utf-8?B?SWluamtKZWx4QUJmT2NiVzhDUExmTnB2dlpiRy9nVjdMN3BQeHV5U3cvTVNz?=
 =?utf-8?B?N00xWG8rbmpLWGJRbHl6a2tDOXY3Z2Rya1VHdGVRMEh4ajg1d2oxMkRuSEdl?=
 =?utf-8?B?dkc3SVVBRTJXalltU0orSlhBTkFvZ1M3S3drT0dGY3c5WGh5RkFGMksrU2pS?=
 =?utf-8?B?TUgxbks0Y3JHdUlycTR3ZXZ0TDhJRUpDdFZJM1dJa0llR3NSelZpVXMrYmdK?=
 =?utf-8?B?TXViRXpRMks3MzJmMlhCbmM0QVl0SDZSVjdOZUNpL0wvM0FNMjgyMlJPUE1r?=
 =?utf-8?B?cjBSOWk1Qk1yNmk0WHdNc1VKRlVUampadHhVMzdQNVpGWUNhVmx0bmxsZTVm?=
 =?utf-8?B?Yy9Yckl2N2hWTG5hMkNjVDlyeUJXNFVOT1pJcUF4YmJuYWF2RkdGdDIySXYz?=
 =?utf-8?B?VWpqZmo0VWtla01Qd2hhTi8wRWthc3Vlb2M1dFRJWUdCYWFDM3NGZW1kcnl1?=
 =?utf-8?Q?dz+gZ1ELI5g2AOAefsqYj/iTB?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 21dc0712-a379-467f-ce98-08da8be84bf8
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3589.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 07:05:05.3991
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9RpEALNQu+tzLmymzDbw+VcGjdnYbhaEyG+s6xrIjfGNOotqBl6TIwZsS+TqblSv
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4299
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Am 31.08.22 um 17:37 schrieb Dmitry Osipenko:
> Prepare V4L2 memory allocators to the common dynamic dma-buf locking
> convention by starting to use the unlocked versions of dma-buf API
> functions.
>
> Acked-by: Tomasz Figa <tfiga@chromium.org>
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>

Acked-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/media/common/videobuf2/videobuf2-dma-contig.c | 11 ++++++-----
>   drivers/media/common/videobuf2/videobuf2-dma-sg.c     |  8 ++++----
>   drivers/media/common/videobuf2/videobuf2-vmalloc.c    |  6 +++---
>   3 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> index 678b359717c4..79f4d8301fbb 100644
> --- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> +++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
> @@ -101,7 +101,7 @@ static void *vb2_dc_vaddr(struct vb2_buffer *vb, void *buf_priv)
>   	if (buf->db_attach) {
>   		struct iosys_map map;
>   
> -		if (!dma_buf_vmap(buf->db_attach->dmabuf, &map))
> +		if (!dma_buf_vmap_unlocked(buf->db_attach->dmabuf, &map))
>   			buf->vaddr = map.vaddr;
>   
>   		return buf->vaddr;
> @@ -711,7 +711,7 @@ static int vb2_dc_map_dmabuf(void *mem_priv)
>   	}
>   
>   	/* get the associated scatterlist for this buffer */
> -	sgt = dma_buf_map_attachment(buf->db_attach, buf->dma_dir);
> +	sgt = dma_buf_map_attachment_unlocked(buf->db_attach, buf->dma_dir);
>   	if (IS_ERR(sgt)) {
>   		pr_err("Error getting dmabuf scatterlist\n");
>   		return -EINVAL;
> @@ -722,7 +722,8 @@ static int vb2_dc_map_dmabuf(void *mem_priv)
>   	if (contig_size < buf->size) {
>   		pr_err("contiguous chunk is too small %lu/%lu\n",
>   		       contig_size, buf->size);
> -		dma_buf_unmap_attachment(buf->db_attach, sgt, buf->dma_dir);
> +		dma_buf_unmap_attachment_unlocked(buf->db_attach, sgt,
> +						  buf->dma_dir);
>   		return -EFAULT;
>   	}
>   
> @@ -750,10 +751,10 @@ static void vb2_dc_unmap_dmabuf(void *mem_priv)
>   	}
>   
>   	if (buf->vaddr) {
> -		dma_buf_vunmap(buf->db_attach->dmabuf, &map);
> +		dma_buf_vunmap_unlocked(buf->db_attach->dmabuf, &map);
>   		buf->vaddr = NULL;
>   	}
> -	dma_buf_unmap_attachment(buf->db_attach, sgt, buf->dma_dir);
> +	dma_buf_unmap_attachment_unlocked(buf->db_attach, sgt, buf->dma_dir);
>   
>   	buf->dma_addr = 0;
>   	buf->dma_sgt = NULL;
> diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
> index fa69158a65b1..36ecdea8d707 100644
> --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
> +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
> @@ -309,7 +309,7 @@ static void *vb2_dma_sg_vaddr(struct vb2_buffer *vb, void *buf_priv)
>   
>   	if (!buf->vaddr) {
>   		if (buf->db_attach) {
> -			ret = dma_buf_vmap(buf->db_attach->dmabuf, &map);
> +			ret = dma_buf_vmap_unlocked(buf->db_attach->dmabuf, &map);
>   			buf->vaddr = ret ? NULL : map.vaddr;
>   		} else {
>   			buf->vaddr = vm_map_ram(buf->pages, buf->num_pages, -1);
> @@ -565,7 +565,7 @@ static int vb2_dma_sg_map_dmabuf(void *mem_priv)
>   	}
>   
>   	/* get the associated scatterlist for this buffer */
> -	sgt = dma_buf_map_attachment(buf->db_attach, buf->dma_dir);
> +	sgt = dma_buf_map_attachment_unlocked(buf->db_attach, buf->dma_dir);
>   	if (IS_ERR(sgt)) {
>   		pr_err("Error getting dmabuf scatterlist\n");
>   		return -EINVAL;
> @@ -594,10 +594,10 @@ static void vb2_dma_sg_unmap_dmabuf(void *mem_priv)
>   	}
>   
>   	if (buf->vaddr) {
> -		dma_buf_vunmap(buf->db_attach->dmabuf, &map);
> +		dma_buf_vunmap_unlocked(buf->db_attach->dmabuf, &map);
>   		buf->vaddr = NULL;
>   	}
> -	dma_buf_unmap_attachment(buf->db_attach, sgt, buf->dma_dir);
> +	dma_buf_unmap_attachment_unlocked(buf->db_attach, sgt, buf->dma_dir);
>   
>   	buf->dma_sgt = NULL;
>   }
> diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> index 948152f1596b..7831bf545874 100644
> --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
> @@ -376,7 +376,7 @@ static int vb2_vmalloc_map_dmabuf(void *mem_priv)
>   	struct iosys_map map;
>   	int ret;
>   
> -	ret = dma_buf_vmap(buf->dbuf, &map);
> +	ret = dma_buf_vmap_unlocked(buf->dbuf, &map);
>   	if (ret)
>   		return -EFAULT;
>   	buf->vaddr = map.vaddr;
> @@ -389,7 +389,7 @@ static void vb2_vmalloc_unmap_dmabuf(void *mem_priv)
>   	struct vb2_vmalloc_buf *buf = mem_priv;
>   	struct iosys_map map = IOSYS_MAP_INIT_VADDR(buf->vaddr);
>   
> -	dma_buf_vunmap(buf->dbuf, &map);
> +	dma_buf_vunmap_unlocked(buf->dbuf, &map);
>   	buf->vaddr = NULL;
>   }
>   
> @@ -399,7 +399,7 @@ static void vb2_vmalloc_detach_dmabuf(void *mem_priv)
>   	struct iosys_map map = IOSYS_MAP_INIT_VADDR(buf->vaddr);
>   
>   	if (buf->vaddr)
> -		dma_buf_vunmap(buf->dbuf, &map);
> +		dma_buf_vunmap_unlocked(buf->dbuf, &map);
>   
>   	kfree(buf);
>   }