geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdgpu: fix race issue between two bo functions(v2) 

there is race issue between two threads on amdgpu_bo_reference and
amdgpu_bo_import, this patch tends to fix it by moving the
pthread_mutex_lock out of bo_free_internal and move to bo_reference
to cover the update_reference part.

The mutex_unlock in bo_import should also cover bo refcount
increasement.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Monk Liu <monk.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
main
Monk Liu 2017-08-08 15:34:20 +08:00 committed by Alex Deucher
parent 4d24415594
commit 2a89ae5d7a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
amdgpu/amdgpu_bo.c
View File

@ -56,14 +56,12 @@ static void amdgpu_close_kms_handle(amdgpu_device_handle dev,
drm_private void amdgpu_bo_free_internal(amdgpu_bo_handle bo)
{
/* Remove the buffer from the hash tables. */
pthread_mutex_lock(&bo->dev->bo_table_mutex);
util_hash_table_remove(bo->dev->bo_handles,
(void*)(uintptr_t)bo->handle);
if (bo->flink_name) {
util_hash_table_remove(bo->dev->bo_flink_names,
(void*)(uintptr_t)bo->flink_name);
}
pthread_mutex_unlock(&bo->dev->bo_table_mutex);
/* Release CPU access. */
if (bo->cpu_map_count > 0) {
@ -342,10 +340,9 @@ int amdgpu_bo_import(amdgpu_device_handle dev,
}
if (bo) {
pthread_mutex_unlock(&dev->bo_table_mutex);
/* The buffer already exists, just bump the refcount. */
atomic_inc(&bo->refcount);
pthread_mutex_unlock(&dev->bo_table_mutex);
output->buf_handle = bo;
output->alloc_size = bo->alloc_size;

13
amdgpu/amdgpu_internal.h
View File

@ -206,8 +206,17 @@ static inline bool update_references(atomic_t *dst, atomic_t *src)
static inline void amdgpu_bo_reference(struct amdgpu_bo **dst,
struct amdgpu_bo *src)
{
if (update_references(&(*dst)->refcount, &src->refcount))
amdgpu_bo_free_internal(*dst);
pthread_mutex_t *mlock;
struct amdgpu_bo* bo = *dst;
assert(bo != NULL);
mlock = &bo->dev->bo_table_mutex;
pthread_mutex_lock(mlock);
if (update_references(&bo->refcount, src?&src->refcount:NULL))
amdgpu_bo_free_internal(bo);
pthread_mutex_unlock(mlock);
*dst = src;
}