mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11memory: Protect map and unmap with device lock

Browse source 
We should lock memory object with gst_d3d11_device_lock() first
then GST_D3D11_MEMORY_LOCK() need to be used.

One observed deadlock case is that:
- Thread A takes d3d11 device lock
- At the same time, Thread B tries CPU map to d3d11memory which requires
  d3d11 device lock as well, but it's already taken by Thread A.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2267>
This commit is contained in:
Seungha Yang 2021-05-20 18:49:01 +09:00 committed by GStreamer Marge Bot
parent 7a0bc2a91d
commit 360a195158
1 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
gst-libs/gst/d3d11/gstd3d11memory.c
View file

@ -313,6 +313,7 @@ gst_d3d11_allocate_staging_texture (GstD3D11Device * device,
return texture; return texture;
} }
/* Must be called with d3d11 device lock */
static gboolean static gboolean
gst_d3d11_memory_map_cpu_access (GstD3D11Memory * dmem, D3D11_MAP map_type) gst_d3d11_memory_map_cpu_access (GstD3D11Memory * dmem, D3D11_MAP map_type)
{ {
@ -322,10 +323,8 @@ gst_d3d11_memory_map_cpu_access (GstD3D11Memory * dmem, D3D11_MAP map_type)
ID3D11DeviceContext *device_context = ID3D11DeviceContext *device_context =
gst_d3d11_device_get_device_context_handle (dmem->device); gst_d3d11_device_get_device_context_handle (dmem->device);
gst_d3d11_device_lock (dmem->device);
hr = ID3D11DeviceContext_Map (device_context, hr = ID3D11DeviceContext_Map (device_context,
staging, 0, map_type, 0, &priv->map); staging, 0, map_type, 0, &priv->map);
gst_d3d11_device_unlock (dmem->device);
if (!gst_d3d11_result (hr, dmem->device)) { if (!gst_d3d11_result (hr, dmem->device)) {
GST_ERROR_OBJECT (GST_MEMORY_CAST (dmem)->allocator, GST_ERROR_OBJECT (GST_MEMORY_CAST (dmem)->allocator,
@ -336,6 +335,7 @@ gst_d3d11_memory_map_cpu_access (GstD3D11Memory * dmem, D3D11_MAP map_type)
return TRUE; return TRUE;
} }
/* Must be called with d3d11 device lock */
static void static void
gst_d3d11_memory_upload (GstD3D11Memory * dmem) gst_d3d11_memory_upload (GstD3D11Memory * dmem)
{ {
@ -347,13 +347,12 @@ gst_d3d11_memory_upload (GstD3D11Memory * dmem)
return; return;
device_context = gst_d3d11_device_get_device_context_handle (dmem->device); device_context = gst_d3d11_device_get_device_context_handle (dmem->device);
gst_d3d11_device_lock (dmem->device);
ID3D11DeviceContext_CopySubresourceRegion (device_context, ID3D11DeviceContext_CopySubresourceRegion (device_context,
(ID3D11Resource *) priv->texture, priv->subresource_index, 0, 0, 0, (ID3D11Resource *) priv->texture, priv->subresource_index, 0, 0, 0,
(ID3D11Resource *) priv->staging, 0, NULL); (ID3D11Resource *) priv->staging, 0, NULL);
gst_d3d11_device_unlock (dmem->device);
} }
/* Must be called with d3d11 device lock */
static void static void
gst_d3d11_memory_download (GstD3D11Memory * dmem) gst_d3d11_memory_download (GstD3D11Memory * dmem)
{ {
@ -365,11 +364,9 @@ gst_d3d11_memory_download (GstD3D11Memory * dmem)
return; return;
device_context = gst_d3d11_device_get_device_context_handle (dmem->device); device_context = gst_d3d11_device_get_device_context_handle (dmem->device);
gst_d3d11_device_lock (dmem->device);
ID3D11DeviceContext_CopySubresourceRegion (device_context, ID3D11DeviceContext_CopySubresourceRegion (device_context,
(ID3D11Resource *) priv->staging, 0, 0, 0, 0, (ID3D11Resource *) priv->staging, 0, 0, 0, 0,
(ID3D11Resource *) priv->texture, priv->subresource_index, NULL); (ID3D11Resource *) priv->texture, priv->subresource_index, NULL);
gst_d3d11_device_unlock (dmem->device);
} }
static gpointer static gpointer
@ -378,8 +375,11 @@ gst_d3d11_memory_map_full (GstMemory * mem, GstMapInfo * info, gsize maxsize)
GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem); GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
GstD3D11MemoryPrivate *priv = dmem->priv; GstD3D11MemoryPrivate *priv = dmem->priv;
GstMapFlags flags = info->flags; GstMapFlags flags = info->flags;
gpointer ret = NULL;
gst_d3d11_device_lock (dmem->device);
GST_D3D11_MEMORY_LOCK (dmem); GST_D3D11_MEMORY_LOCK (dmem);
if ((flags & GST_MAP_D3D11) == GST_MAP_D3D11) { if ((flags & GST_MAP_D3D11) == GST_MAP_D3D11) {
gst_d3d11_memory_upload (dmem); gst_d3d11_memory_upload (dmem);
GST_MEMORY_FLAG_UNSET (dmem, GST_D3D11_MEMORY_TRANSFER_NEED_UPLOAD); GST_MEMORY_FLAG_UNSET (dmem, GST_D3D11_MEMORY_TRANSFER_NEED_UPLOAD);
@ -388,9 +388,8 @@ gst_d3d11_memory_map_full (GstMemory * mem, GstMapInfo * info, gsize maxsize)
GST_MINI_OBJECT_FLAG_SET (dmem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD); GST_MINI_OBJECT_FLAG_SET (dmem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD);
g_assert (priv->texture != NULL); g_assert (priv->texture != NULL);
GST_D3D11_MEMORY_UNLOCK (dmem); ret = priv->texture;
goto out;
return priv->texture;
} }
if (priv->cpu_map_count == 0) { if (priv->cpu_map_count == 0) {
@ -402,9 +401,7 @@ gst_d3d11_memory_map_full (GstMemory * mem, GstMapInfo * info, gsize maxsize)
&priv->desc); &priv->desc);
if (!priv->staging) { if (!priv->staging) {
GST_ERROR_OBJECT (mem->allocator, "Couldn't create staging texture"); GST_ERROR_OBJECT (mem->allocator, "Couldn't create staging texture");
GST_D3D11_MEMORY_UNLOCK (dmem); goto out;
return NULL;
} }
/* first memory, always need download to staging */ /* first memory, always need download to staging */
@ -416,9 +413,7 @@ gst_d3d11_memory_map_full (GstMemory * mem, GstMapInfo * info, gsize maxsize)
if (!gst_d3d11_memory_map_cpu_access (dmem, map_type)) { if (!gst_d3d11_memory_map_cpu_access (dmem, map_type)) {
GST_ERROR_OBJECT (mem->allocator, "Couldn't map staging texture"); GST_ERROR_OBJECT (mem->allocator, "Couldn't map staging texture");
GST_D3D11_MEMORY_UNLOCK (dmem); goto out;
return NULL;
} }
} }
@ -429,11 +424,16 @@ gst_d3d11_memory_map_full (GstMemory * mem, GstMapInfo * info, gsize maxsize)
GST_MEMORY_FLAG_UNSET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD); GST_MEMORY_FLAG_UNSET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD);
priv->cpu_map_count++; priv->cpu_map_count++;
GST_D3D11_MEMORY_UNLOCK (dmem); ret = dmem->priv->map.pData;
return dmem->priv->map.pData; out:
GST_D3D11_MEMORY_UNLOCK (dmem);
gst_d3d11_device_unlock (dmem->device);
return ret;
} }
/* Must be called with d3d11 device lock */
static void static void
gst_d3d11_memory_unmap_cpu_access (GstD3D11Memory * dmem) gst_d3d11_memory_unmap_cpu_access (GstD3D11Memory * dmem)
{ {
@ -442,9 +442,7 @@ gst_d3d11_memory_unmap_cpu_access (GstD3D11Memory * dmem)
ID3D11DeviceContext *device_context = ID3D11DeviceContext *device_context =
gst_d3d11_device_get_device_context_handle (dmem->device); gst_d3d11_device_get_device_context_handle (dmem->device);
gst_d3d11_device_lock (dmem->device);
ID3D11DeviceContext_Unmap (device_context, staging, 0); ID3D11DeviceContext_Unmap (device_context, staging, 0);
gst_d3d11_device_unlock (dmem->device);
} }
static void static void
@ -453,26 +451,28 @@ gst_d3d11_memory_unmap_full (GstMemory * mem, GstMapInfo * info)
GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem); GstD3D11Memory *dmem = GST_D3D11_MEMORY_CAST (mem);
GstD3D11MemoryPrivate *priv = dmem->priv; GstD3D11MemoryPrivate *priv = dmem->priv;
gst_d3d11_device_lock (dmem->device);
GST_D3D11_MEMORY_LOCK (dmem); GST_D3D11_MEMORY_LOCK (dmem);
if ((info->flags & GST_MAP_D3D11) == GST_MAP_D3D11) { if ((info->flags & GST_MAP_D3D11) == GST_MAP_D3D11) {
if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE) if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE)
GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD); GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD);
GST_D3D11_MEMORY_UNLOCK (dmem); goto out;
return;
} }
if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE) if ((info->flags & GST_MAP_WRITE) == GST_MAP_WRITE)
GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_UPLOAD); GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_UPLOAD);
priv->cpu_map_count--; priv->cpu_map_count--;
if (priv->cpu_map_count > 0) { if (priv->cpu_map_count > 0)
GST_D3D11_MEMORY_UNLOCK (dmem); goto out;
return;
}
gst_d3d11_memory_unmap_cpu_access (dmem); gst_d3d11_memory_unmap_cpu_access (dmem);
out:
GST_D3D11_MEMORY_UNLOCK (dmem); GST_D3D11_MEMORY_UNLOCK (dmem);
gst_d3d11_device_unlock (dmem->device);
} }
static GstMemory * static GstMemory *
@ -491,6 +491,7 @@ gst_d3d11_memory_update_size (GstMemory * mem)
gint stride[GST_VIDEO_MAX_PLANES]; gint stride[GST_VIDEO_MAX_PLANES];
gsize size; gsize size;
D3D11_TEXTURE2D_DESC *desc = &priv->desc; D3D11_TEXTURE2D_DESC *desc = &priv->desc;
gboolean ret = FALSE;
if (!priv->staging) { if (!priv->staging) {
priv->staging = gst_d3d11_allocate_staging_texture (dmem->device, priv->staging = gst_d3d11_allocate_staging_texture (dmem->device,
@ -503,6 +504,7 @@ gst_d3d11_memory_update_size (GstMemory * mem)
GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD); GST_MINI_OBJECT_FLAG_SET (mem, GST_D3D11_MEMORY_TRANSFER_NEED_DOWNLOAD);
} }
gst_d3d11_device_lock (dmem->device);
if (!gst_d3d11_memory_map_cpu_access (dmem, D3D11_MAP_READ_WRITE)) { if (!gst_d3d11_memory_map_cpu_access (dmem, D3D11_MAP_READ_WRITE)) {
GST_ERROR_OBJECT (mem->allocator, "Couldn't map staging texture"); GST_ERROR_OBJECT (mem->allocator, "Couldn't map staging texture");
return FALSE; return FALSE;
@ -513,12 +515,15 @@ gst_d3d11_memory_update_size (GstMemory * mem)
if (!gst_d3d11_dxgi_format_get_size (desc->Format, desc->Width, desc->Height, if (!gst_d3d11_dxgi_format_get_size (desc->Format, desc->Width, desc->Height,
priv->map.RowPitch, offset, stride, &size)) { priv->map.RowPitch, offset, stride, &size)) {
GST_ERROR_OBJECT (mem->allocator, "Couldn't calculate memory size"); GST_ERROR_OBJECT (mem->allocator, "Couldn't calculate memory size");
return FALSE; goto out;
} }
mem->maxsize = mem->size = size; mem->maxsize = mem->size = size;
ret = TRUE;
return TRUE; out:
gst_d3d11_device_unlock (dmem->device);
return ret;
} }
/** /**