kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drm/nouveau: Don't take struct_mutex around the pushbuf IOCTL.

Browse source 
We don't need it and it can lead to lock order inversions with respect
to drm_global_mutex, potentially causing dead locks.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Francisco Jerez 2010-08-29 12:21:16 +02:00 committed by Ben Skeggs
parent 3ba6462355
commit 374c3af880
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/nouveau/nouveau_gem.c
View file

@ -245,7 +245,7 @@ validate_fini_list(struct list_head *list, struct nouveau_fence *fence)
list_del(&nvbo->entry); list_del(&nvbo->entry);
nvbo->reserved_by = NULL; nvbo->reserved_by = NULL;
ttm_bo_unreserve(&nvbo->bo); ttm_bo_unreserve(&nvbo->bo);
drm_gem_object_unreference(nvbo->gem); drm_gem_object_unreference_unlocked(nvbo->gem);
} }
} }
@ -300,7 +300,7 @@ retry:
validate_fini(op, NULL); validate_fini(op, NULL);
if (ret == -EAGAIN) if (ret == -EAGAIN)
ret = ttm_bo_wait_unreserved(&nvbo->bo, false); ret = ttm_bo_wait_unreserved(&nvbo->bo, false);
drm_gem_object_unreference(gem); drm_gem_object_unreference_unlocked(gem);
if (ret) { if (ret) {
NV_ERROR(dev, "fail reserve\n"); NV_ERROR(dev, "fail reserve\n");
return ret; return ret;
@ -616,8 +616,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
return PTR_ERR(bo); return PTR_ERR(bo);
} }
mutex_lock(&dev->struct_mutex);
/* Mark push buffers as being used on PFIFO, the validation code /* Mark push buffers as being used on PFIFO, the validation code
* will then make sure that if the pushbuf bo moves, that they * will then make sure that if the pushbuf bo moves, that they
* happen on the kernel channel, which will in turn cause a sync * happen on the kernel channel, which will in turn cause a sync
@ -731,7 +729,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
out: out:
validate_fini(&op, fence); validate_fini(&op, fence);
nouveau_fence_unref((void**)&fence); nouveau_fence_unref((void**)&fence);
mutex_unlock(&dev->struct_mutex);
kfree(bo); kfree(bo);
kfree(push); kfree(push);